In .:

2010-03-11  Sebastien Pouliot  <sebastien@ximian.com>

	* net_2_1_raw_corlib.dll.sources: Add System.Diagnostics.Contracts
	for Moonlight 4

In System.Diagnostics.Contracts:
2010-03-11  Sebastien Pouliot  <sebastien@ximian.com>

	* *.cs: Add NET_2_1 since contracts are part of SL4 :-)

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

diff --git a/mcs/class/corlib/ChangeLog b/mcs/class/corlib/ChangeLog
index 7c8380fb9673c0e9f4a830a12eb785c5698b21ad..57e212107bf1206e7e419e003bf788f09f539b90 100644 (file)
--- a/mcs/class/corlib/ChangeLog
+++ b/mcs/class/corlib/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-11  Sebastien Pouliot  <sebastien@ximian.com>
+
+       * net_2_1_raw_corlib.dll.sources: Add System.Diagnostics.Contracts
+       for Moonlight 4
+
 2010-03-08  Jérémie Laval  <jeremie.laval@gmail.com>
 
        * corlib_test.dll.sources: Add System.Threading/SpinLockTests.cs

diff --git a/mcs/class/corlib/System.Diagnostics.Contracts/ChangeLog b/mcs/class/corlib/System.Diagnostics.Contracts/ChangeLog
index 1ba1b314a7b8bfd5268244ca5dbb9c038f675db2..b166afb85d4728d31e1ff9b506045a4fa7fc6ef7 100644 (file)
--- a/mcs/class/corlib/System.Diagnostics.Contracts/ChangeLog
+++ b/mcs/class/corlib/System.Diagnostics.Contracts/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-11  Sebastien Pouliot  <sebastien@ximian.com>
+
+       * *.cs: Add NET_2_1 since contracts are part of SL4 :-)
+
 2009-10-31  Miguel de Icaza  <miguel@novell.com>
 
        * Contract.cs: Add some more stuff here.

diff --git a/mcs/class/corlib/System.Diagnostics.Contracts/Contract.cs b/mcs/class/corlib/System.Diagnostics.Contracts/Contract.cs
index 9759711a2711b03eb23bb241c66a1b827ff9a27c..a046e186d1e672a19109158b1b4dd548da19e698 100644 (file)
--- a/mcs/class/corlib/System.Diagnostics.Contracts/Contract.cs
+++ b/mcs/class/corlib/System.Diagnostics.Contracts/Contract.cs
@@ -50,7 +50,7 @@ using System;
 using System.Collections.Generic;
 
 namespace System.Diagnostics.Contracts {
-#if NET_4_0
+#if NET_2_1 || NET_4_0
        public
 #else
        internal
@@ -267,4 +267,4 @@ namespace System.Diagnostics.Contracts {
                        throw RewriterRequired ();
                }
        }
-}
\ No newline at end of file
+}

diff --git a/mcs/class/corlib/System.Diagnostics.Contracts/ContractClassAttribute.cs b/mcs/class/corlib/System.Diagnostics.Contracts/ContractClassAttribute.cs
index 89e07fba998620c640ae1e1b89f23608625eded4..1e05eff2be45e9b1312cdc1cd01ddb5a1e37593e 100644 (file)
--- a/mcs/class/corlib/System.Diagnostics.Contracts/ContractClassAttribute.cs
+++ b/mcs/class/corlib/System.Diagnostics.Contracts/ContractClassAttribute.cs
@@ -25,7 +25,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_0
+#if NET_2_1 || NET_4_0
 using System;
 namespace System.Diagnostics.Contracts {
        [Conditional ("CONTRACTS_FULL")]

diff --git a/mcs/class/corlib/System.Diagnostics.Contracts/ContractClassForAttribute.cs b/mcs/class/corlib/System.Diagnostics.Contracts/ContractClassForAttribute.cs
index f80c57f5d3e8d9e96419b9dfe3058a3fcdf006a8..a1c14fc8547a1bbd9d0637918483cce3a09d183e 100644 (file)
--- a/mcs/class/corlib/System.Diagnostics.Contracts/ContractClassForAttribute.cs
+++ b/mcs/class/corlib/System.Diagnostics.Contracts/ContractClassForAttribute.cs
@@ -25,7 +25,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_0
+#if NET_2_1 || NET_4_0
 using System;
 namespace System.Diagnostics.Contracts {
        [Conditional ("CONTRACTS_FULL")]

diff --git a/mcs/class/corlib/System.Diagnostics.Contracts/ContractFailedEventArgs.cs b/mcs/class/corlib/System.Diagnostics.Contracts/ContractFailedEventArgs.cs
index a91ac8a34f0f98cd9648dd11fbeb458ab5472479..0c39533e54340ec3eb57e3c08340444758c326bf 100644 (file)
--- a/mcs/class/corlib/System.Diagnostics.Contracts/ContractFailedEventArgs.cs
+++ b/mcs/class/corlib/System.Diagnostics.Contracts/ContractFailedEventArgs.cs
@@ -30,7 +30,7 @@ using System;
 
 namespace System.Diagnostics.Contracts {
 
-#if NET_4_0
+#if NET_2_1 || NET_4_0
        public
 #else
        internal

diff --git a/mcs/class/corlib/System.Diagnostics.Contracts/ContractFailureKind.cs b/mcs/class/corlib/System.Diagnostics.Contracts/ContractFailureKind.cs
index 671932511bf50a0110debbb28d4481d000c2b2a6..874204763fbc58a1c303bd9cceccd27777ddc095 100644 (file)
--- a/mcs/class/corlib/System.Diagnostics.Contracts/ContractFailureKind.cs
+++ b/mcs/class/corlib/System.Diagnostics.Contracts/ContractFailureKind.cs
@@ -30,7 +30,7 @@ using System;
 
 namespace System.Diagnostics.Contracts {
 
-#if NET_4_0
+#if NET_2_1 || NET_4_0
        public
 #else
        internal

diff --git a/mcs/class/corlib/System.Diagnostics.Contracts/ContractInvariantMethodAttribute.cs b/mcs/class/corlib/System.Diagnostics.Contracts/ContractInvariantMethodAttribute.cs
index b3cfa275eaf5bf4a762104dfd8efe5e18d87b7ab..04d85cf917e47d4c2fb646f7be71b8ae084a73cd 100644 (file)
--- a/mcs/class/corlib/System.Diagnostics.Contracts/ContractInvariantMethodAttribute.cs
+++ b/mcs/class/corlib/System.Diagnostics.Contracts/ContractInvariantMethodAttribute.cs
@@ -25,7 +25,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_0
+#if NET_2_1 || NET_4_0
 using System;
 namespace System.Diagnostics.Contracts {
        [Conditional ("CONTRACTS_FULL")]

diff --git a/mcs/class/corlib/System.Diagnostics.Contracts/ContractPublicPropertyNameAttribute.cs b/mcs/class/corlib/System.Diagnostics.Contracts/ContractPublicPropertyNameAttribute.cs
index a542650f02de5c1cb7f9fea9e8a20a4ee6859256..8d412b41352a4e26b3a7e7b0693688f8a993cc63 100644 (file)
--- a/mcs/class/corlib/System.Diagnostics.Contracts/ContractPublicPropertyNameAttribute.cs
+++ b/mcs/class/corlib/System.Diagnostics.Contracts/ContractPublicPropertyNameAttribute.cs
@@ -25,7 +25,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_0
+#if NET_2_1 || NET_4_0
 using System;
 namespace System.Diagnostics.Contracts {
        [Conditional ("CONTRACTS_FULL")]

diff --git a/mcs/class/corlib/System.Diagnostics.Contracts/ContractReferenceAssemblyAttribute.cs b/mcs/class/corlib/System.Diagnostics.Contracts/ContractReferenceAssemblyAttribute.cs
index 66435b28367deab98481a8a2fb6b8a9aa20da3cb..333db34729847e436dcc8e488024ddb38f9d401b 100644 (file)
--- a/mcs/class/corlib/System.Diagnostics.Contracts/ContractReferenceAssemblyAttribute.cs
+++ b/mcs/class/corlib/System.Diagnostics.Contracts/ContractReferenceAssemblyAttribute.cs
@@ -25,7 +25,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_0
+#if NET_2_1 || NET_4_0
 using System;
 namespace System.Diagnostics.Contracts {
        [AttributeUsage (AttributeTargets.Assembly)]

diff --git a/mcs/class/corlib/System.Diagnostics.Contracts/ContractRuntimeIgnoredAttribute.cs b/mcs/class/corlib/System.Diagnostics.Contracts/ContractRuntimeIgnoredAttribute.cs
index a6887206d4d8f02933f81aeb4891dbd95a2dfdfc..85aef5931a5d826fc40ef5f13db55a73092344cd 100644 (file)
--- a/mcs/class/corlib/System.Diagnostics.Contracts/ContractRuntimeIgnoredAttribute.cs
+++ b/mcs/class/corlib/System.Diagnostics.Contracts/ContractRuntimeIgnoredAttribute.cs
@@ -25,7 +25,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_0
+#if NET_2_1 || NET_4_0
 using System;
 namespace System.Diagnostics.Contracts {
        [Conditional ("CONTRACTS_FULL")]

diff --git a/mcs/class/corlib/System.Diagnostics.Contracts/ContractVerificationAttribute.cs b/mcs/class/corlib/System.Diagnostics.Contracts/ContractVerificationAttribute.cs
index 9a61629883ce9e6cf78daec1966d3d7afc43254b..02795ea512e961a3b25e6d7176af3c08ec05f681 100644 (file)
--- a/mcs/class/corlib/System.Diagnostics.Contracts/ContractVerificationAttribute.cs
+++ b/mcs/class/corlib/System.Diagnostics.Contracts/ContractVerificationAttribute.cs
@@ -25,7 +25,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_0
+#if NET_2_1 || NET_4_0
 using System;
 namespace System.Diagnostics.Contracts {
        [Conditional ("CONTRACTS_FULL")]

diff --git a/mcs/class/corlib/System.Diagnostics.Contracts/PureAttribute.cs b/mcs/class/corlib/System.Diagnostics.Contracts/PureAttribute.cs
index 5abf3de344f4deb5724b5a5899baba8c203d015e..0043f26714b12bc3bc55de8a5f97513ea42b486a 100644 (file)
--- a/mcs/class/corlib/System.Diagnostics.Contracts/PureAttribute.cs
+++ b/mcs/class/corlib/System.Diagnostics.Contracts/PureAttribute.cs
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_4_0 || BOOTSTRAP_NET_4_0
+#if NET_2_1 || NET_4_0 || BOOTSTRAP_NET_4_0
 
 using System;
 

diff --git a/mcs/class/corlib/net_2_1_raw_corlib.dll.sources b/mcs/class/corlib/net_2_1_raw_corlib.dll.sources
index fe1c7a66df55b8a04dc3a979293eae72d8efcc6e..111cace8ad35f6fa9597351dcccc5901a805fa19 100644 (file)
--- a/mcs/class/corlib/net_2_1_raw_corlib.dll.sources
+++ b/mcs/class/corlib/net_2_1_raw_corlib.dll.sources
@@ -281,6 +281,17 @@ System.Diagnostics/DebuggerTypeProxyAttribute.cs
 System.Diagnostics/StackFrame.cs
 System.Diagnostics/StackTrace.cs
 System.Diagnostics.CodeAnalysis/SuppressMessageAttribute.cs
+System.Diagnostics.Contracts/Contract.cs
+System.Diagnostics.Contracts/ContractClassAttribute.cs
+System.Diagnostics.Contracts/ContractClassForAttribute.cs
+System.Diagnostics.Contracts/ContractFailedEventArgs.cs
+System.Diagnostics.Contracts/ContractFailureKind.cs
+System.Diagnostics.Contracts/ContractInvariantMethodAttribute.cs
+System.Diagnostics.Contracts/ContractPublicPropertyNameAttribute.cs
+System.Diagnostics.Contracts/ContractReferenceAssemblyAttribute.cs
+System.Diagnostics.Contracts/ContractRuntimeIgnoredAttribute.cs
+System.Diagnostics.Contracts/ContractVerificationAttribute.cs
+System.Diagnostics.Contracts/PureAttribute.cs
 System.Diagnostics.SymbolStore/ISymbolBinder.cs
 System.Diagnostics.SymbolStore/ISymbolBinder1.cs
 System.Diagnostics.SymbolStore/ISymbolDocument.cs