In class/System.Core:

2010-04-23  Rolf Bjarne Kvinge  <RKvinge@novell.com>

	* moonlight_raw_System.Core.dll.sources: Include Lazy.cs and
	LazyThreadSafetyMode.cs from corlib in here.

In class/corlib:
2010-04-23  Rolf Bjarne Kvinge  <RKvinge@novell.com>

	* moonlight_raw_corlib.dll.sources: Don't include Lazy.cs here. It's in
	System.Core.dll.

In class/corlib/System.Threading:
2010-04-23  Rolf Bjarne Kvinge  <RKvinge@novell.com>

	* LazyThreadSafetyMode.cs: Include in Moonlight build.

In class/corlib/System:
2010-04-23  Rolf Bjarne Kvinge  <RKvinge@novell.com>

	* Lazy.cs: Include in Moonlight build.

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

diff --git a/mcs/class/System.Core/ChangeLog b/mcs/class/System.Core/ChangeLog
index 3bca76179ab46725c70af80796b983a26932a832..69b587d7847368e013e4d85016531159c8cc244f 100644 (file)
--- a/mcs/class/System.Core/ChangeLog
+++ b/mcs/class/System.Core/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-23  Rolf Bjarne Kvinge  <RKvinge@novell.com>
+
+       * moonlight_raw_System.Core.dll.sources: Include Lazy.cs and
+       LazyThreadSafetyMode.cs from corlib in here.
+
 2010-04-15  Jérémie Laval  <jeremie.laval@gmail.com>
 
        * System.Core_test.dll.sources: Add PLinq unit tests

diff --git a/mcs/class/System.Core/moonlight_raw_System.Core.dll.sources b/mcs/class/System.Core/moonlight_raw_System.Core.dll.sources
index 844e40b1a78b963be6995ecec04c05d36b0040f3..f212d2cb9e0b47f23edf821af622020c9861a6f3 100644 (file)
--- a/mcs/class/System.Core/moonlight_raw_System.Core.dll.sources
+++ b/mcs/class/System.Core/moonlight_raw_System.Core.dll.sources
@@ -3,6 +3,8 @@
 ../../build/common/MonoTODOAttribute.cs
 ../corlib/Mono.Security.Cryptography/CryptoTools.cs
 ../corlib/Mono.Security.Cryptography/SymmetricTransform.cs
+../corlib/System/Lazy.cs
+../corlib/System.Threading/LazyThreadSafetyMode.cs
 Assembly/AssemblyInfo.cs
 System/Actions.cs
 System/Funcs.cs

diff --git a/mcs/class/corlib/ChangeLog b/mcs/class/corlib/ChangeLog
index 6cb1d697b4ae4087255a5a4ab021699b2ca7ca69..10504f0fbce6cb3e0631989f6c33c1f3d5944c97 100644 (file)
--- a/mcs/class/corlib/ChangeLog
+++ b/mcs/class/corlib/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-23  Rolf Bjarne Kvinge  <RKvinge@novell.com>
+
+       * moonlight_raw_corlib.dll.sources: Don't include Lazy.cs here. It's in
+       System.Core.dll.
+
 2010-04-06  Jb Evain  <jbevain@novell.com>
 
        * corlib.dll.sources: add System.Threading.SemaphoreFullException

diff --git a/mcs/class/corlib/System.Threading/ChangeLog b/mcs/class/corlib/System.Threading/ChangeLog
index 533d11fddbcd353d5797ae51a73992948fcec314..d97407c29e13d2d955a00d0c2cd86af8e3f97aa7 100644 (file)
--- a/mcs/class/corlib/System.Threading/ChangeLog
+++ b/mcs/class/corlib/System.Threading/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-23  Rolf Bjarne Kvinge  <RKvinge@novell.com>
+
+       * LazyThreadSafetyMode.cs: Include in Moonlight build.
+
 2010-04-15  Jérémie Laval  <jeremie.laval@gmail.com>
 
        * AtomicBoolean.cs:

diff --git a/mcs/class/corlib/System.Threading/LazyThreadSafetyMode.cs b/mcs/class/corlib/System.Threading/LazyThreadSafetyMode.cs
index e8213063200c04b91989011269ebc5e5cf524327..b23ffe7a3ab54481d850a540f5f72ef03ae9d9bf 100644 (file)
--- a/mcs/class/corlib/System.Threading/LazyThreadSafetyMode.cs
+++ b/mcs/class/corlib/System.Threading/LazyThreadSafetyMode.cs
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_4_0
+#if NET_4_0 || MOONLIGHT
 
 using System;
 

diff --git a/mcs/class/corlib/System/ChangeLog b/mcs/class/corlib/System/ChangeLog
index 9046ac71760d1c8c4fc7367cf488b46a3488162b..79db53b69d0ae5067847cd6b382ecfd76bc3d397 100644 (file)
--- a/mcs/class/corlib/System/ChangeLog
+++ b/mcs/class/corlib/System/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-23  Rolf Bjarne Kvinge  <RKvinge@novell.com>
+
+       * Lazy.cs: Include in Moonlight build.
+
 2010-04-22  Carlos Alberto Cortez <calberto.cortez@gmail.com>
 
        * TimeSpan.cs: The final 4.0 release removed the restriction of

diff --git a/mcs/class/corlib/System/Lazy.cs b/mcs/class/corlib/System/Lazy.cs
index e825deb4e0134972f41dd4f527fb4f669f80d301..626bcf27541c015991f6c58974bd07a2646a712d 100644 (file)
--- a/mcs/class/corlib/System/Lazy.cs
+++ b/mcs/class/corlib/System/Lazy.cs
@@ -27,7 +27,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_4_0
+#if NET_4_0 || MOONLIGHT
 
 using System;
 using System.Runtime.Serialization;

diff --git a/mcs/class/corlib/moonlight_raw_corlib.dll.sources b/mcs/class/corlib/moonlight_raw_corlib.dll.sources
index fda84ff6139b73a5cb6d62e03023f742e3759e6a..61d8bedcf08526e23cb5011c977865767e32493f 100644 (file)
--- a/mcs/class/corlib/moonlight_raw_corlib.dll.sources
+++ b/mcs/class/corlib/moonlight_raw_corlib.dll.sources
@@ -155,7 +155,6 @@ System/InvalidProgramException.cs
 System/InvalidTimeZoneException.cs
 System/IServiceProvider.cs
 System/KnownTerminals.cs
-System/Lazy.cs
 System/LoaderOptimization.cs
 System/LoaderOptimizationAttribute.cs
 System/MarshalByRefObject.cs