Adjust SharpDevelop to NRefactory update.

I removed the Mono.Cecil reference from SD.Base as it was only used in the broken debugger-decompiler code, which doesn't really belong into Base anyways.

SharpDevelop.Tests.sln

@@ -30,7 +30,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil", "src\Libraries\Mono.Cecil\Mono.Cecil.csproj", "{D68133BD-1E63-496E-9EDE-4FBDBF77B486}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil", "src\Libraries\cecil\Mono.Cecil.csproj", "{D68133BD-1E63-496E-9EDE-4FBDBF77B486}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.AvalonEdit.Tests", "src\Libraries\AvalonEdit\ICSharpCode.AvalonEdit.Tests\ICSharpCode.AvalonEdit.Tests.csproj", "{6222A3A1-83CE-47A3-A4E4-A018F82D44D8}"
 EndProject

SharpDevelop.sln

@@ -26,7 +26,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil", "src\Libraries\Mono.Cecil\Mono.Cecil.csproj", "{D68133BD-1E63-496E-9EDE-4FBDBF77B486}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil", "src\Libraries\cecil\Mono.Cecil.csproj", "{D68133BD-1E63-496E-9EDE-4FBDBF77B486}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NRefactory", "NRefactory", "{E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}"
 	ProjectSection(SolutionItems) = postProject

src/AddIns/BackendBindings/CSharpBinding/Project/Src/Completion/CSharpCompletionDataFactory.cs

@@ -149,9 +149,9 @@ namespace CSharpBinding.Completion
 			return CreateMethodDataProvider(startOffset, new[] { type.GetDelegateInvokeMethod() });
 		}
 		
-		IParameterDataProvider IParameterCompletionDataFactory.CreateIndexerParameterDataProvider(int startOffset, IType type, AstNode resolvedNode)
+		IParameterDataProvider IParameterCompletionDataFactory.CreateIndexerParameterDataProvider(int startOffset, IType type, IEnumerable<IProperty> accessibleIndexers, AstNode resolvedNode)
 		{
-			return CreateMethodDataProvider(startOffset, type.GetProperties(p => p.IsIndexer));
+			return CreateMethodDataProvider(startOffset, accessibleIndexers);
 		}
 		
 		IParameterDataProvider IParameterCompletionDataFactory.CreateTypeParameterDataProvider(int startOffset, IEnumerable<IType> types)

src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/SDRefactoringContext.cs

@@ -28,7 +28,7 @@ namespace CSharpBinding.Refactoring
 		readonly ITextEditor editor;
 		readonly ITextSource textSource;
 		readonly TextLocation location;
-		volatile IDocument document;
+		IDocument document;
 		int selectionStart, selectionLength;
 		
 		public static SDRefactoringContext Create(ITextEditor editor, CancellationToken cancellationToken)

src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj

@@ -161,7 +161,7 @@
       <Name>ICSharpCode.AvalonEdit</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Libraries\Mono.Cecil\Mono.Cecil.csproj">
+    <ProjectReference Include="..\..\..\Libraries\cecil\Mono.Cecil.csproj">
       <Project>{D68133BD-1E63-496E-9EDE-4FBDBF77B486}</Project>
       <Name>Mono.Cecil</Name>
       <Private>False</Private>

src/AddIns/Debugger/Debugger.AddIn/Pads/BreakPointsPad.cs

@@ -29,18 +29,19 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
 			return mark.IsVisibleInBookmarkPad && mark is BreakpointBookmark;
 		}
 		
+		/*
 		protected override void OnItemActivated(SDBookmark bookmark)
 		{
 			if (bookmark is DecompiledBreakpointBookmark) {
-//				// get information from breakpoint and navigate to the decompiled type
-//				string assemblyFile, typeName;
-//				if (DecompiledBreakpointBookmark.GetAssemblyAndType(bookmark.FileName, out assemblyFile, out typeName)) {
-//					NavigationService.NavigateTo(assemblyFile, typeName, string.Empty, bookmark.LineNumber, false);
-//				}
+				// get information from breakpoint and navigate to the decompiled type
+				string assemblyFile, typeName;
+				if (DecompiledBreakpointBookmark.GetAssemblyAndType(bookmark.FileName, out assemblyFile, out typeName)) {
+					NavigationService.NavigateTo(assemblyFile, typeName, string.Empty, bookmark.LineNumber, false);
+				}
 				throw new NotImplementedException();
 			} else {
 				base.OnItemActivated(bookmark);
 			}
-		}
+		}*/
 	}
 }

src/AddIns/Debugger/Debugger.AddIn/Service/WindowsDebugger.cs

@@ -409,7 +409,8 @@ namespace ICSharpCode.SharpDevelop.Services
 		{
 			Breakpoint breakpoint = null;
 			
-			if (bookmark is DecompiledBreakpointBookmark) {
+			#warning decompiler
+			/*if (bookmark is DecompiledBreakpointBookmark) {
 				try {
 					if (debuggerDecompilerService == null) {
 						LoggingService.Warn("No IDebuggerDecompilerService found!");
@@ -429,16 +430,15 @@ namespace ICSharpCode.SharpDevelop.Services
 					
 					int[] ilRanges;
 					int methodToken;
-					#warning decompiler
 //					if (debuggerDecompilerService.GetILAndTokenByLineNumber(token, dbb.LineNumber, out ilRanges, out methodToken)) {
 //						CurrentDebugger.AddILBreakpoint(memberReference.FullName, dbb.LineNumber, memberReference.MetadataToken.ToInt32(), methodToken, ilRanges[0], dbb.IsEnabled);
 //					}
 				} catch (System.Exception ex) {
 					LoggingService.Error("Error on DecompiledBreakpointBookmark: " + ex.Message);
 				}
-			} else {
-				breakpoint = CurrentDebugger.AddBreakpoint(bookmark.FileName, bookmark.LineNumber, 0, bookmark.IsEnabled);
-			}
+			} else {*/
+			breakpoint = CurrentDebugger.AddBreakpoint(bookmark.FileName, bookmark.LineNumber, 0, bookmark.IsEnabled);
+			//}
 			
 			if (breakpoint == null) {
 				LoggingService.Warn(string.Format("unable to create breakpoint: {0}", bookmark.ToString()));

src/AddIns/Debugger/Debugger.Core/Debugger.Core.csproj

@@ -126,7 +126,7 @@
     <Folder Include="Interop" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Libraries\Mono.Cecil\Mono.Cecil.csproj">
+    <ProjectReference Include="..\..\..\Libraries\cecil\Mono.Cecil.csproj">
       <Project>{D68133BD-1E63-496E-9EDE-4FBDBF77B486}</Project>
       <Name>Mono.Cecil</Name>
       <Private>False</Private>

src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.csproj

@@ -224,11 +224,6 @@
       <Name>ICSharpCode.AvalonEdit</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Libraries\Mono.Cecil\Mono.Cecil.csproj">
-      <Project>{D68133BD-1E63-496E-9EDE-4FBDBF77B486}</Project>
-      <Name>Mono.Cecil</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\Libraries\NRefactory\ICSharpCode.NRefactory.Xml\ICSharpCode.NRefactory.Xml.csproj">
       <Project>{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}</Project>
       <Name>ICSharpCode.NRefactory.Xml</Name>

src/AddIns/DisplayBindings/ILSpyAddIn/ILSpyAddIn.csproj

@@ -94,7 +94,7 @@
       <Project>{984CC812-9470-4A13-AFF9-CC44068D666C}</Project>
       <Name>ICSharpCode.Decompiler</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Libraries\Mono.Cecil\Mono.Cecil.csproj">
+    <ProjectReference Include="..\..\..\Libraries\cecil\Mono.Cecil.csproj">
       <Project>{D68133BD-1E63-496E-9EDE-4FBDBF77B486}</Project>
       <Name>Mono.Cecil</Name>
       <Private>False</Private>

src/Libraries/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj

@@ -129,7 +129,7 @@
     <None Include="Properties\AssemblyInfo.template.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Mono.Cecil\Mono.Cecil.csproj">
+    <ProjectReference Include="..\cecil\Mono.Cecil.csproj">
       <Project>{D68133BD-1E63-496E-9EDE-4FBDBF77B486}</Project>
       <Name>Mono.Cecil</Name>
       <Private>False</Private>

src/Libraries/NRefactory/ICSharpCode.NRefactory.Tests/ICSharpCode.NRefactory.Tests.csproj

@@ -66,7 +66,7 @@
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="nunit.framework">
-      <HintPath>..\..\Mono.Cecil\Test\libs\nunit-2.5.10\nunit.framework.dll</HintPath>
+      <HintPath>..\..\cecil\Test\libs\nunit-2.5.10\nunit.framework.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj

@@ -865,10 +865,6 @@
       <Name>ICSharpCode.AvalonEdit</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Libraries\Mono.Cecil\Mono.Cecil.csproj">
-      <Project>{D68133BD-1E63-496E-9EDE-4FBDBF77B486}</Project>
-      <Name>Mono.Cecil</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\Libraries\NRefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
       <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
       <Name>ICSharpCode.NRefactory</Name>

src/Main/Base/Project/Src/Editor/Commands/GoToDefinition.cs

@@ -8,7 +8,6 @@ using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.SharpDevelop.Gui;
 using ICSharpCode.SharpDevelop.Project;
-using Mono.Cecil;
 
 namespace ICSharpCode.SharpDevelop.Editor.Commands
 {

src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/GacReferencePanel.cs

@@ -12,7 +12,6 @@ using ICSharpCode.Build.Tasks;
 using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop.Parser;
 using ICSharpCode.SharpDevelop.Project;
-using Mono.Cecil;
 
 namespace ICSharpCode.SharpDevelop.Gui
 {
@@ -55,8 +54,6 @@ namespace ICSharpCode.SharpDevelop.Gui
 		ColumnSorter sorter;
 		BackgroundWorker worker;
 		List<ListViewItem> resultList = new List<ListViewItem>();
-		Dictionary<string, AssemblyDefinition> assembliesCache = new Dictionary<string, AssemblyDefinition>();
-		DefaultAssemblyResolver resolver = new DefaultAssemblyResolver();
 		
 		public GacReferencePanel(ISelectReferenceDialog selectDialog)
 		{
@@ -151,14 +148,9 @@ namespace ICSharpCode.SharpDevelop.Gui
 				worker = null;
 				
 				// clear all cached data
-				assembliesCache = null;
 				resultList = null;
 				selectDialog = null;
-				resolver = null;
 				fullItemList = null;
-				
-				// force a collection to reclam memory
-				GC.Collect();
 			}
 			base.Dispose(disposing);
 		}

src/Main/Base/Project/Src/Services/Debugger/DebuggerService.cs

@@ -10,7 +10,6 @@ using ICSharpCode.SharpDevelop.Editor;
 using ICSharpCode.SharpDevelop.Editor.Bookmarks;
 using ICSharpCode.SharpDevelop.Gui;
 using ICSharpCode.SharpDevelop.Project;
-using Mono.Cecil;
 
 namespace ICSharpCode.SharpDevelop.Debugging
 {
@@ -239,6 +238,7 @@ namespace ICSharpCode.SharpDevelop.Debugging
 	[SDService]
 	public interface IDebuggerDecompilerService
 	{
+		/*
 		/// <summary>
 		/// Gets or sets the current method token and IL offset. Used for step in/out.
 		/// </summary>
@@ -280,5 +280,6 @@ namespace ICSharpCode.SharpDevelop.Debugging
 		/// <param name="assemblyFile">Assembly file path.</param>
 		/// <returns>An <see cref="IAssemblyResolver"/>.</returns>
 		IAssemblyResolver GetAssemblyResolver(string assemblyFile);
+		*/
 	}
 }

src/Main/Base/Project/Src/Services/Debugger/DecompiledBreakpointBookmark.cs

@@ -4,10 +4,10 @@ using System;
 using ICSharpCode.Core;
 using ICSharpCode.NRefactory;
 using ICSharpCode.SharpDevelop.Debugging;
-using Mono.Cecil;
 
 namespace ICSharpCode.SharpDevelop.Editor.Bookmarks
 {
+	/*
 	public class DecompiledBreakpointBookmark : BreakpointBookmark
 	{
 		public const string SEPARATOR = ","; // don't use '.'
@@ -69,4 +69,5 @@ namespace ICSharpCode.SharpDevelop.Editor.Bookmarks
 			return true;
 		}
 	}
+	*/
 }

src/Main/SharpDevelop/SharpDevelop.csproj

@@ -183,7 +183,7 @@
       <Project>{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}</Project>
       <Name>ICSharpCode.AvalonEdit</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Libraries\Mono.Cecil\Mono.Cecil.csproj">
+    <ProjectReference Include="..\..\Libraries\cecil\Mono.Cecil.csproj">
       <Project>{D68133BD-1E63-496E-9EDE-4FBDBF77B486}</Project>
       <Name>Mono.Cecil</Name>
     </ProjectReference>