2009-07-16 Sebastien Pouliot <sebastien@ximian.com>

	* InvalidTimeZoneException.cs, TimeZoneInfo.AdjustmentRule.cs,
	TimeZoneInfo.cs, TimeZoneInfo.TransitionTime.cs: Bring back those
	inside NET_2_1 profile for Moonlight.

svn path=/trunk/mcs/; revision=138067

diff --git a/mcs/class/System.Core/System/ChangeLog b/mcs/class/System.Core/System/ChangeLog
index 588886bbb23e83fceb9954223c09ee7b3e09f62e..408f0bd217999f1aee31fd8d0ed6fd8f804f8d51 100644 (file)
--- a/mcs/class/System.Core/System/ChangeLog
+++ b/mcs/class/System.Core/System/ChangeLog
@@ -1,3 +1,9 @@
+2009-07-16  Sebastien Pouliot  <sebastien@ximian.com>
+
+       * InvalidTimeZoneException.cs, TimeZoneInfo.AdjustmentRule.cs,
+       TimeZoneInfo.cs, TimeZoneInfo.TransitionTime.cs: Bring back those
+       inside NET_2_1 profile for Moonlight.
+
 2009-06-10  Marek Safar  <marek.safar@gmail.com>
 
        * TimeZoneInfo.AdjustmentRule.cs, TimeZoneInfo.TransitionTime.cs,

diff --git a/mcs/class/System.Core/System/InvalidTimeZoneException.cs b/mcs/class/System.Core/System/InvalidTimeZoneException.cs
index 8ea0aca5a230117f10563b36ef6f0b9d7f018d1e..e2182cf5ced84755546d9b360154e04028977c85 100644 (file)
--- a/mcs/class/System.Core/System/InvalidTimeZoneException.cs
+++ b/mcs/class/System.Core/System/InvalidTimeZoneException.cs
@@ -1,5 +1,5 @@
 /*
- * System.InvalidimeZoneException
+ * System.InvalidTimeZoneException
  *
  * Author(s)
  *     Stephane Delcroix <stephane@delcroix.org>

diff --git a/mcs/class/System.Core/System/TimeZoneInfo.AdjustmentRule.cs b/mcs/class/System.Core/System/TimeZoneInfo.AdjustmentRule.cs
index cf4085f3c696e4b2a20bd3b38e05b5be17ed019b..00f2cb07da48cfa9105d62a0a03a87fc0bd78107 100644 (file)
--- a/mcs/class/System.Core/System/TimeZoneInfo.AdjustmentRule.cs
+++ b/mcs/class/System.Core/System/TimeZoneInfo.AdjustmentRule.cs
@@ -24,7 +24,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#if (INSIDE_CORLIB && NET_4_0) || (NET_3_5 && !NET_4_0)
+#if (INSIDE_CORLIB && NET_4_0) || NET_2_1 || (NET_3_5 && !NET_4_0)
 
 using System.Runtime.Serialization;
 

diff --git a/mcs/class/System.Core/System/TimeZoneInfo.TransitionTime.cs b/mcs/class/System.Core/System/TimeZoneInfo.TransitionTime.cs
index c11807bfe31d142e3c7dede64262350028a77d48..32cd1a4759728b86f1bfd83acbc894a0c8d3e744 100644 (file)
--- a/mcs/class/System.Core/System/TimeZoneInfo.TransitionTime.cs
+++ b/mcs/class/System.Core/System/TimeZoneInfo.TransitionTime.cs
@@ -24,7 +24,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#if (INSIDE_CORLIB && NET_4_0) || (NET_3_5 && !NET_4_0)
+#if (INSIDE_CORLIB && NET_4_0) || NET_2_1 || (NET_3_5 && !NET_4_0)
 
 using System.Runtime.Serialization;
 

diff --git a/mcs/class/System.Core/System/TimeZoneInfo.cs b/mcs/class/System.Core/System/TimeZoneInfo.cs
index 94917e3cd0638ca56d73db12c750c9466fd66bdb..36f31987a0332a5a38238f2ead9cdeebab899955 100644 (file)
--- a/mcs/class/System.Core/System/TimeZoneInfo.cs
+++ b/mcs/class/System.Core/System/TimeZoneInfo.cs
@@ -31,7 +31,7 @@ using System.Runtime.CompilerServices;
 
 [assembly:TypeForwardedTo (typeof(TimeZoneInfo))]
 
-#elif NET_3_5
+#elif NET_3_5 || (NET_2_1 && !INSIDE_CORLIB)
 
 using System.Collections.Generic;
 using System.Collections.ObjectModel;