2009-08-11 Jérémie Laval <jeremie.laval@gmail.com>

In build/common/:
   * Consts.cs.in: Add BOOTSTRAP_NET_4_0.

In class/corlib/System.Collections.Concurrent/:
   * ConcurrentQueue.cs:
   * IProducerConsumerCollection.cs: Add BOOTSTRAP_NET_4_0.

In class/corlib/System.Runtime.CompilerServices/:
   * TypeForwardedFromAttribute.cs: Add BOOTSTRAP_NET_4_0.

In class/corlib/System.Threading/:
   * Watch.cs:
   * SpinWait.cs:
   * CountdownEvent.cs:
   * CancellationToken.cs:
   * ICancelableOperation.cs:
   * CancellationTokenSource.cs:
   * CancellationTokenRegistration.cs: Add BOOTSTRAP_NET_4_0.

In class/corlib/System/:
   * Funcs.cs:
   * Action.cs:
   * AggregateException.cs: Add BOOTSTRAP_NET_4_0.

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

diff --git a/mcs/build/common/ChangeLog b/mcs/build/common/ChangeLog
index 546006b63bd552442fe9310f260df0483636194f..eba7c3510b2960b79454934861959b9e8069f1ed 100644 (file)
--- a/mcs/build/common/ChangeLog
+++ b/mcs/build/common/ChangeLog
@@ -1,3 +1,7 @@
+2009-08-11  Jérémie Laval  <jeremie.laval@gmail.com>
+
+       * Consts.cs.in: Add BOOTSTRAP_NET_4_0.
+
 2009-07-18  Michael Barker  <mike@middlesoft.co.uk>
 
        * Consts.cs.in:  Added constant for Mono.Messaging.RabbitMQ.

diff --git a/mcs/build/common/Consts.cs.in b/mcs/build/common/Consts.cs.in
index 29bce04c7e24d581ce01deaf0512be841ea2303b..341a4ea3f5b7c0a368c85e79421d0aec049781c2 100644 (file)
--- a/mcs/build/common/Consts.cs.in
+++ b/mcs/build/common/Consts.cs.in
@@ -122,7 +122,7 @@ internal
        public const string AssemblySystem_ServiceProcess = "System.ServiceProcess, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
        public const string AssemblySystem_Web = "System.Web, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
        public const string AssemblySystem_Windows_Forms = "System.Windows.Forms, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b77a5c561934e089";
-#if NET_4_0
+#if NET_4_0 || BOOTSTRAP_NET_4_0
        public const string AssemblySystemCore_3_5 = "System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089";
 #endif 
 }

diff --git a/mcs/class/corlib/System.Collections.Concurrent/ChangeLog b/mcs/class/corlib/System.Collections.Concurrent/ChangeLog
index f72ae1e02fccd4c712713f74171545d6ab05ea3e..83bf3172fef528362363c4addc08e6eae253141b 100644 (file)
--- a/mcs/class/corlib/System.Collections.Concurrent/ChangeLog
+++ b/mcs/class/corlib/System.Collections.Concurrent/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-11  Jérémie Laval  <jeremie.laval@gmail.com>
+
+       * ConcurrentQueue.cs:
+       * IProducerConsumerCollection.cs: Add BOOTSTRAP_NET_4_0.
+
 2009-08-11  Jérémie Laval  <jeremie.laval@gmail.com>
 
        * BlockingCollection.cs: Moved type.

diff --git a/mcs/class/corlib/System.Collections.Concurrent/ConcurrentQueue.cs b/mcs/class/corlib/System.Collections.Concurrent/ConcurrentQueue.cs
index 39163e94e0b04e9d2bc810121013487db0d64643..e55b123a5bd593028928f7620aeed54180e07cd6 100644 (file)
--- a/mcs/class/corlib/System.Collections.Concurrent/ConcurrentQueue.cs
+++ b/mcs/class/corlib/System.Collections.Concurrent/ConcurrentQueue.cs
@@ -1,4 +1,4 @@
-#if NET_4_0
+#if NET_4_0 || BOOTSTRAP_NET_4_0
 // ConcurrentQueue.cs
 //
 // Copyright (c) 2008 Jérémie "Garuma" Laval

diff --git a/mcs/class/corlib/System.Collections.Concurrent/IProducerConsumerCollection.cs b/mcs/class/corlib/System.Collections.Concurrent/IProducerConsumerCollection.cs
index ddb6133b4e7e90fc8c173217d60c85209cd60dc5..b9f10598bdbb7130f6f6165a444690a7d757aa41 100644 (file)
--- a/mcs/class/corlib/System.Collections.Concurrent/IProducerConsumerCollection.cs
+++ b/mcs/class/corlib/System.Collections.Concurrent/IProducerConsumerCollection.cs
@@ -1,4 +1,4 @@
-#if NET_4_0
+#if NET_4_0 || BOOTSTRAP_NET_4_0
 // IConcurrentCollection.cs
 //
 // Copyright (c) 2008 Jérémie "Garuma" Laval

diff --git a/mcs/class/corlib/System.Runtime.CompilerServices/ChangeLog b/mcs/class/corlib/System.Runtime.CompilerServices/ChangeLog
index 5407fcf4e300c49ae81bf527b36108039508a28c..3c9f712eb600d59b687ee37a4f700242e66f0646 100644 (file)
--- a/mcs/class/corlib/System.Runtime.CompilerServices/ChangeLog
+++ b/mcs/class/corlib/System.Runtime.CompilerServices/ChangeLog
@@ -1,3 +1,7 @@
+2009-08-11  Jérémie Laval  <jeremie.laval@gmail.com>
+
+       * TypeForwardedFromAttribute.cs: Add BOOTSTRAP_NET_4_0.
+
 2009-07-02  Marek Safar  <marek.safar@gmail.com>
 
        * ConditionalWeakTable.cs: New file.

diff --git a/mcs/class/corlib/System.Runtime.CompilerServices/TypeForwardedFromAttribute.cs b/mcs/class/corlib/System.Runtime.CompilerServices/TypeForwardedFromAttribute.cs
index 4d053dc67eb889336ca3ab9a323804875cfd6cf6..d5b48c6b454c494d974798bad6bed8be71adbb31 100644 (file)
--- a/mcs/class/corlib/System.Runtime.CompilerServices/TypeForwardedFromAttribute.cs
+++ b/mcs/class/corlib/System.Runtime.CompilerServices/TypeForwardedFromAttribute.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 || BOOTSTRAP_NET_4_0
 
 namespace System.Runtime.CompilerServices
 {

diff --git a/mcs/class/corlib/System.Threading/CancellationToken.cs b/mcs/class/corlib/System.Threading/CancellationToken.cs
index f54c0b29ff288cff4819c70cc157d666f8c0cd58..1c67aa071ed4e7b711865eece2f47f8c628f3148 100644 (file)
--- a/mcs/class/corlib/System.Threading/CancellationToken.cs
+++ b/mcs/class/corlib/System.Threading/CancellationToken.cs
@@ -1,4 +1,4 @@
-#if NET_4_0
+#if NET_4_0 || BOOTSTRAP_NET_4_0
 // 
 // CancellationToken.cs
 //  

diff --git a/mcs/class/corlib/System.Threading/CancellationTokenRegistration.cs b/mcs/class/corlib/System.Threading/CancellationTokenRegistration.cs
index 5d0b05f48cf7be09f255b2fb9be33c0392afdd76..e12f9c9e23ac3e0b8ee3e537cf4a61d2c3ed265b 100644 (file)
--- a/mcs/class/corlib/System.Threading/CancellationTokenRegistration.cs
+++ b/mcs/class/corlib/System.Threading/CancellationTokenRegistration.cs
@@ -1,4 +1,4 @@
-#if NET_4_0
+#if NET_4_0 || BOOTSTRAP_NET_4_0
 // 
 // CancellationTokenRegistration.cs
 //  

diff --git a/mcs/class/corlib/System.Threading/CancellationTokenSource.cs b/mcs/class/corlib/System.Threading/CancellationTokenSource.cs
index 872e4be3a9d73ab4dbb1f5e43f909283c72d3201..dc0f7ef0d0e6e5b88dd5249122107e744536864c 100644 (file)
--- a/mcs/class/corlib/System.Threading/CancellationTokenSource.cs
+++ b/mcs/class/corlib/System.Threading/CancellationTokenSource.cs
@@ -1,4 +1,4 @@
-#if NET_4_0
+#if NET_4_0 || BOOTSTRAP_NET_4_0
 // 
 // CancellationTokenSource.cs
 //  

diff --git a/mcs/class/corlib/System.Threading/ChangeLog b/mcs/class/corlib/System.Threading/ChangeLog
index d5bca3eac2a4204ab95c6790a434b2212d8252c5..38ed16bd4d31ab7128c31434f971f0b047a9ca8a 100644 (file)
--- a/mcs/class/corlib/System.Threading/ChangeLog
+++ b/mcs/class/corlib/System.Threading/ChangeLog
@@ -1,3 +1,13 @@
+2009-08-11  Jérémie Laval  <jeremie.laval@gmail.com>
+
+       * Watch.cs:
+       * SpinWait.cs:
+       * CountdownEvent.cs:
+       * CancellationToken.cs:
+       * ICancelableOperation.cs:
+       * CancellationTokenSource.cs:
+       * CancellationTokenRegistration.cs: Add BOOTSTRAP_NET_4_0.
+
 2009-08-11  Jérémie Laval  <jeremie.laval@gmail.com>
 
        * Parallel.cs: Disable While method.

diff --git a/mcs/class/corlib/System.Threading/CountdownEvent.cs b/mcs/class/corlib/System.Threading/CountdownEvent.cs
index 48c23115d8d6de79a45cf320d5db3b2e3b1ef345..e61d096aacb41131d57a0ca9e5498b7889a1f3de 100644 (file)
--- a/mcs/class/corlib/System.Threading/CountdownEvent.cs
+++ b/mcs/class/corlib/System.Threading/CountdownEvent.cs
@@ -1,4 +1,4 @@
-#if NET_4_0
+#if NET_4_0 || BOOTSTRAP_NET_4_0
 // CountdownEvent.cs
 //
 // Copyright (c) 2008 Jérémie "Garuma" Laval

diff --git a/mcs/class/corlib/System.Threading/ICancelableOperation.cs b/mcs/class/corlib/System.Threading/ICancelableOperation.cs
index 1a17a035d31005e1686c39e82353579182a63cc4..e1115e265cddb37d7fdf69666884ac68453e132e 100644 (file)
--- a/mcs/class/corlib/System.Threading/ICancelableOperation.cs
+++ b/mcs/class/corlib/System.Threading/ICancelableOperation.cs
@@ -1,4 +1,4 @@
-#if NET_4_0
+#if NET_4_0 || BOOTSTRAP_NET_4_0
 // 
 // ICancelableOperation.cs
 //  

diff --git a/mcs/class/corlib/System.Threading/SpinWait.cs b/mcs/class/corlib/System.Threading/SpinWait.cs
index bb5ddcf1456220e3f504471b080f228bd01367ca..001891bbe6c70011becaaf3b23b52dc65e8c0b56 100644 (file)
--- a/mcs/class/corlib/System.Threading/SpinWait.cs
+++ b/mcs/class/corlib/System.Threading/SpinWait.cs
@@ -1,4 +1,4 @@
-#if NET_4_0
+#if NET_4_0 || BOOTSTRAP_NET_4_0
 // SpinWait.cs
 //
 // Copyright (c) 2008 Jérémie "Garuma" Laval

diff --git a/mcs/class/corlib/System.Threading/Watch.cs b/mcs/class/corlib/System.Threading/Watch.cs
index fe61efc28363171dbe2875875674b4d93d89cfbd..8c0caf462d730a1295753287dbbed36ba16acd11 100644 (file)
--- a/mcs/class/corlib/System.Threading/Watch.cs
+++ b/mcs/class/corlib/System.Threading/Watch.cs
@@ -1,4 +1,4 @@
-#if NET_4_0
+#if NET_4_0 || BOOTSTRAP_NET_4_0
 // Task.cs
 //
 // Copyright (c) 2008 Jérémie "Garuma" Laval

diff --git a/mcs/class/corlib/System/Action.cs b/mcs/class/corlib/System/Action.cs
index 31f076f48d7f705373917534401509601d755b6d..2fa759ec0ef2382ec8264e0ddc949df80c203709 100644 (file)
--- a/mcs/class/corlib/System/Action.cs
+++ b/mcs/class/corlib/System/Action.cs
@@ -31,7 +31,7 @@ using System.Runtime.CompilerServices;
 
 namespace System
 {
-#if NET_4_0
+#if NET_4_0 || BOOTSTRAP_NET_4_0
        [TypeForwardedFrom (Consts.AssemblySystemCore_3_5)]
        public delegate void Action ();
        

diff --git a/mcs/class/corlib/System/AggregateException.cs b/mcs/class/corlib/System/AggregateException.cs
index 6fd26d4ac8ccbf20c78badae27df9ce06e939707..9fd89eb0eee31bded05f184403e6c8f0c031f0d1 100644 (file)
--- a/mcs/class/corlib/System/AggregateException.cs
+++ b/mcs/class/corlib/System/AggregateException.cs
@@ -1,4 +1,4 @@
-#if NET_4_0
+#if NET_4_0 || BOOTSTRAP_NET_4_0
 // AggregateException.cs
 //
 // Copyright (c) 2008 Jérémie "Garuma" Laval

diff --git a/mcs/class/corlib/System/ChangeLog b/mcs/class/corlib/System/ChangeLog
index c26c3f3a4e0920f7ae3a7e978783a11f21ba4b0f..fc1980b093a21513b0be8ef19cd9748545ecc919 100644 (file)
--- a/mcs/class/corlib/System/ChangeLog
+++ b/mcs/class/corlib/System/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-11  Jérémie Laval  <jeremie.laval@gmail.com>
+
+       * Funcs.cs:
+       * Action.cs:
+       * AggregateException.cs: Add BOOTSTRAP_NET_4_0.
+
 2009-08-07  Marek Safar  <marek.safar@gmail.com>
 
        * AppDomain.cs: IsHomogenous always returns true for now.

diff --git a/mcs/class/corlib/System/Funcs.cs b/mcs/class/corlib/System/Funcs.cs
index b77d439a7c21f7a502681794752d4034452f89f9..ab5a960b4fb974dfa243ca8365dec2622f386566 100644 (file)
--- a/mcs/class/corlib/System/Funcs.cs
+++ b/mcs/class/corlib/System/Funcs.cs
@@ -25,7 +25,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 //
 
-#if NET_4_0
+#if NET_4_0 || BOOTSTRAP_NET_4_0
 
 using System.Runtime.CompilerServices;