From ae6ec527a1dcadebebf75deec8ea94907b6cc4d6 Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Tue, 20 Oct 2009 16:44:04 +0000 Subject: [PATCH] Fixed XamlBinding unit tests (XAML CC now requires a System.Xaml reference). git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@5089 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../XamlBinding/XamlBinding.Tests/MockTextEditor.cs | 1 + .../ICSharpCode.AvalonEdit.Tests/WeakReferenceTests.cs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/AddIns/BackendBindings/XamlBinding/XamlBinding.Tests/MockTextEditor.cs b/src/AddIns/BackendBindings/XamlBinding/XamlBinding.Tests/MockTextEditor.cs index f03ea20cd4..a97c538c2b 100644 --- a/src/AddIns/BackendBindings/XamlBinding/XamlBinding.Tests/MockTextEditor.cs +++ b/src/AddIns/BackendBindings/XamlBinding/XamlBinding.Tests/MockTextEditor.cs @@ -39,6 +39,7 @@ namespace ICSharpCode.XamlBinding.Tests Dictionary referencedAssemblies = new Dictionary() { { "System", null }, { "System.Xml", null }, + { "System.Xaml", typeof(System.Xaml.XamlReader).Assembly.Location }, { "WindowsBase", typeof(System.Windows.Media.Matrix).Assembly.Location }, { "System.Core", null }, { "PresentationCore", typeof(System.Windows.Media.Brush).Assembly.Location }, diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit.Tests/WeakReferenceTests.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit.Tests/WeakReferenceTests.cs index 959130138f..0775aafb44 100644 --- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit.Tests/WeakReferenceTests.cs +++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit.Tests/WeakReferenceTests.cs @@ -105,7 +105,7 @@ namespace ICSharpCode.AvalonEdit static void GarbageCollect() { GC.WaitForPendingFinalizers(); - GC.Collect(); + GC.Collect(GC.MaxGeneration, GCCollectionMode.Forced); GC.WaitForPendingFinalizers(); }