From 9cc7b86eb9e6aec6cfa1c638fa2d666ecf1b9e6b Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Tue, 20 Oct 2009 14:13:21 +0000 Subject: [PATCH] Removed unused code in XamlColorizer that failed to compile with .NET 4.0 Beta 2. Added another missing System.Xaml reference. SharpDevelop.sln now compiles successfully with .NET 4.0 Beta 2. git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@5086 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../XamlBinding/XamlBinding/XamlColorizer.cs | 12 ++++++++---- .../ICSharpCode.Data.Addin.csproj | 1 + 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlColorizer.cs b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlColorizer.cs index fd26a31f16..f23f4848a8 100644 --- a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlColorizer.cs +++ b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlColorizer.cs @@ -93,10 +93,14 @@ namespace ICSharpCode.XamlBinding foreach (HighlightingInfo info in GetInfo()) { IMember member = null; - if (task.IsCancellationRequested) { - task.AcknowledgeCancellation(); - return; - } + // Commented out because task doesn't come with cancellation support in .NET 4.0 Beta 2 + // (use CancellationToken instead) + // I didn't have to remove any call to task.Cancel(), so apparently this was dead code. + //if (task.IsCancellationRequested) { + // task.AcknowledgeCancellation(); + // return; + //} + // TODO: implement cancellation support if (!info.Token.StartsWith("xmlns", StringComparison.OrdinalIgnoreCase)) { MemberResolveResult rr = XamlResolver.Resolve(info.Token, info.Context) as MemberResolveResult; diff --git a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Addin/ICSharpCode.Data.Addin.csproj b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Addin/ICSharpCode.Data.Addin.csproj index 8c1a15bb93..3fac66bc1f 100644 --- a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Addin/ICSharpCode.Data.Addin.csproj +++ b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Addin/ICSharpCode.Data.Addin.csproj @@ -70,6 +70,7 @@ + 3.5