Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Baulig <mabaul@microsoft.com>2019-04-10 14:44:11 +0300
committerAlexander Köplinger <alex.koeplinger@outlook.com>2019-04-10 14:44:11 +0300
commit22c6ed3f1c5e3588489a5ca20ac92a3140d98e1f (patch)
tree160f02b91ca287a0de6027df895d7778ebd2ba74 /mcs/class/System
parent72c8776d8f0e7a257ee771eac735e4435eaef571 (diff)
Add conditionals allowing some calenders to be disabled. (#13730)
Add `GlobalizationMode.Invariant` conditionals to some calendar code. This allows the Japanese, Taiwan and Hebrew calendars to be disabled.
Diffstat (limited to 'mcs/class/System')
-rw-r--r--mcs/class/System/Test/System.ComponentModel/DateTimeConverterTests.cs7
1 files changed, 4 insertions, 3 deletions
diff --git a/mcs/class/System/Test/System.ComponentModel/DateTimeConverterTests.cs b/mcs/class/System/Test/System.ComponentModel/DateTimeConverterTests.cs
index ad7d0ae4b6d..2f899c56865 100644
--- a/mcs/class/System/Test/System.ComponentModel/DateTimeConverterTests.cs
+++ b/mcs/class/System/Test/System.ComponentModel/DateTimeConverterTests.cs
@@ -12,10 +12,10 @@ using System.ComponentModel;
using System.ComponentModel.Design.Serialization;
using System.Globalization;
-using NUnit.Framework;
-
namespace MonoTests.System.ComponentModel
{
+ using NUnit.Framework;
+
[TestFixture]
public class DateTimeConverterTests
{
@@ -146,7 +146,8 @@ namespace MonoTests.System.ComponentModel
}
[Test]
- [SetCulture("en-GB")]
+ [SetCulture ("en-GB")]
+ [Category ("Calendars")]
public void ConvertToString ()
{
CultureInfo culture = new MyCultureInfo ();