Merge pull request #485 from mtausig/master

[mono.git] / mcs / class / System.Xaml / Test / System.Xaml / XamlXmlReaderTest.cs

diff --git a/mcs/class/System.Xaml/Test/System.Xaml/XamlXmlReaderTest.cs b/mcs/class/System.Xaml/Test/System.Xaml/XamlXmlReaderTest.cs
index e27e2a77d8e150f4f1a77918980ce2d818291ab3..b8dd211e648598d080ae7eea686705894f2ff507 100755 (executable)
--- a/mcs/class/System.Xaml/Test/System.Xaml/XamlXmlReaderTest.cs
+++ b/mcs/class/System.Xaml/Test/System.Xaml/XamlXmlReaderTest.cs
@@ -45,7 +45,13 @@ namespace MonoTests.System.Xaml
 
                XamlReader GetReader (string filename)
                {
-                       return new XamlXmlReader (XmlReader.Create (Path.Combine ("Test/XmlFiles", filename), new XmlReaderSettings () { CloseInput =true }));
+#if NET_4_5
+                       string ver = "net_4_5";
+#else
+                       string ver = "net_4_0";
+#endif
+                       string xml = File.ReadAllText (Path.Combine ("Test/XmlFiles", filename)).Replace ("net_4_0", ver);
+                       return new XamlXmlReader (XmlReader.Create (new StringReader (xml)));
                }
 
                void ReadTest (string filename)