瀏覽代碼

2010-01-04 Jb Evain <[email protected]>

	* TimeZoneInfo.AdjustmentRule.cs, TimeZoneInfo.TransitionTime.cs:
	Do not include in both mscorlib and System.Core for a NET_2_1 profile.

svn path=/trunk/mcs/; revision=149020
Jb Evain 16 年之前
父節點
當前提交
56d21fac2c

+ 5 - 0
mcs/class/System.Core/System/ChangeLog

@@ -1,3 +1,8 @@
+2010-01-04  Jb Evain  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* InvalidTimeZoneException.cs, TimeZoneInfo.AdjustmentRule.cs,

+ 1 - 1
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_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;
 

+ 1 - 1
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 || 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;