diff options
| author | Marek Safar <marek.safar@gmail.com> | 2015-07-22 10:01:39 +0300 |
|---|---|---|
| committer | Marek Safar <marek.safar@gmail.com> | 2015-07-22 10:01:39 +0300 |
| commit | 0779ff1eac236b608e4822da856b3272eddbecfa (patch) | |
| tree | d2663459c470706f4d0b6edd1c15120dbd6d3a15 /mcs/class/System.Xaml | |
| parent | 672207f9765155eb518b4038fa9c39d00bfe13b1 (diff) | |
[System.Xaml] Update default profile and remove old profiles
Diffstat (limited to 'mcs/class/System.Xaml')
3 files changed, 4 insertions, 20 deletions
diff --git a/mcs/class/System.Xaml/Test/System.Xaml/XamlObjectWriterTest.cs b/mcs/class/System.Xaml/Test/System.Xaml/XamlObjectWriterTest.cs index 35f5c7347ba..73dcf6f927d 100755 --- 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 b8dd211e648..70b26b87c5a 100755 --- 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 d57ae5af27a..eaf0f28c257 100755 --- 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); } |