Merge pull request #8996 from mono/pr-sandy-remove-refactoring-essentials

Remove RefactoringEssentials

16 files changed, 37 insertions, 98 deletions

diff --git a/main/Main.sln b/main/Main.sln
index 151b88df46..533cc64668 100644
--- a/main/Main.sln
+++ b/main/Main.sln
@@ -251,8 +251,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Ide.Tests", "te
 EndProject

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsPlatform.Tests", "tests\WindowsPlatform.Tests\WindowsPlatform.Tests.csproj", "{865100E2-A29C-4FCD-B803-1A0B9A0A6EF7}"

 EndProject

-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RefactoringEssentials", "external\RefactoringEssentials\RefactoringEssentials\RefactoringEssentials.csproj", "{C465A5DC-AD28-49A2-89C0-F81838814A7E}"

-EndProject

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.CSharpBinding.Tests", "tests\MonoDevelop.CSharpBinding.Tests\MonoDevelop.CSharpBinding.Tests.csproj", "{84E22F5F-0562-4B51-8B9A-FD79FF33A8B5}"

 EndProject

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.UnitTesting.NUnit", "src\addins\MonoDevelop.UnitTesting.NUnit\MonoDevelop.UnitTesting.NUnit.csproj", "{6224D87E-2AC1-4D9F-91ED-714F797297BF}"

@@ -1709,22 +1707,6 @@ Global
 		{865100E2-A29C-4FCD-B803-1A0B9A0A6EF7}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

 		{865100E2-A29C-4FCD-B803-1A0B9A0A6EF7}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

 		{865100E2-A29C-4FCD-B803-1A0B9A0A6EF7}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

-		{C465A5DC-AD28-49A2-89C0-F81838814A7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-		{C465A5DC-AD28-49A2-89C0-F81838814A7E}.Debug|Any CPU.Build.0 = Debug|Any CPU

-		{C465A5DC-AD28-49A2-89C0-F81838814A7E}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

-		{C465A5DC-AD28-49A2-89C0-F81838814A7E}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

-		{C465A5DC-AD28-49A2-89C0-F81838814A7E}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

-		{C465A5DC-AD28-49A2-89C0-F81838814A7E}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

-		{C465A5DC-AD28-49A2-89C0-F81838814A7E}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

-		{C465A5DC-AD28-49A2-89C0-F81838814A7E}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

-		{C465A5DC-AD28-49A2-89C0-F81838814A7E}.Release|Any CPU.ActiveCfg = Release|Any CPU

-		{C465A5DC-AD28-49A2-89C0-F81838814A7E}.Release|Any CPU.Build.0 = Release|Any CPU

-		{C465A5DC-AD28-49A2-89C0-F81838814A7E}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

-		{C465A5DC-AD28-49A2-89C0-F81838814A7E}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

-		{C465A5DC-AD28-49A2-89C0-F81838814A7E}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

-		{C465A5DC-AD28-49A2-89C0-F81838814A7E}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

-		{C465A5DC-AD28-49A2-89C0-F81838814A7E}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

-		{C465A5DC-AD28-49A2-89C0-F81838814A7E}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

 		{84E22F5F-0562-4B51-8B9A-FD79FF33A8B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{84E22F5F-0562-4B51-8B9A-FD79FF33A8B5}.Debug|Any CPU.Build.0 = Debug|Any CPU

 		{84E22F5F-0562-4B51-8B9A-FD79FF33A8B5}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

@@ -2838,7 +2820,6 @@ Global
 		{9E4BA410-8338-42EC-AF9C-422C35ECED81} = {78C10DAE-D3D7-44FC-93DF-831D8D54ECF9}

 		{73D4CC8B-BAB9-4A29-841B-F25C6311F067} = {78C10DAE-D3D7-44FC-93DF-831D8D54ECF9}

 		{865100E2-A29C-4FCD-B803-1A0B9A0A6EF7} = {78C10DAE-D3D7-44FC-93DF-831D8D54ECF9}

-		{C465A5DC-AD28-49A2-89C0-F81838814A7E} = {F12939F1-D55A-4CE9-9F33-8D959BFC7D6C}

 		{84E22F5F-0562-4B51-8B9A-FD79FF33A8B5} = {78C10DAE-D3D7-44FC-93DF-831D8D54ECF9}

 		{6224D87E-2AC1-4D9F-91ED-714F797297BF} = {DE462010-393D-4655-A42C-2C78BB14D2FA}

 		{D2A4E99E-FC2D-45A9-8BE7-1AB7DF95BA2A} = {DE462010-393D-4655-A42C-2C78BB14D2FA}

diff --git a/main/external/RefactoringEssentials b/main/external/RefactoringEssentials
deleted file mode 160000
-Subproject a2e8503ee2518a58fbe7a4fb00b3f5e72fa60d9
diff --git a/main/po/po.mdproj b/main/po/po.mdproj
index ce55684ea7..db2cebff63 100644
--- a/main/po/po.mdproj
+++ b/main/po/po.mdproj
@@ -93,10 +93,6 @@
           <projectName>IKVM.Reflection</projectName>
           <isIncluded>False</isIncluded>
         </TranslationProjectInformation>
-        <TranslationProjectInformation>
-          <projectName>RefactoringEssentials</projectName>
-          <isIncluded>True</isIncluded>
-        </TranslationProjectInformation>
       </projectInformations>
     </projectInformations>
   </PropertyGroup>
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/MonoDevelopWorkspaceDiagnosticAnalyzerProviderService.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/MonoDevelopWorkspaceDiagnosticAnalyzerProviderService.cs
index 42a457c36c..aa2e046d08 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/MonoDevelopWorkspaceDiagnosticAnalyzerProviderService.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/MonoDevelopWorkspaceDiagnosticAnalyzerProviderService.cs
@@ -51,7 +51,6 @@ namespace MonoDevelop.AnalysisCore
 		string [] RuntimeEnabledAssemblies;
 		public MonoDevelopWorkspaceDiagnosticAnalyzerProviderService ()
 		{
-			RefactoringEssentials.NRefactory6Host.GetLocalizedString = GettextCatalog.GetString;
 			hostDiagnosticAnalyzerInfoTask = Task.Run (() => CreateHostDiagnosticAnalyzerPackages ());
 		}
 
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionEditorExtension.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionEditorExtension.cs
index 73fad46ae4..f7fb5ef52c 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionEditorExtension.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionEditorExtension.cs
@@ -47,7 +47,6 @@ using MonoDevelop.Core.Text;
 using MonoDevelop.Ide.Editor;
 using MonoDevelop.Ide.Editor.Extension;
 using MonoDevelop.Refactoring;
-using RefactoringEssentials;
 using MonoDevelop.AnalysisCore.Gui;
 using MonoDevelop.SourceEditor;
 using Gdk;
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeFixMenuService.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeFixMenuService.cs
index 5b920890ba..0cc80e2670 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeFixMenuService.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeFixMenuService.cs
@@ -48,7 +48,6 @@ using MonoDevelop.Ide;
 using MonoDevelop.Ide.Composition;
 using MonoDevelop.Ide.Editor;
 using MonoDevelop.Refactoring;
-using RefactoringEssentials;
 using MonoDevelop.AnalysisCore;
 
 namespace MonoDevelop.CodeActions
@@ -281,36 +280,6 @@ namespace MonoDevelop.CodeActions
 			public async Task Run ()
 			{
 				var token = default (CancellationToken);
-				if (act is InsertionAction insertionAction) {
-					var insertion = await insertionAction.CreateInsertion (token).ConfigureAwait (false);
-
-					var document = await IdeApp.Workbench.OpenDocument (insertion.Location.SourceTree.FilePath, documentContext.Project);
-					var parsedDocument = await document.DocumentContext.UpdateParseDocument ();
-					var model = await document.DocumentContext.AnalysisDocument.GetSemanticModelAsync (token);
-					if (parsedDocument != null) {
-						var insertionPoints = InsertionPointService.GetInsertionPoints (
-							document.Editor,
-							model,
-							insertion.Type,
-							insertion.Location.SourceSpan.Start
-						);
-
-						var options = new InsertionModeOptions (
-							insertionAction.Title,
-							insertionPoints,
-							point => {
-								if (!point.Success)
-									return;
-								var node = Formatter.Format (insertion.Node, document.DocumentContext.RoslynWorkspace, document.DocumentContext.GetOptionSet (), token);
-								point.InsertionPoint.Insert (document.Editor, document.DocumentContext, node.ToString ());
-								// document = await Simplifier.ReduceAsync(document.AnalysisDocument, Simplifier.Annotation, cancellationToken: token).ConfigureAwait(false);
-							}
-						);
-
-						document.Editor.StartInsertionMode (options);
-						return;
-					}
-				}
 
 				var oldSolution = documentContext.AnalysisDocument.Project.Solution;
 				var updatedSolution = oldSolution;
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeRefactoringService.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeRefactoringService.cs
index 8f480dc917..99a7e5f1c7 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeRefactoringService.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeRefactoringService.cs
@@ -36,7 +36,6 @@ using MonoDevelop.Core;
 using MonoDevelop.Ide.Editor;
 using MonoDevelop.CodeIssues;
 using Mono.Addins;
-using RefactoringEssentials;
 using System.Linq;
 
 namespace MonoDevelop.CodeActions
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/DiagnosticResult.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/DiagnosticResult.cs
index 25a01a789d..ec52a819f7 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/DiagnosticResult.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/DiagnosticResult.cs
@@ -28,7 +28,6 @@ using System;
 using MonoDevelop.AnalysisCore;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.CodeAnalysis;
-using RefactoringEssentials;
 using System.Linq;
 using System.Globalization;
 
@@ -62,8 +61,6 @@ namespace MonoDevelop.CodeIssues
 		{
 			if (DescriptorHasTag (diagnostic.Descriptor, WellKnownDiagnosticTags.Unnecessary))
 				return IssueMarker.GrayOut;
-			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.Refactoring.Rename/RenameItemDialog.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameItemDialog.cs
index 7e3cba87f7..2aee1b82ee 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameItemDialog.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameItemDialog.cs
@@ -36,7 +36,6 @@ using System.Linq;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.CodeAnalysis;
 using System.Threading.Tasks;
-using RefactoringEssentials;
 using System.IO;
 
 namespace MonoDevelop.Refactoring.Rename
@@ -126,7 +125,7 @@ namespace MonoDevelop.Refactoring.Rename
 				if (loc.IsInSource) {
 					if (loc.SourceTree == null ||
 						!System.IO.File.Exists (loc.SourceTree.FilePath) ||
-						GeneratedCodeRecognition.IsFileNameForGeneratedCode (loc.SourceTree.FilePath)) {
+						IsFileNameForGeneratedCode (loc.SourceTree.FilePath)) {
 						continue;
 					} 
 					var oldName = System.IO.Path.GetFileNameWithoutExtension (loc.SourceTree.FilePath);
@@ -138,6 +137,39 @@ namespace MonoDevelop.Refactoring.Rename
 			}
 		}
 
+		#region From RefactoringEssentials.GeneratedCodeRecognition
+
+		static readonly string [] generatedCodeSuffixes = {
+			"AssemblyInfo",
+			".designer",
+			".generated",
+			".g",
+			".g.i",
+			".AssemblyAttributes"
+		};
+
+		static readonly string generatedCodePrefix = "TemporaryGeneratedFile_";
+
+		public static bool IsFileNameForGeneratedCode (string fileName)
+		{
+			if (fileName.StartsWith (generatedCodePrefix, StringComparison.OrdinalIgnoreCase)) {
+				return true;
+			}
+
+			string extension = System.IO.Path.GetExtension (fileName);
+			if (extension != string.Empty) {
+				fileName = System.IO.Path.GetFileNameWithoutExtension (fileName);
+
+				foreach (var suffix in generatedCodeSuffixes) {
+					if (fileName.EndsWith (suffix, StringComparison.OrdinalIgnoreCase))
+						return true;
+				}
+			}
+
+			return false;
+		}
+
+		#endregion
 
 		void Init (string title, string currenName, Func<RenameRefactoring.RenameProperties, Task<IList<Change>>> rename)
 		{
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.addin.xml b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.addin.xml
index c7976c55c7..1fa02f5ba2 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.addin.xml
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.addin.xml
@@ -1,9 +1,6 @@
 
 <ExtensionModel>
-	<Runtime>
-		<Import assembly="RefactoringEssentials.dll" />
-	</Runtime>
-	
+
 	<!-- Extension Points -->
 	<ExtensionPoint path = "/MonoDevelop/Refactoring/Refactorings" name = "Refactorings">
 		<ExtensionNode name="Class"/>
@@ -168,7 +165,6 @@
 
 	<Extension path="/MonoDevelop/Ide/Composition">
 		<Assembly file="MonoDevelop.Refactoring.dll"/>
-		<Assembly file="RefactoringEssentials.dll"/>
 	</Extension>
 
 	<ExtensionPoint path="/MonoDevelop/Refactoring/AnalyzerAssemblies">
@@ -176,8 +172,6 @@
 	</ExtensionPoint>
 
 	<Extension path="/MonoDevelop/Refactoring/AnalyzerAssemblies">
-		<Assembly file="RefactoringEssentials" />
-		<Assembly file="Refactoring Essentials" />
 		<Assembly file="Microsoft.CodeAnalysis.CSharp" />
 		<Assembly file="Microsoft.CodeAnalysis.CSharp.Features" />
 		<Assembly file="Microsoft.CodeAnalysis.EditorFeatures" />
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj
index 5d94bc773f..8981eb193d 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj
@@ -25,7 +25,6 @@
       <HintPath>..\..\..\external\Xamarin.Mac.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <IncludeCopyLocal Include="RefactoringEssentials.dll" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
@@ -176,11 +175,6 @@
       <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>True</Private>
-    </ProjectReference>
     <ProjectReference Include="..\MonoDevelop.TextEditor\MonoDevelop.TextEditor\MonoDevelop.TextEditor.csproj">
       <Project>{3f5b5bda-69d5-441a-8142-aa25c998a997}</Project>
       <Name>MonoDevelop.TextEditor</Name>
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopRuleSetManager.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopRuleSetManager.cs
index 27ba0acb21..41743dcc7d 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopRuleSetManager.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopRuleSetManager.cs
@@ -84,15 +84,6 @@ namespace MonoDevelop.Ide.TypeSystem
 				sw.WriteLine ("<RuleSet Name=\"Global Rules\" ToolsVersion=\"12.0\">");
 				sw.WriteLine ("    <Rules AnalyzerId=\"Roslyn\" RuleNamespace=\"Roslyn\">>");
 				foreach (var kv in reportDiagnostics) {
-					if (kv.Key.StartsWith ("RE", StringComparison.Ordinal))
-						continue;
-					sw.WriteLine ("        <Rule Id=\"{0}\" Action=\"{1}\"/>", kv.Key, ConvertReportDiagnosticToAction (kv.Value));
-				}
-				sw.WriteLine ("    </Rules>");
-				sw.WriteLine ("    <Rules AnalyzerId=\"RefactoringEssentials\" RuleNamespace=\"RefactoringEssentials\">>");
-				foreach (var kv in reportDiagnostics) {
-					if (!kv.Key.StartsWith ("RE", StringComparison.Ordinal))
-						continue;
 					sw.WriteLine ("        <Rule Id=\"{0}\" Action=\"{1}\"/>", kv.Key, ConvertReportDiagnosticToAction (kv.Value));
 				}
 				sw.WriteLine ("    </Rules>");
diff --git a/main/tests/MonoDevelop.CSharpBinding.Tests/MonoDevelop.CSharpBinding.Refactoring/CSharpCodeActionEditorExtensionTests.cs b/main/tests/MonoDevelop.CSharpBinding.Tests/MonoDevelop.CSharpBinding.Refactoring/CSharpCodeActionEditorExtensionTests.cs
index 28a97d2697..08e5eca52e 100644
--- a/main/tests/MonoDevelop.CSharpBinding.Tests/MonoDevelop.CSharpBinding.Refactoring/CSharpCodeActionEditorExtensionTests.cs
+++ b/main/tests/MonoDevelop.CSharpBinding.Tests/MonoDevelop.CSharpBinding.Refactoring/CSharpCodeActionEditorExtensionTests.cs
@@ -55,7 +55,6 @@ namespace MonoDevelop.CSharpBinding.Refactoring
 					new CodeActionData { Message = "Add accessibility modifiers" },
 				},
 				CodeRefactoringData = new CodeActionData [] {
-					new CodeActionData { Message = "To public" },
 					// NOTE: This will return when we implement UI for it
 					//new CodeActionData { Message = "Move to namespace..." },
 					new CodeActionData { Message = "Generate overrides..." },
diff --git a/main/tests/MonoDevelop.CSharpBinding.Tests/MonoDevelop.CSharpBinding.Refactoring/CSharpResultsEditorExtensionTests.cs b/main/tests/MonoDevelop.CSharpBinding.Tests/MonoDevelop.CSharpBinding.Refactoring/CSharpResultsEditorExtensionTests.cs
index 7798e677dc..98a96f54a2 100644
--- a/main/tests/MonoDevelop.CSharpBinding.Tests/MonoDevelop.CSharpBinding.Refactoring/CSharpResultsEditorExtensionTests.cs
+++ b/main/tests/MonoDevelop.CSharpBinding.Tests/MonoDevelop.CSharpBinding.Refactoring/CSharpResultsEditorExtensionTests.cs
@@ -67,7 +67,6 @@ class MyClass
 
 			new ExpectedDiagnostic (68, DiagnosticSeverity.Hidden, "Accessibility modifiers required"),
 			new ExpectedDiagnostic (248, DiagnosticSeverity.Error, "The name 'cls' does not exist in the current context"),
-			new ExpectedDiagnostic (144, DiagnosticSeverity.Info, "Empty constructor is redundant"),
 		};
 
 		// These tests can hang if we don't get enough updates (i.e. code changes)
@@ -75,7 +74,7 @@ class MyClass
 		[Test]
 		public async Task DiagnosticsAreReportedByExtension ()
 		{
-			await RunTest (5, OneFromEach, (remainingUpdates, doc) => {
+			await RunTest (4, OneFromEach, (remainingUpdates, doc) => {
 				if (remainingUpdates == 0) {
 					AssertExpectedDiagnostics (OneFromEachDiagnostics, doc);
 				}
@@ -86,7 +85,7 @@ class MyClass
 		[Test]
 		public async Task DiagnosticEnableSourceAnalysisChanged ()
 		{
-			await RunTest (6, OneFromEach, (remainingUpdates, doc) => {
+			await RunTest (5, OneFromEach, (remainingUpdates, doc) => {
 				if (remainingUpdates == 5) {
 					AssertExpectedDiagnostics (OneFromEachDiagnostics.Take (2), doc);
 				}
diff --git a/main/tests/MonoDevelop.CSharpBinding.Tests/MonoDevelop.CSharpBinding.Tests.csproj b/main/tests/MonoDevelop.CSharpBinding.Tests/MonoDevelop.CSharpBinding.Tests.csproj
index b019ade0c7..cb4ddaaf4b 100644
--- a/main/tests/MonoDevelop.CSharpBinding.Tests/MonoDevelop.CSharpBinding.Tests.csproj
+++ b/main/tests/MonoDevelop.CSharpBinding.Tests/MonoDevelop.CSharpBinding.Tests.csproj
@@ -92,11 +92,6 @@
       <Name>MonoDevelop.Core</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="..\..\src\addins\MonoDevelop.Debugger\MonoDevelop.Debugger.csproj">
       <Project>{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}</Project>
       <Name>MonoDevelop.Debugger</Name>
diff --git a/main/tests/MonoDevelop.Refactoring.Tests/MonoDevelop.Refactoring.Tests.csproj b/main/tests/MonoDevelop.Refactoring.Tests/MonoDevelop.Refactoring.Tests.csproj
index 611316c77f..4f4d56c368 100644
--- a/main/tests/MonoDevelop.Refactoring.Tests/MonoDevelop.Refactoring.Tests.csproj
+++ b/main/tests/MonoDevelop.Refactoring.Tests/MonoDevelop.Refactoring.Tests.csproj
@@ -65,11 +65,6 @@
       <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="..\IdeUnitTests\IdeUnitTests.csproj">
       <Project>{F7B2B155-7CF4-42C4-B5AF-63C0667D2E4F}</Project>
       <Name>IdeUnitTests</Name>