diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj index a4f84de9b7..10684b7743 100644 --- a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj +++ b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj @@ -11,7 +11,7 @@ False False OnSuccessfulBuild - v4.0 + v4.5 Library File False diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj.user b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj.user index be50c2622a..21ed472849 100644 --- a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj.user +++ b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj.user @@ -1,4 +1,5 @@ - + + 8.0.50215 ShowAllFiles diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.csproj b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.csproj index 55e68ffb5e..2507c7da77 100644 --- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.csproj +++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.csproj @@ -7,7 +7,7 @@ Library ICSharpCode.AvalonEdit.AddIn ICSharpCode.AvalonEdit.AddIn - v4.0 + v4.5 C:\Users\Daniel\AppData\Roaming\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis ..\..\..\..\AddIns\DisplayBindings\AvalonEdit\ False diff --git a/src/AddIns/Misc/AddinScout/Project/AddinScout.csproj b/src/AddIns/Misc/AddinScout/Project/AddinScout.csproj index 2a5e5555b3..89ad1c20c4 100644 --- a/src/AddIns/Misc/AddinScout/Project/AddinScout.csproj +++ b/src/AddIns/Misc/AddinScout/Project/AddinScout.csproj @@ -22,7 +22,7 @@ AnyCPU 4096 false - v4.0 + v4.5 diff --git a/src/AddIns/Misc/AddinScout/Project/AddinScout.csproj.user b/src/AddIns/Misc/AddinScout/Project/AddinScout.csproj.user index 10bfab249e..ba96463e7b 100644 --- a/src/AddIns/Misc/AddinScout/Project/AddinScout.csproj.user +++ b/src/AddIns/Misc/AddinScout/Project/AddinScout.csproj.user @@ -1,4 +1,5 @@ - + + 8.0.50215 ProjectFiles diff --git a/src/AddIns/Misc/SearchAndReplace/Project/SearchAndReplace.csproj b/src/AddIns/Misc/SearchAndReplace/Project/SearchAndReplace.csproj index 7bd9d1f778..5031774a1f 100644 --- a/src/AddIns/Misc/SearchAndReplace/Project/SearchAndReplace.csproj +++ b/src/AddIns/Misc/SearchAndReplace/Project/SearchAndReplace.csproj @@ -12,7 +12,7 @@ False 4 false - v4.0 + v4.5 diff --git a/src/AddIns/Misc/StartPage/Project/StartPage.csproj b/src/AddIns/Misc/StartPage/Project/StartPage.csproj index b5e1181b14..2cad04f958 100644 --- a/src/AddIns/Misc/StartPage/Project/StartPage.csproj +++ b/src/AddIns/Misc/StartPage/Project/StartPage.csproj @@ -19,7 +19,7 @@ 126877696 AnyCPU 4096 - v4.0 + v4.5 false diff --git a/src/AddIns/Misc/StartPage/Project/StartPage.csproj.user b/src/AddIns/Misc/StartPage/Project/StartPage.csproj.user index 81b0d14f61..bb8fc9f3ac 100644 --- a/src/AddIns/Misc/StartPage/Project/StartPage.csproj.user +++ b/src/AddIns/Misc/StartPage/Project/StartPage.csproj.user @@ -1,4 +1,5 @@ - + + 8.0.41115 ShowAllFiles diff --git a/src/AddIns/VersionControl/GitAddIn/GitAddIn.csproj b/src/AddIns/VersionControl/GitAddIn/GitAddIn.csproj index c5d0b6bffb..47281443a4 100644 --- a/src/AddIns/VersionControl/GitAddIn/GitAddIn.csproj +++ b/src/AddIns/VersionControl/GitAddIn/GitAddIn.csproj @@ -12,7 +12,7 @@ False 4 false - v4.0 + v4.5 diff --git a/src/AddIns/VersionControl/SubversionAddIn/SubversionAddIn.csproj b/src/AddIns/VersionControl/SubversionAddIn/SubversionAddIn.csproj index 2e8b15d272..3a0844ac25 100644 --- a/src/AddIns/VersionControl/SubversionAddIn/SubversionAddIn.csproj +++ b/src/AddIns/VersionControl/SubversionAddIn/SubversionAddIn.csproj @@ -10,7 +10,7 @@ 8.0.50215 2.0 Always - v4.0 + v4.5 False False 4 diff --git a/src/Libraries/ICSharpCode.Build.Tasks/Project/ICSharpCode.Build.Tasks.csproj b/src/Libraries/ICSharpCode.Build.Tasks/Project/ICSharpCode.Build.Tasks.csproj index 254d3b0f1b..dfac3e6990 100644 --- a/src/Libraries/ICSharpCode.Build.Tasks/Project/ICSharpCode.Build.Tasks.csproj +++ b/src/Libraries/ICSharpCode.Build.Tasks/Project/ICSharpCode.Build.Tasks.csproj @@ -19,7 +19,9 @@ false False C:\Users\Daniel\AppData\Roaming\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis - v2.0 + v4.5 + + ..\..\..\..\bin\ diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj index 429b3b3832..d8f02891d8 100644 --- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj +++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj @@ -25,7 +25,7 @@ 0809 1591 4 ..\..\..\..\bin\ - v4.0 + v4.5 diff --git a/src/Main/Base/Project/Src/Gui/Pads/DefinitionViewPad.cs b/src/Main/Base/Project/Src/Gui/Pads/DefinitionViewPad.cs index 96ac73d1f5..b02283e108 100755 --- a/src/Main/Base/Project/Src/Gui/Pads/DefinitionViewPad.cs +++ b/src/Main/Base/Project/Src/Gui/Pads/DefinitionViewPad.cs @@ -4,6 +4,7 @@ using System; using System.IO; using System.Windows; +using System.Threading.Tasks; using ICSharpCode.AvalonEdit; using ICSharpCode.AvalonEdit.Document; using ICSharpCode.AvalonEdit.Highlighting; @@ -70,24 +71,20 @@ namespace ICSharpCode.SharpDevelop.Gui UpdateTick(e); } - void UpdateTick(ParserUpdateStepEventArgs e) + async void UpdateTick(ParserUpdateStepEventArgs e) { if (!ctl.IsVisible) return; LoggingService.Debug("DefinitionViewPad.Update"); - ResolveResult res = /* TODO await */ ResolveAtCaret(e); + ResolveResult res = await ResolveAtCaretAsync(e); if (res == null) return; var pos = res.GetDefinitionRegion(); if (pos.IsEmpty) return; OpenFile(pos); } - bool disableDefinitionView; - - ResolveResult ResolveAtCaret(ParserUpdateStepEventArgs e) + Task ResolveAtCaretAsync(ParserUpdateStepEventArgs e) { - if (disableDefinitionView) - return null; IWorkbenchWindow window = WorkbenchSingleton.Workbench.ActiveWorkbenchWindow; if (window == null) return null; ITextEditorProvider provider = window.ActiveViewContent as ITextEditorProvider; @@ -98,7 +95,7 @@ namespace ICSharpCode.SharpDevelop.Gui // don't resolve when an unrelated file was changed if (e != null && editor.FileName != e.FileName) return null; - return ParserService.Resolve(editor.FileName, editor.Caret.Location, editor.Document); + return ParserService.ResolveAsync(editor.FileName, editor.Caret.Location, editor.Document); } DomRegion oldPosition; diff --git a/src/Main/Core/Project/ICSharpCode.Core.csproj b/src/Main/Core/Project/ICSharpCode.Core.csproj index 6d74dd8965..1fc90099a6 100644 --- a/src/Main/Core/Project/ICSharpCode.Core.csproj +++ b/src/Main/Core/Project/ICSharpCode.Core.csproj @@ -18,7 +18,7 @@ Always False File - v4.0 + v4.5 False false C:\Users\daniel\AppData\Roaming\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis diff --git a/src/Main/Core/Test/ICSharpCode.Core.Tests.csproj b/src/Main/Core/Test/ICSharpCode.Core.Tests.csproj index 997ae5e24b..c2ce97d4b9 100644 --- a/src/Main/Core/Test/ICSharpCode.Core.Tests.csproj +++ b/src/Main/Core/Test/ICSharpCode.Core.Tests.csproj @@ -22,12 +22,13 @@ False x86 false - v4.0 + v4.5 True ..\..\ICSharpCode.SharpDevelop.snk False File true + Client DEBUG diff --git a/src/Main/ICSharpCode.Core.Presentation/ICSharpCode.Core.Presentation.csproj b/src/Main/ICSharpCode.Core.Presentation/ICSharpCode.Core.Presentation.csproj index fbd586b80b..ffe7337f54 100644 --- a/src/Main/ICSharpCode.Core.Presentation/ICSharpCode.Core.Presentation.csproj +++ b/src/Main/ICSharpCode.Core.Presentation/ICSharpCode.Core.Presentation.csproj @@ -7,7 +7,7 @@ Library ICSharpCode.Core.Presentation ICSharpCode.Core.Presentation - v4.0 + v4.5 Properties "C:\Program Files\SharpDevelop\3.0\bin\..\AddIns\AddIns\Misc\SourceAnalysis\Settings.SourceAnalysis" ..\..\..\bin\ diff --git a/src/Main/ICSharpCode.Core.WinForms/ICSharpCode.Core.WinForms.csproj b/src/Main/ICSharpCode.Core.WinForms/ICSharpCode.Core.WinForms.csproj index 895c66d562..4215b0bb56 100644 --- a/src/Main/ICSharpCode.Core.WinForms/ICSharpCode.Core.WinForms.csproj +++ b/src/Main/ICSharpCode.Core.WinForms/ICSharpCode.Core.WinForms.csproj @@ -7,7 +7,7 @@ Library ICSharpCode.Core.WinForms ICSharpCode.Core.WinForms - v4.0 + v4.5 Properties ..\..\..\bin\ False diff --git a/src/Main/ICSharpCode.SharpDevelop.BuildWorker/ICSharpCode.SharpDevelop.BuildWorker.csproj b/src/Main/ICSharpCode.SharpDevelop.BuildWorker/ICSharpCode.SharpDevelop.BuildWorker.csproj index 4a354056e7..a131c2eaf6 100644 --- a/src/Main/ICSharpCode.SharpDevelop.BuildWorker/ICSharpCode.SharpDevelop.BuildWorker.csproj +++ b/src/Main/ICSharpCode.SharpDevelop.BuildWorker/ICSharpCode.SharpDevelop.BuildWorker.csproj @@ -7,7 +7,7 @@ Exe ICSharpCode.SharpDevelop.BuildWorker ICSharpCode.SharpDevelop.BuildWorker40 - v4.0 + v4.5 False False 4 diff --git a/src/Main/ICSharpCode.SharpDevelop.BuildWorker/app.config b/src/Main/ICSharpCode.SharpDevelop.BuildWorker/app.config index ddfeac4207..92fe986e09 100644 --- a/src/Main/ICSharpCode.SharpDevelop.BuildWorker/app.config +++ b/src/Main/ICSharpCode.SharpDevelop.BuildWorker/app.config @@ -1,7 +1,7 @@  - + diff --git a/src/Main/ICSharpCode.SharpDevelop.Sda/ICSharpCode.SharpDevelop.Sda.csproj b/src/Main/ICSharpCode.SharpDevelop.Sda/ICSharpCode.SharpDevelop.Sda.csproj index 9cf775e04b..01235fa209 100644 --- a/src/Main/ICSharpCode.SharpDevelop.Sda/ICSharpCode.SharpDevelop.Sda.csproj +++ b/src/Main/ICSharpCode.SharpDevelop.Sda/ICSharpCode.SharpDevelop.Sda.csproj @@ -14,7 +14,7 @@ Auto 100663296 AnyCPU - v4.0 + v4.5 4096 4 false diff --git a/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/ICSharpCode.SharpDevelop.Widgets.csproj b/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/ICSharpCode.SharpDevelop.Widgets.csproj index f7ccfda229..0c5d16ec04 100644 --- a/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/ICSharpCode.SharpDevelop.Widgets.csproj +++ b/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/ICSharpCode.SharpDevelop.Widgets.csproj @@ -16,7 +16,7 @@ ..\..\ICSharpCode.SharpDevelop.snk False File - v4.0 + v4.5 Client diff --git a/src/Main/StartUp/Project/StartUp.csproj b/src/Main/StartUp/Project/StartUp.csproj index a7e8ae7e27..6979d5e72c 100644 --- a/src/Main/StartUp/Project/StartUp.csproj +++ b/src/Main/StartUp/Project/StartUp.csproj @@ -23,7 +23,7 @@ false False File - v4.0 + v4.5 app.manifest diff --git a/src/Main/StartUp/Project/StartUp.csproj.user b/src/Main/StartUp/Project/StartUp.csproj.user index e1d33e369a..d0b1ba3c31 100644 --- a/src/Main/StartUp/Project/StartUp.csproj.user +++ b/src/Main/StartUp/Project/StartUp.csproj.user @@ -1,4 +1,5 @@ - + + 8.0.41115 ProjectFiles diff --git a/src/Main/StartUp/Project/app.template.config b/src/Main/StartUp/Project/app.template.config index b64d05e3fa..9ff3e6a2fe 100644 --- a/src/Main/StartUp/Project/app.template.config +++ b/src/Main/StartUp/Project/app.template.config @@ -13,7 +13,7 @@ --> - +