fix TimeZoneInfo for moonlight (moving from System.Core to mscorlib)

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

mcs/class/System.Core/System/ChangeLog

@@ -1,3 +1,13 @@
+2010-03-30  Sebastien Pouliot  <[email protected]>
+
+	* InvalidTimeZoneException.cs
+	* TimeZoneInfo.AdjustmentRule.cs
+	* TimeZoneInfo.cs
+	* TimeZoneInfo.TransitionTime.cs
+	* TimeZoneNotFoundException.cs:
+		Fix Moonlight since these types now reside in mscorlib 
+		for NET_4_0 and also for SL4
+
 2010-03-30  Jb Evain  <[email protected]>
 
 	* TimeZoneInfo.AdjustmentRule.cs

mcs/class/System.Core/System/InvalidTimeZoneException.cs

@@ -24,7 +24,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#if NET_4_0 || BOOTSTRAP_NET_4_0
+#if NET_4_0 || BOOTSTRAP_NET_4_0 || MOONLIGHT
 
 using System;
 using System.Runtime.CompilerServices;

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 && !INSIDE_CORLIB) || (NET_3_5 && !NET_4_0 && !BOOTSTRAP_NET_4_0)
+#if (INSIDE_CORLIB && (NET_4_0 || MOONLIGHT)) || (MONOTOUCH && !INSIDE_CORLIB) || (NET_3_5 && !NET_4_0 && !BOOTSTRAP_NET_4_0)
 
 using System.Runtime.CompilerServices;
 using System.Runtime.Serialization;
@@ -35,6 +35,8 @@ namespace System
 		[SerializableAttribute]
 #if NET_4_0 || BOOTSTRAP_NET_4_0
 		[TypeForwardedFrom (Consts.AssemblySystemCore_3_5)]
+#elif MOONLIGHT
+		[TypeForwardedFrom (Consts.AssemblySystem_Core)]
 #endif
 		public sealed class AdjustmentRule : IEquatable<TimeZoneInfo.AdjustmentRule>, ISerializable, IDeserializationCallback
 		{

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 && !INSIDE_CORLIB) || (NET_3_5 && !NET_4_0 && !BOOTSTRAP_NET_4_0)
+#if (INSIDE_CORLIB && (NET_4_0 || BOOTSTRAP_NET_4_0 || MOONLIGHT)) || (MONOTOUCH && !INSIDE_CORLIB) || (NET_3_5 && !NET_4_0 && !BOOTSTRAP_NET_4_0)
 
 using System.Runtime.CompilerServices;
 using System.Runtime.Serialization;
@@ -36,6 +36,8 @@ namespace System
 		[SerializableAttribute]
 #if NET_4_0 || BOOTSTRAP_NET_4_0
 		[TypeForwardedFrom (Consts.AssemblySystemCore_3_5)]
+#elif MOONLIGHT
+		[TypeForwardedFrom (Consts.AssemblySystem_Core)]
 #endif
 		public struct TransitionTime : IEquatable<TimeZoneInfo.TransitionTime>, ISerializable, IDeserializationCallback
 		{

mcs/class/System.Core/System/TimeZoneInfo.cs

@@ -31,7 +31,7 @@ using System.Runtime.CompilerServices;
 
 [assembly:TypeForwardedTo (typeof(TimeZoneInfo))]
 
-#elif NET_3_5 || (NET_2_1 && !INSIDE_CORLIB)
+#elif NET_3_5 || (MONOTOUCH && !INSIDE_CORLIB) || (MOONLIGHT && INSIDE_CORLIB)
 
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -47,7 +47,9 @@ namespace System
 {
 #if NET_4_0 || BOOTSTRAP_NET_4_0
 	[TypeForwardedFrom (Consts.AssemblySystemCore_3_5)]
-#endif	
+#elif MOONLIGHT
+	[TypeForwardedFrom (Consts.AssemblySystem_Core)]
+#endif
 	[SerializableAttribute]
 	public sealed partial class TimeZoneInfo : IEquatable<TimeZoneInfo>, ISerializable, IDeserializationCallback
 	{

mcs/class/System.Core/System/TimeZoneNotFoundException.cs

@@ -24,7 +24,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#if NET_4_0 || BOOTSTRAP_NET_4_0
+#if NET_4_0 || BOOTSTRAP_NET_4_0 || MOONLIGHT
 
 using System;
 using System.Runtime.CompilerServices;

mcs/class/corlib/ChangeLog

@@ -1,3 +1,9 @@
+2010-03-30  Sebastien Pouliot  <[email protected]>
+
+	* moonlight_raw_corlib.dll.sources: Fix Moonlight since these 
+	types now reside in mscorlib (not System.Coe) for NET_4_0 and
+	also for SL4
+
 2010-03-26  Sebastien Pouliot  <[email protected]>
 
 	* moonlight_raw_corlib.dll.sources: Add MonoAssembly to ML build

mcs/class/corlib/System/ChangeLog

@@ -1,3 +1,10 @@
+2010-03-30  Sebastien Pouliot  <[email protected]>
+
+	* InvalidTimeZoneException.cs
+	* TimeZoneNotFoundException.cs:
+		Fix Moonlight since these types now reside in mscorlib
+		(instead of System.Core) for NET_4_0 and also for SL4
+
 2010-03-30  Jb Evain  <[email protected]>
 
 	* MonoType.cs: let the binder reorder arguments when invoking

mcs/class/corlib/System/InvalidTimeZoneException.cs

@@ -24,14 +24,18 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#if NET_4_0 || BOOTSTRAP_NET_4_0
+#if NET_4_0 || BOOTSTRAP_NET_4_0 || MOONLIGHT
 
 using System.Runtime.CompilerServices;
 
 namespace System
 {
 	[Serializable]
-	[TypeForwardedFrom (Consts.AssemblySystemCore_3_5)]	
+#if NET_4_0 || BOOTSTRAP_NET_4_0
+	[TypeForwardedFrom (Consts.AssemblySystemCore_3_5)]
+#elif MOONLIGHT
+	[TypeForwardedFrom (Consts.AssemblySystem_Core)]
+#endif
 	public class InvalidTimeZoneException : Exception
 	{
 		public InvalidTimeZoneException () : base ()

mcs/class/corlib/System/TimeZoneNotFoundException.cs

@@ -24,14 +24,18 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#if NET_4_0 || BOOTSTRAP_NET_4_0
+#if NET_4_0 || BOOTSTRAP_NET_4_0 || MOONLIGHT
 
 using System.Runtime.CompilerServices;
 
 namespace System
 {
 	[Serializable]
-	[TypeForwardedFrom (Consts.AssemblySystemCore_3_5)]	
+#if NET_4_0 || BOOTSTRAP_NET_4_0
+	[TypeForwardedFrom (Consts.AssemblySystemCore_3_5)]
+#elif MOONLIGHT
+	[TypeForwardedFrom (Consts.AssemblySystem_Core)]
+#endif
 	public class TimeZoneNotFoundException : Exception
 	{
 		public TimeZoneNotFoundException () : base ()

mcs/class/corlib/moonlight_raw_corlib.dll.sources

@@ -218,6 +218,7 @@ System/TermInfoStrings.cs
 System/ThreadStaticAttribute.cs
 System/TimeSpan.cs
 System/TimeZone.cs
+System/TimeZoneNotFoundException.cs
 System/TimeoutException.cs
 ../../build/common/MonoTODOAttribute.cs
 System/Type.cs
@@ -1033,4 +1034,6 @@ System.Collections.Generic/Comparer.cs
 ../Mono.CompilerServices.SymbolWriter/MonoSymbolTable.cs
 ../Mono.CompilerServices.SymbolWriter/MonoSymbolFile.cs
 ../Mono.CompilerServices.SymbolWriter/SymbolWriterImpl.cs
-
+../System.Core/System/TimeZoneInfo.AdjustmentRule.cs
+../System.Core/System/TimeZoneInfo.cs
+../System.Core/System/TimeZoneInfo.TransitionTime.cs