From c88b9103465c5c9271e0b3e9a707e8fb8ca8f00d Mon Sep 17 00:00:00 2001 From: jbevain Date: Mon, 4 Jan 2010 12:53:59 +0000 Subject: [PATCH] 2010-01-04 Jb Evain * TimeZoneInfo.AdjustmentRule.cs, TimeZoneInfo.TransitionTime.cs: Do not include in both mscorlib and System.Core for a NET_2_1 profile. git-svn-id: svn+ssh://mono-cvs.ximian.com/source/trunk/mcs@149020 e3ebcda4-bce8-0310-ba0a-eca2169e7518 --- class/System.Core/System/ChangeLog | 5 +++++ class/System.Core/System/TimeZoneInfo.AdjustmentRule.cs | 2 +- class/System.Core/System/TimeZoneInfo.TransitionTime.cs | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/class/System.Core/System/ChangeLog b/class/System.Core/System/ChangeLog index 408f0bd217..5c645381de 100644 --- a/class/System.Core/System/ChangeLog +++ b/class/System.Core/System/ChangeLog @@ -1,3 +1,8 @@ +2010-01-04 Jb Evain + + * TimeZoneInfo.AdjustmentRule.cs, TimeZoneInfo.TransitionTime.cs: + Do not include in both mscorlib and System.Core for a NET_2_1 profile. + 2009-07-16 Sebastien Pouliot * InvalidTimeZoneException.cs, TimeZoneInfo.AdjustmentRule.cs, diff --git a/class/System.Core/System/TimeZoneInfo.AdjustmentRule.cs b/class/System.Core/System/TimeZoneInfo.AdjustmentRule.cs index 748f7698f2..97b535e837 100644 --- a/class/System.Core/System/TimeZoneInfo.AdjustmentRule.cs +++ b/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_2_1 || (NET_3_5 && !NET_4_0 && !BOOTSTRAP_NET_4_0) +#if (INSIDE_CORLIB && NET_4_0) || (NET_2_1 && !INSIDE_CORLIB) || (NET_3_5 && !NET_4_0 && !BOOTSTRAP_NET_4_0) using System.Runtime.Serialization; diff --git a/class/System.Core/System/TimeZoneInfo.TransitionTime.cs b/class/System.Core/System/TimeZoneInfo.TransitionTime.cs index 3be2e13709..59e608c700 100644 --- a/class/System.Core/System/TimeZoneInfo.TransitionTime.cs +++ b/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 || BOOTSTRAP_NET_4_0)) || NET_2_1 || (NET_3_5 && !NET_4_0 && !BOOTSTRAP_NET_4_0) +#if (INSIDE_CORLIB && (NET_4_0 || BOOTSTRAP_NET_4_0)) || (NET_2_1 && !INSIDE_CORLIB) || (NET_3_5 && !NET_4_0 && !BOOTSTRAP_NET_4_0) using System.Runtime.Serialization; -- 2.11.4.GIT