From 83c55a290529c21aaa18ce217663e1fead772f38 Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Fri, 23 Apr 2010 09:28:47 +0000 Subject: [PATCH] In class/System.Core: 2010-04-23 Rolf Bjarne Kvinge * 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 * 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 * LazyThreadSafetyMode.cs: Include in Moonlight build. In class/corlib/System: 2010-04-23 Rolf Bjarne Kvinge * Lazy.cs: Include in Moonlight build. svn path=/trunk/mcs/; revision=155983 --- mcs/class/System.Core/ChangeLog | 5 +++++ mcs/class/System.Core/moonlight_raw_System.Core.dll.sources | 2 ++ mcs/class/corlib/ChangeLog | 5 +++++ mcs/class/corlib/System.Threading/ChangeLog | 4 ++++ mcs/class/corlib/System.Threading/LazyThreadSafetyMode.cs | 2 +- mcs/class/corlib/System/ChangeLog | 4 ++++ mcs/class/corlib/System/Lazy.cs | 2 +- mcs/class/corlib/moonlight_raw_corlib.dll.sources | 1 - 8 files changed, 22 insertions(+), 3 deletions(-) diff --git a/mcs/class/System.Core/ChangeLog b/mcs/class/System.Core/ChangeLog index 3bca76179ab..69b587d7847 100644 --- a/mcs/class/System.Core/ChangeLog +++ b/mcs/class/System.Core/ChangeLog @@ -1,3 +1,8 @@ +2010-04-23 Rolf Bjarne Kvinge + + * moonlight_raw_System.Core.dll.sources: Include Lazy.cs and + LazyThreadSafetyMode.cs from corlib in here. + 2010-04-15 Jérémie Laval * 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 844e40b1a78..f212d2cb9e0 100644 --- 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 6cb1d697b4a..10504f0fbce 100644 --- a/mcs/class/corlib/ChangeLog +++ b/mcs/class/corlib/ChangeLog @@ -1,3 +1,8 @@ +2010-04-23 Rolf Bjarne Kvinge + + * moonlight_raw_corlib.dll.sources: Don't include Lazy.cs here. It's in + System.Core.dll. + 2010-04-06 Jb Evain * corlib.dll.sources: add System.Threading.SemaphoreFullException diff --git a/mcs/class/corlib/System.Threading/ChangeLog b/mcs/class/corlib/System.Threading/ChangeLog index 533d11fddbc..d97407c29e1 100644 --- a/mcs/class/corlib/System.Threading/ChangeLog +++ b/mcs/class/corlib/System.Threading/ChangeLog @@ -1,3 +1,7 @@ +2010-04-23 Rolf Bjarne Kvinge + + * LazyThreadSafetyMode.cs: Include in Moonlight build. + 2010-04-15 Jérémie Laval * AtomicBoolean.cs: diff --git a/mcs/class/corlib/System.Threading/LazyThreadSafetyMode.cs b/mcs/class/corlib/System.Threading/LazyThreadSafetyMode.cs index e8213063200..b23ffe7a3ab 100644 --- 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 9046ac71760..79db53b69d0 100644 --- a/mcs/class/corlib/System/ChangeLog +++ b/mcs/class/corlib/System/ChangeLog @@ -1,3 +1,7 @@ +2010-04-23 Rolf Bjarne Kvinge + + * Lazy.cs: Include in Moonlight build. + 2010-04-22 Carlos Alberto Cortez * 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 e825deb4e01..626bcf27541 100644 --- 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 fda84ff6139..61d8bedcf08 100644 --- 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 -- 2.25.1