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

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;

src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Addin/ICSharpCode.Data.Addin.csproj

@@ -70,6 +70,7 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.EnterpriseServices" />
     <Reference Include="System.Xml" />
+    <Reference Include="System.Xaml" />
     <Reference Include="System.Xml.Linq">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>