From 6595adb585f4a92484cc8bc3494b374ad1e96519 Mon Sep 17 00:00:00 2001 From: Siegfried Pammer Date: Sat, 29 Jun 2013 20:25:17 +0200 Subject: [PATCH 1/6] use AfterResolveReferences instead of PreBuildEvent for X64Converter --- .../Profiler/Controller/Profiler.Controller.csproj | 8 ++++++-- .../Profiler/Frontend/AddIn/Profiler.AddIn.csproj | 5 ----- .../X64Converter/Profiler.X64Converter.csproj | 14 ++++++++++---- src/Tools/Tools.build | 4 ++-- 4 files changed, 18 insertions(+), 13 deletions(-) diff --git a/src/AddIns/Analysis/Profiler/Controller/Profiler.Controller.csproj b/src/AddIns/Analysis/Profiler/Controller/Profiler.Controller.csproj index 54c6eb9dd8..2d0341be84 100644 --- a/src/AddIns/Analysis/Profiler/Controller/Profiler.Controller.csproj +++ b/src/AddIns/Analysis/Profiler/Controller/Profiler.Controller.csproj @@ -26,7 +26,6 @@ ..\bin\ICSharpCode.Profiler.Controller.xml C:\Dokumente und Einstellungen\HP\Anwendungsdaten\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis OnBuildSuccess - ..\X64Converter\bin\Profiler.X64Converter.exe 3.5 @@ -62,7 +61,7 @@ PdbOnly - true + True TRACE;PUBLIC_EXTENDEDREGISTRY prompt 4 @@ -71,6 +70,8 @@ False + obj\ + Project False @@ -185,4 +186,7 @@ --> + + + \ No newline at end of file diff --git a/src/AddIns/Analysis/Profiler/Frontend/AddIn/Profiler.AddIn.csproj b/src/AddIns/Analysis/Profiler/Frontend/AddIn/Profiler.AddIn.csproj index 9725d27709..1effee234f 100644 --- a/src/AddIns/Analysis/Profiler/Frontend/AddIn/Profiler.AddIn.csproj +++ b/src/AddIns/Analysis/Profiler/Frontend/AddIn/Profiler.AddIn.csproj @@ -163,11 +163,6 @@ ICSharpCode.Core.Presentation False - - {924EE450-603D-49C1-A8E5-4AFAA31CE6F3} - ICSharpCode.SharpDevelop.Dom - False - {8035765F-D51F-4A0C-A746-2FD100E19419} ICSharpCode.SharpDevelop.Widgets diff --git a/src/AddIns/Analysis/Profiler/X64Converter/Profiler.X64Converter.csproj b/src/AddIns/Analysis/Profiler/X64Converter/Profiler.X64Converter.csproj index d9ed23e689..9ef3d87ab1 100644 --- a/src/AddIns/Analysis/Profiler/X64Converter/Profiler.X64Converter.csproj +++ b/src/AddIns/Analysis/Profiler/X64Converter/Profiler.X64Converter.csproj @@ -15,8 +15,8 @@ C:\Users\Siegfried\AppData\Roaming\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis False False - false - bin\ + False + ..\bin\ OnBuildSuccess publish\ true @@ -35,6 +35,8 @@ true + False + obj\$(Configuration)\ true @@ -46,8 +48,8 @@ AllRules.ruleset - pdbonly - true + PdbOnly + True TRACE prompt 4 @@ -63,6 +65,10 @@ 4194304 x86 + + False + obj\ + diff --git a/src/Tools/Tools.build b/src/Tools/Tools.build index aa742c378b..dcb972458b 100644 --- a/src/Tools/Tools.build +++ b/src/Tools/Tools.build @@ -71,8 +71,8 @@ - - + + From 708f564f2263c1f0564bc6fcf7fcf2a5e6be4697 Mon Sep 17 00:00:00 2001 From: Siegfried Pammer Date: Sat, 29 Jun 2013 20:43:20 +0200 Subject: [PATCH 2/6] add Profiler to setup --- src/Setup/Files.wxs | 4 ++-- src/Setup/Setup.wxs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Setup/Files.wxs b/src/Setup/Files.wxs index 281bee81bf..f9d3f5c7ee 100644 --- a/src/Setup/Files.wxs +++ b/src/Setup/Files.wxs @@ -1432,7 +1432,7 @@ - + diff --git a/src/Setup/Setup.wxs b/src/Setup/Setup.wxs index 2f7758b36c..da124ae003 100644 --- a/src/Setup/Setup.wxs +++ b/src/Setup/Setup.wxs @@ -411,14 +411,14 @@ - + From e1a2c53f25fc6cb66ce464e83038028de260a5a4 Mon Sep 17 00:00:00 2001 From: Siegfried Pammer Date: Sat, 29 Jun 2013 20:54:19 +0200 Subject: [PATCH 3/6] fix exception in TaskListPad after opening project options --- src/Main/Base/Project/Src/Gui/Pads/TaskList/TaskListPad.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Main/Base/Project/Src/Gui/Pads/TaskList/TaskListPad.cs b/src/Main/Base/Project/Src/Gui/Pads/TaskList/TaskListPad.cs index 353e8e2ab2..f8020eb31c 100644 --- a/src/Main/Base/Project/Src/Gui/Pads/TaskList/TaskListPad.cs +++ b/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); From 1b2ad62f0965d6e9802565c41b467cf2bd990a53 Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Sat, 22 Jun 2013 13:48:23 +0200 Subject: [PATCH 4/6] Increase DispatcherPriority of some BeginInvoke calls to ensure that no user input is processed before the callback runs. This prevents the code editor from 'stealing' the focus when opening a dialog (e.g. Go To) while loading a solution. --- .../AbstractInlineRefactorDialog.cs | 2 +- .../Helpers/VisualHelper.cs | 40 ------------------- .../Helpers/VisualHelper.cs | 39 ------------------ .../Behaviors/DefaultProjectBehavior.cs | 2 +- .../Workbench/AvalonPadContent.cs | 2 +- .../Workbench/AvalonWorkbenchWindow.cs | 2 +- 6 files changed, 4 insertions(+), 83 deletions(-) diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/AbstractInlineRefactorDialog.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/AbstractInlineRefactorDialog.cs index fb91d6bf66..7895188c3c 100644 --- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/AbstractInlineRefactorDialog.cs +++ b/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) diff --git a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core.UI/Helpers/VisualHelper.cs b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core.UI/Helpers/VisualHelper.cs index 8928899c9e..c646b13e75 100644 --- a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core.UI/Helpers/VisualHelper.cs +++ b/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); } - - /// - /// Runs an Action in the current dispatcher. - /// - /// - public static void RunInDispatcher(Action actionToRun) - { - if (Application.Current != null) - RunInDispatcher(Application.Current.Dispatcher, actionToRun); - } - - /// - /// Runs an Action in a given dispatcher. - /// - /// - /// - public static void RunInDispatcher(Dispatcher dispatcher, Action actionToRun) - { - dispatcher.Invoke(DispatcherPriority.Background, actionToRun); - } - - /// - /// Runs through all items in the dispatcher. - /// - public static void DoEvents() - { - if (Application.Current != null) - DoEvents(Application.Current.Dispatcher); - } - - /// - /// Gives DispatcherFrames of the given Dispatcher priority, if - /// their DispatcherPriority is higher than "DispatcherPriority.Background". - /// - /// - public static void DoEvents(Dispatcher dispatcherToPause) - { - SD.MainThread.VerifyAccess(); - dispatcherToPause.Invoke(DispatcherPriority.Background, new System.Action(() => { })); - } } } diff --git a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/Helpers/VisualHelper.cs b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/Helpers/VisualHelper.cs index 8a5e325aa1..f562f96c90 100644 --- a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/Helpers/VisualHelper.cs +++ b/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); } - - /// - /// Runs an Action in the current dispatcher. - /// - /// - public static void RunInDispatcher(Action actionToRun) - { - if (Application.Current != null) - RunInDispatcher(Application.Current.Dispatcher, actionToRun); - } - - /// - /// Runs an Action in a given dispatcher. - /// - /// - /// - public static void RunInDispatcher(Dispatcher dispatcher, Action actionToRun) - { - dispatcher.Invoke(DispatcherPriority.Background, actionToRun); - } - - /// - /// Runs through all items in the dispatcher. - /// - public static void DoEvents() - { - if (Application.Current != null) - DoEvents(Application.Current.Dispatcher); - } - - /// - /// Gives DispatcherFrames of the given Dispatcher priority, if - /// their DispatcherPriority is higher than "DispatcherPriority.Background". - /// - /// - public static void DoEvents(Dispatcher dispatcherToPause) - { - dispatcherToPause.Invoke(DispatcherPriority.Background, new System.Action(() => { })); - } } } diff --git a/src/Main/Base/Project/Src/Project/Behaviors/DefaultProjectBehavior.cs b/src/Main/Base/Project/Src/Project/Behaviors/DefaultProjectBehavior.cs index 1100b001fb..d7936ca5d5 100644 --- a/src/Main/Base/Project/Src/Project/Behaviors/DefaultProjectBehavior.cs +++ b/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(); diff --git a/src/Main/SharpDevelop/Workbench/AvalonPadContent.cs b/src/Main/SharpDevelop/Workbench/AvalonPadContent.cs index 8aa5144aa1..633c9e8b67 100644 --- a/src/Main/SharpDevelop/Workbench/AvalonPadContent.cs +++ b/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); })); } } diff --git a/src/Main/SharpDevelop/Workbench/AvalonWorkbenchWindow.cs b/src/Main/SharpDevelop/Workbench/AvalonWorkbenchWindow.cs index ac42fd90aa..014b3a2624 100644 --- a/src/Main/SharpDevelop/Workbench/AvalonWorkbenchWindow.cs +++ b/src/Main/SharpDevelop/Workbench/AvalonWorkbenchWindow.cs @@ -55,7 +55,7 @@ namespace ICSharpCode.SharpDevelop.Workbench internal static void SetFocus(ManagedContent m, Func activeChildFunc, bool forceSetFocus = false) { m.Dispatcher.BeginInvoke( - DispatcherPriority.Input, + DispatcherPriority.Loaded, new Action( delegate { // ensure that condition for FocusContent() is still fulfilled From a9a6d4fc3515a279f49c592942fe3435ae32c7d0 Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Wed, 26 Jun 2013 17:12:04 +0200 Subject: [PATCH 5/6] Disable RedundantTypeCastIssue (too many false positives) --- doc/technotes/Release Process.txt | 1 + .../BackendBindings/CSharpBinding/Project/CSharpBinding.addin | 1 - .../BackendBindings/CSharpBinding/Tests/RegistrationTests.cs | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/technotes/Release Process.txt b/doc/technotes/Release Process.txt index 9fd5a30bb4..8c2c3ea504 100644 --- a/doc/technotes/Release Process.txt +++ b/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 diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin index 1a4bca94bf..ef69124b67 100644 --- a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin +++ b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin @@ -219,7 +219,6 @@ - diff --git a/src/AddIns/BackendBindings/CSharpBinding/Tests/RegistrationTests.cs b/src/AddIns/BackendBindings/CSharpBinding/Tests/RegistrationTests.cs index 1e4f419748..a74f81cd1f 100644 --- a/src/AddIns/BackendBindings/CSharpBinding/Tests/RegistrationTests.cs +++ b/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; From 3ca24582c6b12b6b90f6d20d3939856d08e80295 Mon Sep 17 00:00:00 2001 From: Siegfried Pammer Date: Sat, 29 Jun 2013 23:08:40 +0200 Subject: [PATCH 6/6] remove ICompletionItemHandler --- .../Editor/CodeCompletion/ICompletionItemHandler.cs | 13 ------------- .../Base/Project/ICSharpCode.SharpDevelop.csproj | 1 - 2 files changed, 14 deletions(-) delete mode 100644 src/Main/Base/Project/Editor/CodeCompletion/ICompletionItemHandler.cs diff --git a/src/Main/Base/Project/Editor/CodeCompletion/ICompletionItemHandler.cs b/src/Main/Base/Project/Editor/CodeCompletion/ICompletionItemHandler.cs deleted file mode 100644 index c839d20734..0000000000 --- a/src/Main/Base/Project/Editor/CodeCompletion/ICompletionItemHandler.cs +++ /dev/null @@ -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); - } -} diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj index 1ad8434875..21b4ccc231 100644 --- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj +++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj @@ -181,7 +181,6 @@ -