[System.Xaml] Update default profile and remove old profiles

diff --git a/mcs/class/System.Xaml/Test/System.Xaml/XamlObjectWriterTest.cs b/mcs/class/System.Xaml/Test/System.Xaml/XamlObjectWriterTest.cs
index 35f5c7347ba8247e1e25dcc899d4debd6811ebef..73dcf6f927db8d5c092f4800077a84133f3e0bcb 100755 (executable)
--- a/mcs/class/System.Xaml/Test/System.Xaml/XamlObjectWriterTest.cs
+++ b/mcs/class/System.Xaml/Test/System.Xaml/XamlObjectWriterTest.cs
@@ -709,11 +709,7 @@ namespace MonoTests.System.Xaml
                [Test]
                public void OnSetValueAndHandledFalse () // part of bug #3003
                {
-#if NET_4_5
-                       string ver = "net_4_5";
-#else
-                       string ver = "net_4_0";
-#endif
+                       const string ver = "net_4_x";
 
                        /*
                        var obj = new TestClass3 ();
@@ -838,11 +834,7 @@ namespace MonoTests.System.Xaml
 
                XamlReader GetReader (string filename)
                {
-#if NET_4_5
-                       string ver = "net_4_5";
-#else
-                       string ver = "net_4_0";
-#endif
+                       const string ver = "net_4_x";
                        string xml = File.ReadAllText (Path.Combine ("Test/XmlFiles", filename)).Replace ("net_4_0", ver);
                        return new XamlXmlReader (XmlReader.Create (new StringReader (xml)));
                }

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

diff --git a/mcs/class/System.Xaml/Test/System.Xaml/XamlXmlWriterTest.cs b/mcs/class/System.Xaml/Test/System.Xaml/XamlXmlWriterTest.cs
index d57ae5af27a760e5798dbe8fff60d445400d9387..eaf0f28c257650e70df94804dd149d45c4bc43d4 100755 (executable)
--- a/mcs/class/System.Xaml/Test/System.Xaml/XamlXmlWriterTest.cs
+++ b/mcs/class/System.Xaml/Test/System.Xaml/XamlXmlWriterTest.cs
@@ -636,11 +636,7 @@ namespace MonoTests.System.Xaml
 
                string ReadXml (string name)
                {
-#if NET_4_5
-                       string ver = "net_4_5";
-#else
-                       string ver = "net_4_0";
-#endif
+                       string ver = "net_4_x";
                        return File.ReadAllText ("Test/XmlFiles/" + name).Trim ().Replace (">\n", ">\r\n").Replace ("net_4_0", ver).Replace ("\r\n", Environment.NewLine);
                }