Merge pull request #913 from Daniel15/fix-catchall-routing-master

[mono.git] / mcs / class / corlib / System.Globalization / GregorianCalendar.cs

diff --git a/mcs/class/corlib/System.Globalization/GregorianCalendar.cs b/mcs/class/corlib/System.Globalization/GregorianCalendar.cs
index efa43db9530abbe357899b8916cb518df96a7ca1..82f8e52b113f64506d662da3ebead88bfa6828fc 100644 (file)
--- a/mcs/class/corlib/System.Globalization/GregorianCalendar.cs
+++ b/mcs/class/corlib/System.Globalization/GregorianCalendar.cs
@@ -43,10 +43,8 @@ using System.Runtime.InteropServices;
 /// </para>
 /// </remarks>
 [Serializable]
-#if NET_2_0
 [ComVisible (true)]
-#endif
-[MonoTODO ("Serialization format not compatible with .NET")]
+[MonoLimitation ("Serialization format not compatible with .NET")]
 public class GregorianCalendar : Calendar {
 
        /// <summary>
@@ -308,13 +306,11 @@ public class GregorianCalendar : Calendar {
                return ADEra;
        }
 
-#if NET_2_0
        [ComVisible (false)]
        public override int GetLeapMonth (int year, int era)
        {
                return 0;
        }
-#endif
 
        /// <summary>
        /// Overridden. Gives the number of the month of the specified
@@ -348,13 +344,11 @@ public class GregorianCalendar : Calendar {
                return 12;
        }
 
-#if NET_2_0
        [ComVisible (false)]
        public override int GetWeekOfYear (DateTime time, CalendarWeekRule rule, DayOfWeek firstDayOfWeek)
        {
                return base.GetWeekOfYear (time, rule, firstDayOfWeek);
        }
-#endif
 
        /// <summary>
        /// Overridden. Gives the number of the year of the specified
@@ -502,13 +496,14 @@ public class GregorianCalendar : Calendar {
                        twoDigitYearMax = 2029;
        }
        
-#if NET_2_0
+#if !NET_2_1
        [ComVisible (false)]
        public override CalendarAlgorithmType AlgorithmType {
                get {
                        return CalendarAlgorithmType.SolarCalendar;
                }
        }
+#endif
 
        static DateTime? Min, Max;
                
@@ -529,7 +524,6 @@ public class GregorianCalendar : Calendar {
                        return Max.Value;
                }
        }
-#endif
        
        /// <summary>
        /// Default constructor. Sets the Gregorian calendar type to