From d755aa7d33367378d68a77f91960bd6159bb1b28 Mon Sep 17 00:00:00 2001 From: Raja R Harinath Date: Thu, 15 Jul 2010 15:38:20 +0000 Subject: [PATCH] Apply CategoryAttribute fix to XamlDirectiveTest.cs too svn path=/trunk/mcs/; revision=160443 --- mcs/class/System.Xaml/Test/System.Xaml/ChangeLog | 1 + mcs/class/System.Xaml/Test/System.Xaml/XamlDirectiveTest.cs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mcs/class/System.Xaml/Test/System.Xaml/ChangeLog b/mcs/class/System.Xaml/Test/System.Xaml/ChangeLog index ae1350d2b67..568a0c69dbe 100644 --- a/mcs/class/System.Xaml/Test/System.Xaml/ChangeLog +++ b/mcs/class/System.Xaml/Test/System.Xaml/ChangeLog @@ -4,6 +4,7 @@ portable way to resolve the CategoryAttribute ambiguity. * XamlObjectReaderTest.cs, XamlObjectWriterTest.cs: Likewise. * XamlTypeTest.cs, XamlXmlReaderTest.cs, XamlXmlWriterTest.cs: Likewise. + * XamlDirectiveTest.cs: Likewise. 2010-05-17 Atsushi Enomoto diff --git a/mcs/class/System.Xaml/Test/System.Xaml/XamlDirectiveTest.cs b/mcs/class/System.Xaml/Test/System.Xaml/XamlDirectiveTest.cs index 30d584a1f9a..e57f9c7c20d 100755 --- a/mcs/class/System.Xaml/Test/System.Xaml/XamlDirectiveTest.cs +++ b/mcs/class/System.Xaml/Test/System.Xaml/XamlDirectiveTest.cs @@ -29,7 +29,7 @@ using System.Xaml; using System.Xaml.Schema; using NUnit.Framework; -using Category = NUnit.Framework.CategoryAttribute; +using CategoryAttribute = NUnit.Framework.CategoryAttribute; namespace MonoTests.System.Xaml { -- 2.25.1