Merge branch 'newNR' of github.com:icsharpcode/SharpDevelop into newNR

doc/technotes/Release Process.txt

@@ -1,6 +1,7 @@
 SharpDevelop release process:
 
 [Christoph]:
+ * Ensure GlobalAssemblyInfo.template has the correct version number and no 'beta' marker
  * Update /doc/readme.rtf if necessary
  * Upload files from build server to SourceForge
  * For non-beta releases: Set new release as default on SourceForge

src/AddIns/Analysis/Profiler/Controller/Profiler.Controller.csproj

@@ -26,7 +26,6 @@
     <DocumentationFile>..\bin\ICSharpCode.Profiler.Controller.xml</DocumentationFile>
     <SourceAnalysisOverrideSettingsFile>C:\Dokumente und Einstellungen\HP\Anwendungsdaten\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis</SourceAnalysisOverrideSettingsFile>
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-    <PreBuildEvent>..\X64Converter\bin\Profiler.X64Converter.exe</PreBuildEvent>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
@@ -62,7 +61,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>PdbOnly</DebugType>
-    <Optimize>true</Optimize>
+    <Optimize>True</Optimize>
     <DefineConstants>TRACE;PUBLIC_EXTENDEDREGISTRY</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -71,6 +70,8 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
+    <StartAction>Project</StartAction>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
     <RegisterForComInterop>False</RegisterForComInterop>
@@ -185,4 +186,7 @@
   <Target Name="AfterBuild">
   </Target>
   -->
+  <Target Name="AfterResolveReferences">
+    <Exec Command="$(OutDir)Profiler.X64Converter.exe" />
+  </Target>
 </Project>

src/AddIns/Analysis/Profiler/Frontend/AddIn/Profiler.AddIn.csproj

@@ -163,11 +163,6 @@
       <Name>ICSharpCode.Core.Presentation</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\Main\ICSharpCode.SharpDevelop.Dom\Project\ICSharpCode.SharpDevelop.Dom.csproj">
-      <Project>{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}</Project>
-      <Name>ICSharpCode.SharpDevelop.Dom</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\..\..\Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj">
       <Project>{8035765F-D51F-4A0C-A746-2FD100E19419}</Project>
       <Name>ICSharpCode.SharpDevelop.Widgets</Name>

src/AddIns/Analysis/Profiler/X64Converter/Profiler.X64Converter.csproj

@@ -15,8 +15,8 @@
     <SourceAnalysisOverrideSettingsFile>C:\Users\Siegfried\AppData\Roaming\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis</SourceAnalysisOverrideSettingsFile>
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
     <NoStdLib>False</NoStdLib>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <OutputPath>bin\</OutputPath>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <OutputPath>..\bin\</OutputPath>
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
@@ -35,6 +35,8 @@
     <BootstrapperEnabled>true</BootstrapperEnabled>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
+    <NoWin32Manifest>False</NoWin32Manifest>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -46,8 +48,8 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -63,6 +65,10 @@
     <BaseAddress>4194304</BaseAddress>
     <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core">

src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin

@@ -219,7 +219,6 @@
 		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantPrivateIssue" />
 		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantThisIssue" />
 		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantToStringIssue" />
-		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantTypeCastIssue" />
 		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.RedundantWhereWithPredicateIssue" />
 		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ReferenceEqualsCalledWithValueTypeIssue" />
 		<Class class = "ICSharpCode.NRefactory.CSharp.Refactoring.ReferenceToStaticMemberViaDerivedTypeIssue" />

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

@@ -88,7 +88,7 @@ namespace CSharpBinding.Refactoring
 		
 		protected virtual void FocusFirstElement()
 		{
-			Dispatcher.BeginInvoke(DispatcherPriority.Background, new Action(delegate { this.MoveFocus(new TraversalRequest(FocusNavigationDirection.First)); }));
+			Dispatcher.BeginInvoke(DispatcherPriority.Loaded, new Action(delegate { this.MoveFocus(new TraversalRequest(FocusNavigationDirection.First)); }));
 		}
 		
 		protected void AppendNewLine(Script script, AstNode afterNode, NewLineNode newLineNode)

src/AddIns/BackendBindings/CSharpBinding/Tests/RegistrationTests.cs

@@ -23,6 +23,7 @@ namespace CSharpBinding.Tests
 		Type[] exceptions = {
 			typeof(MultipleEnumerationIssue), // disabled due to https://github.com/icsharpcode/NRefactory/issues/123
 			typeof(RedundantAssignmentIssue), // disabled due to https://github.com/icsharpcode/NRefactory/issues/123
+			typeof(RedundantTypeCastIssue), // disabled due to plenty of false positives (e.g. when cast is necessary for overload resolution)
 		};
 		
 		Assembly NRCSharp = typeof(ICodeIssueProvider).Assembly;

src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core.UI/Helpers/VisualHelper.cs

@@ -492,45 +492,5 @@ namespace ICSharpCode.Data.Core.UI
 			else
 				return GetVisualParentObject(parent, walkThroughPopupRoot, comparePredicate);
 		}
-
-        /// <summary>
-        /// Runs an Action in the current dispatcher.
-        /// </summary>
-        /// <param name="actionToRun"></param>
-        public static void RunInDispatcher(Action actionToRun)
-        {
-            if (Application.Current != null)
-                RunInDispatcher(Application.Current.Dispatcher, actionToRun);
-        }
-
-        /// <summary>
-        /// Runs an Action in a given dispatcher.
-        /// </summary>
-        /// <param name="dispatcher"></param>
-        /// <param name="actionToRun"></param>
-        public static void RunInDispatcher(Dispatcher dispatcher, Action actionToRun)
-        {
-            dispatcher.Invoke(DispatcherPriority.Background, actionToRun);
-        }
-
-		/// <summary>
-		/// Runs through all items in the dispatcher.
-		/// </summary>
-		public static void DoEvents()
-		{
-			if (Application.Current != null)
-				DoEvents(Application.Current.Dispatcher);
-		}
-
-		/// <summary>
-		/// Gives DispatcherFrames of the given Dispatcher priority, if
-		/// their DispatcherPriority is higher than "DispatcherPriority.Background".
-		/// </summary>
-		/// <param name="dispatcherToPause"></param>
-		public static void DoEvents(Dispatcher dispatcherToPause)
-		{
-			SD.MainThread.VerifyAccess();
-			dispatcherToPause.Invoke(DispatcherPriority.Background, new System.Action(() => { }));
-		}
 	}
 }

src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/Helpers/VisualHelper.cs

@@ -489,44 +489,5 @@ namespace ICSharpCode.Data.EDMDesigner.Core.UI.Helpers
 			else
 				return GetVisualParentObject(parent, walkThroughPopupRoot, comparePredicate);
 		}
-
-        /// <summary>
-        /// Runs an Action in the current dispatcher.
-        /// </summary>
-        /// <param name="actionToRun"></param>
-        public static void RunInDispatcher(Action actionToRun)
-        {
-            if (Application.Current != null)
-                RunInDispatcher(Application.Current.Dispatcher, actionToRun);
-        }
-
-        /// <summary>
-        /// Runs an Action in a given dispatcher.
-        /// </summary>
-        /// <param name="dispatcher"></param>
-        /// <param name="actionToRun"></param>
-        public static void RunInDispatcher(Dispatcher dispatcher, Action actionToRun)
-        {
-            dispatcher.Invoke(DispatcherPriority.Background, actionToRun);
-        }
-
-		/// <summary>
-		/// Runs through all items in the dispatcher.
-		/// </summary>
-		public static void DoEvents()
-		{
-			if (Application.Current != null)
-				DoEvents(Application.Current.Dispatcher);
-		}
-
-		/// <summary>
-		/// Gives DispatcherFrames of the given Dispatcher priority, if
-		/// their DispatcherPriority is higher than "DispatcherPriority.Background".
-		/// </summary>
-		/// <param name="dispatcherToPause"></param>
-		public static void DoEvents(Dispatcher dispatcherToPause)
-		{
-			dispatcherToPause.Invoke(DispatcherPriority.Background, new System.Action(() => { }));
-		}
 	}
 }

src/Main/Base/Project/Editor/CodeCompletion/ICompletionItemHandler.cs

@@ -1,13 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-
-namespace ICSharpCode.SharpDevelop.Editor.CodeCompletion
-{
-	public interface ICompletionItemHandler
-	{
-		void Insert(CompletionContext context, ICompletionItem item);
-		bool Handles(ICompletionItem item);
-	}
-}

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

@@ -181,7 +181,6 @@
     <Compile Include="Src\Commands\SharpDevelopRoutedCommands.cs" />
     <Compile Include="Src\Commands\ViewInBrowser.cs" />
     <Compile Include="Src\Editor\AvalonEdit\IndentationStrategyAdapter.cs" />
-    <Compile Include="Editor\CodeCompletion\ICompletionItemHandler.cs" />
     <Compile Include="Src\Editor\CodeCompletion\CodeCompletionPanelXaml.xaml.cs" />
     <Compile Include="Src\Editor\Commands\ClassBookmarkSubmenuBuilder.cs" />
     <Compile Include="Src\Editor\Commands\ClassMemberMenuBuilder.cs" />

src/Main/Base/Project/Src/Gui/Pads/TaskList/TaskListPad.cs

@@ -217,7 +217,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 		
 		IUnresolvedTypeDefinition GetCurrentClass()
 		{
-			if (SD.Workbench.ActiveViewContent == null)
+			if (SD.Workbench.ActiveViewContent == null || SD.Workbench.ActiveViewContent.PrimaryFileName == null)
 				return null;
 			
 			IUnresolvedFile parseInfo = SD.ParserService.GetExistingUnresolvedFile(SD.Workbench.ActiveViewContent.PrimaryFileName);

src/Main/Base/Project/Src/Project/Behaviors/DefaultProjectBehavior.cs

@@ -106,7 +106,7 @@ namespace ICSharpCode.SharpDevelop.Project
 				}
 			}
 			System.Windows.Threading.Dispatcher.CurrentDispatcher.BeginInvoke(
-				System.Windows.Threading.DispatcherPriority.Background,
+				System.Windows.Threading.DispatcherPriority.Loaded,
 				new Action(
 					delegate {
 						NavigationService.SuspendLogging();

src/Main/SharpDevelop/Workbench/AvalonPadContent.cs

@@ -83,7 +83,7 @@ namespace ICSharpCode.SharpDevelop.Workbench
 					if (isFocused) {
 						IInputElement initialFocus = padInstance.InitiallyFocusedControl as IInputElement;
 						if (initialFocus != null) {
-							Dispatcher.BeginInvoke(DispatcherPriority.Input,
+							Dispatcher.BeginInvoke(DispatcherPriority.Loaded,
 							                       new Action(delegate { Keyboard.Focus(initialFocus); }));
 						}
 					}

src/Main/SharpDevelop/Workbench/AvalonWorkbenchWindow.cs

@@ -55,7 +55,7 @@ namespace ICSharpCode.SharpDevelop.Workbench
 		internal static void SetFocus(ManagedContent m, Func<IInputElement> activeChildFunc, bool forceSetFocus = false)
 		{
 			m.Dispatcher.BeginInvoke(
-				DispatcherPriority.Input,
+				DispatcherPriority.Loaded,
 				new Action(
 					delegate {
 						// ensure that condition for FocusContent() is still fulfilled

src/Setup/Files.wxs

@@ -1432,7 +1432,7 @@
 										<File Source="..\..\AddIns\Misc\SearchAndReplace\SearchAndReplace.dll" Id="SearchAndReplace.dll" Name="SearchAndReplace.dll" />
 									</Component>
 								</Directory>
-								<!--<Directory Id="Profiler" Name="Profiler">
+								<Directory Id="Profiler" Name="Profiler">
 									<Component Guid="C46A4B2C-D5DE-4548-B4A9-4B0AB8C105F3" Id="Hook32Dll" DiskId="1">
 										<File Source="..\..\AddIns\Misc\Profiler\Hook32.dll" Name="Hook32.dll" Id="Hook32.dll" KeyPath="yes" />
 									</Component>
@@ -1457,7 +1457,7 @@
 									<Component Guid="E1C27BD1-4FEA-4CAA-884F-1FD93D861426" Id="IQToolkitDll" DiskId="1">
 										<File Source="..\..\AddIns\Misc\Profiler\IQToolkit.dll" Name="IQToolkit.dll" Id="IQToolkit.dll" KeyPath="yes" />
 									</Component>
-								</Directory>-->
+								</Directory>
 								<Directory Id="UsageDataCollector" Name="UsageDataCollector">
 									<Component Guid="952BD2C8-F477-4C87-A869-80E4B5E955D6" Id="UDCSystemDataSQLiteDll" DiskId="1">
 										<File Source="..\..\AddIns\Misc\UsageDataCollector\System.Data.SQLite.dll" Name="System.Data.SQLite.dll" Id="UDC.System.Data.SQLite.dll" KeyPath="yes" />

src/Setup/Setup.wxs

@@ -411,14 +411,14 @@
 				<ComponentRef Id="AvalonEditAddInAddin"/>
 				<ComponentRef Id="ICSharpCodeAvalonEditAddInDll"/>
 				
-				<!--<ComponentRef Id="Hook32Dll"/>
+				<ComponentRef Id="Hook32Dll"/>
 				<ComponentRef Id="Hook64Dll"/>
 				<ComponentRef Id="ICSharpCodeProfilerAddInAddin"/>
 				<ComponentRef Id="ICSharpCodeProfilerAddInDll"/>
 				<ComponentRef Id="ICSharpCodeProfilerControllerDll"/>
 				<ComponentRef Id="ICSharpCodeProfilerControlsDll"/>
 				<ComponentRef Id="SystemDataSQLiteDll"/>
-				<ComponentRef Id="IQToolkitDll"/>-->
+				<ComponentRef Id="IQToolkitDll"/>
 				
 				<ComponentRef Id="CppBindingAddin"/>
 				<ComponentRef Id="CppBindingDll"/>

src/Tools/Tools.build

@@ -71,8 +71,8 @@
 		<CleanupDirectories Include="..\..\bin\setup\help"/>
 		<CleanupDirectories Include="..\..\AddIns"/>
 		<CleanupDirectories Include="..\setup\bin"/>
-		<CleanupDirectories Include="..\AddIns\Misc\Profiler\bin"/>
-		<CleanupDirectories Include="..\AddIns\Misc\Profiler\Hook\obj"/>
+		<CleanupDirectories Include="..\AddIns\Analysis\Profiler\bin"/>
+		<CleanupDirectories Include="..\AddIns\Analysis\Profiler\Hook\obj"/>
 	</ItemGroup>
 	
 	<Target Name="Clean">