diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2014-09-26 16:43:36 +0400 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2015-01-17 07:45:39 +0300 |
| commit | 746650d1b93114b60feb155c2ee778a9e16ccb6d (patch) | |
| tree | f8e1eb791640ba6fd887da5e64cde3a1139b42b0 /mcs/class/System.Security | |
| parent | 7d1cd56c5d97683f6dae35cb9143d8789b71c2de (diff) | |
[bcl] Remove more NET_2_0 checks from class libs
Diffstat (limited to 'mcs/class/System.Security')
74 files changed, 25 insertions, 279 deletions
diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/AlgorithmIdentifier.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/AlgorithmIdentifier.cs index 3c196ae7df8..d836c1e4ff2 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/AlgorithmIdentifier.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/AlgorithmIdentifier.cs @@ -27,7 +27,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 && SECURITY_DEP +#if SECURITY_DEP namespace System.Security.Cryptography.Pkcs { diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/CmsRecipientCollection.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/CmsRecipientCollection.cs index 503245c912e..352b6a3b179 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/CmsRecipientCollection.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/CmsRecipientCollection.cs @@ -27,7 +27,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 && SECURITY_DEP +#if SECURITY_DEP using System.Collections; using System.Security.Cryptography.X509Certificates; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/CmsSigner.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/CmsSigner.cs index 791698d3cef..120c607c1fc 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/CmsSigner.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/CmsSigner.cs @@ -27,7 +27,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 && SECURITY_DEP +#if SECURITY_DEP using System.Security.Cryptography.X509Certificates; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/ContentInfo.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/ContentInfo.cs index 38c633c0c6a..32b675abb28 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/ContentInfo.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/ContentInfo.cs @@ -27,7 +27,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 && SECURITY_DEP +#if SECURITY_DEP using Mono.Security; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/EnvelopedCms.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/EnvelopedCms.cs index 2f2986b092a..1f57f5c5516 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/EnvelopedCms.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/EnvelopedCms.cs @@ -27,7 +27,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 && SECURITY_DEP +#if SECURITY_DEP using System.Collections; using System.Security.Cryptography.X509Certificates; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/KeyAgreeRecipientInfo.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/KeyAgreeRecipientInfo.cs index 1a6d38ccfcc..00e785beea1 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/KeyAgreeRecipientInfo.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/KeyAgreeRecipientInfo.cs @@ -27,7 +27,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 && SECURITY_DEP +#if SECURITY_DEP namespace System.Security.Cryptography.Pkcs { diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/KeyTransRecipientInfo.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/KeyTransRecipientInfo.cs index b6c281393a5..c22e9ebf20f 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/KeyTransRecipientInfo.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/KeyTransRecipientInfo.cs @@ -27,7 +27,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 && SECURITY_DEP +#if SECURITY_DEP using System.Collections; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9Attribute.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9Attribute.cs index 2aec1c8cb1e..d41c06c8d6b 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9Attribute.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9Attribute.cs @@ -27,7 +27,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 && SECURITY_DEP +#if SECURITY_DEP using System.Collections; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9ContentType.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9ContentType.cs index 32ede3da9a1..d21e84ca31f 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9ContentType.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9ContentType.cs @@ -28,7 +28,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 && SECURITY_DEP +#if SECURITY_DEP using Mono.Security; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9DocumentDescription.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9DocumentDescription.cs index a09cf056475..21b8a46eb98 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9DocumentDescription.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9DocumentDescription.cs @@ -27,7 +27,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 && SECURITY_DEP +#if SECURITY_DEP using System.Text; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9DocumentName.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9DocumentName.cs index edb25a61344..66d2153bd6c 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9DocumentName.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9DocumentName.cs @@ -27,7 +27,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 && SECURITY_DEP +#if SECURITY_DEP using System.Text; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9MessageDigest.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9MessageDigest.cs index 1c76b370b5b..0fb59b4582b 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9MessageDigest.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9MessageDigest.cs @@ -28,7 +28,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 && SECURITY_DEP +#if SECURITY_DEP using Mono.Security; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9SigningTime.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9SigningTime.cs index 05846d1c14b..e1e7920bc8c 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9SigningTime.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9SigningTime.cs @@ -27,7 +27,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 && SECURITY_DEP +#if SECURITY_DEP using System.Globalization; using System.Text; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/PublicKeyInfo.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/PublicKeyInfo.cs index 887b16c8926..3f9d554e2dd 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/PublicKeyInfo.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/PublicKeyInfo.cs @@ -27,7 +27,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 && SECURITY_DEP +#if SECURITY_DEP using System; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/RecipientInfo.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/RecipientInfo.cs index ee4aa3f582f..eecbcc5ffc6 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/RecipientInfo.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/RecipientInfo.cs @@ -27,7 +27,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 && SECURITY_DEP +#if SECURITY_DEP using System; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/RecipientInfoCollection.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/RecipientInfoCollection.cs index 6a30f6fbaa8..631e38653f1 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/RecipientInfoCollection.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/RecipientInfoCollection.cs @@ -27,7 +27,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 && SECURITY_DEP +#if SECURITY_DEP using System; using System.Collections; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/RecipientInfoEnumerator.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/RecipientInfoEnumerator.cs index 600684f2619..2735c3172d2 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/RecipientInfoEnumerator.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/RecipientInfoEnumerator.cs @@ -27,7 +27,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 && SECURITY_DEP +#if SECURITY_DEP using System; using System.Collections; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignedCms.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignedCms.cs index 9a89ec8941b..52ddd84da3d 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignedCms.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignedCms.cs @@ -27,7 +27,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 && SECURITY_DEP +#if SECURITY_DEP using System.Security.Cryptography.X509Certificates; using System.Security.Cryptography.Xml; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignerInfo.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignerInfo.cs index bab190eeaf6..bdac1d51118 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignerInfo.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignerInfo.cs @@ -27,7 +27,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 && SECURITY_DEP +#if SECURITY_DEP using System.Security.Cryptography.X509Certificates; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignerInfoCollection.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignerInfoCollection.cs index bfd360c3caf..2f53b3f0db4 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignerInfoCollection.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignerInfoCollection.cs @@ -27,7 +27,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 && SECURITY_DEP +#if SECURITY_DEP using System.Collections; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignerInfoEnumerator.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignerInfoEnumerator.cs index 36b6ba491c4..32a165faf08 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignerInfoEnumerator.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignerInfoEnumerator.cs @@ -27,7 +27,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 && SECURITY_DEP +#if SECURITY_DEP using System; using System.Collections; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/KeyInfoX509Data.cs b/mcs/class/System.Security/System.Security.Cryptography.Xml/KeyInfoX509Data.cs index 99e77d2cf62..74280cb9151 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Xml/KeyInfoX509Data.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/KeyInfoX509Data.cs @@ -59,7 +59,7 @@ namespace System.Security.Cryptography.Xml { AddCertificate (cert); } -#if NET_2_0 && SECURITY_DEP +#if SECURITY_DEP public KeyInfoX509Data (X509Certificate cert, X509IncludeOption includeOption) { if (cert == null) diff --git a/mcs/class/System.Security/System.Security.Cryptography/CryptographicAttribute.cs b/mcs/class/System.Security/System.Security.Cryptography/CryptographicAttribute.cs index 659ef2fb965..bdbf42fe779 100644 --- a/mcs/class/System.Security/System.Security.Cryptography/CryptographicAttribute.cs +++ b/mcs/class/System.Security/System.Security.Cryptography/CryptographicAttribute.cs @@ -27,7 +27,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 && SECURITY_DEP +#if SECURITY_DEP using System.Collections; diff --git a/mcs/class/System.Security/System.Security.Cryptography/CryptographicAttributeCollection.cs b/mcs/class/System.Security/System.Security.Cryptography/CryptographicAttributeCollection.cs index 6261ff4b09a..891de021239 100644 --- a/mcs/class/System.Security/System.Security.Cryptography/CryptographicAttributeCollection.cs +++ b/mcs/class/System.Security/System.Security.Cryptography/CryptographicAttributeCollection.cs @@ -27,7 +27,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 && SECURITY_DEP +#if SECURITY_DEP using System.Collections; diff --git a/mcs/class/System.Security/System.Security.Cryptography/CryptographicAttributeEnumerator.cs b/mcs/class/System.Security/System.Security.Cryptography/CryptographicAttributeEnumerator.cs index ec422437934..39092f9be43 100644 --- a/mcs/class/System.Security/System.Security.Cryptography/CryptographicAttributeEnumerator.cs +++ b/mcs/class/System.Security/System.Security.Cryptography/CryptographicAttributeEnumerator.cs @@ -27,7 +27,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 && SECURITY_DEP +#if SECURITY_DEP using System.Collections; diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/AlgorithmIdentifierTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/AlgorithmIdentifierTest.cs index ce5e92b2dd2..d7c55ee7ea1 100644 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/AlgorithmIdentifierTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/AlgorithmIdentifierTest.cs @@ -27,7 +27,6 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 using NUnit.Framework; @@ -139,4 +138,3 @@ namespace MonoTests.System.Security.Cryptography.Pkcs { } } -#endif diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/CmsRecipientCollectionTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/CmsRecipientCollectionTest.cs index bc669bb6a95..12fd6ed3b73 100644 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/CmsRecipientCollectionTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/CmsRecipientCollectionTest.cs @@ -26,7 +26,6 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 using NUnit.Framework; @@ -47,4 +46,3 @@ namespace MonoTests.System.Security.Cryptography.Pkcs { } } -#endif diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/CmsRecipientTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/CmsRecipientTest.cs index c05141afb35..6ba658660a9 100644 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/CmsRecipientTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/CmsRecipientTest.cs @@ -27,7 +27,6 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 using NUnit.Framework; @@ -105,4 +104,3 @@ namespace MonoTests.System.Security.Cryptography.Pkcs { } } -#endif diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/CmsSignerTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/CmsSignerTest.cs index 0f7b21b3bfc..e2aa7f91f4f 100644 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/CmsSignerTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/CmsSignerTest.cs @@ -27,7 +27,6 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 using NUnit.Framework; @@ -293,4 +292,3 @@ namespace MonoTests.System.Security.Cryptography.Pkcs { } } -#endif diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/ContentInfoTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/ContentInfoTest.cs index 5864c165ae6..d6296476ed6 100644 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/ContentInfoTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/ContentInfoTest.cs @@ -27,7 +27,6 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 using NUnit.Framework; @@ -238,4 +237,3 @@ namespace MonoTests.System.Security.Cryptography.Pkcs { } } -#endif diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/CryptographicAttributeTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/CryptographicAttributeTest.cs index a7fcd841707..8af8daf7de0 100644 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/CryptographicAttributeTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/CryptographicAttributeTest.cs @@ -7,7 +7,6 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_2_0 using NUnit.Framework; @@ -99,4 +98,3 @@ namespace MonoTests.System.Security.Cryptography.Pkcs { } } -#endif diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/EnvelopedCmsTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/EnvelopedCmsTest.cs index 2706cdfb034..23fbded4d36 100644 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/EnvelopedCmsTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/EnvelopedCmsTest.cs @@ -27,7 +27,6 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 using NUnit.Framework; @@ -393,4 +392,3 @@ namespace MonoTests.System.Security.Cryptography.Pkcs { } } -#endif diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/KeyTransRecipientInfoTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/KeyTransRecipientInfoTest.cs index 20b86b1e442..a4317975815 100644 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/KeyTransRecipientInfoTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/KeyTransRecipientInfoTest.cs @@ -27,7 +27,6 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 using NUnit.Framework; @@ -98,4 +97,3 @@ namespace MonoTests.System.Security.Cryptography.Pkcs { } } -#endif diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9AttributeTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9AttributeTest.cs index 319668c08cf..46221e8542c 100644 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9AttributeTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9AttributeTest.cs @@ -27,7 +27,6 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 using NUnit.Framework; @@ -144,4 +143,3 @@ namespace MonoTests.System.Security.Cryptography.Pkcs { } } -#endif diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9ContentTypeTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9ContentTypeTest.cs index 57c7e97d58d..eb46b761eb6 100644 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9ContentTypeTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9ContentTypeTest.cs @@ -26,7 +26,6 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 using NUnit.Framework; @@ -91,4 +90,3 @@ namespace MonoTests.System.Security.Cryptography.Pkcs { } } -#endif diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9DocumentDescriptionTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9DocumentDescriptionTest.cs index 4564e833bf7..f4daab89b47 100644 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9DocumentDescriptionTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9DocumentDescriptionTest.cs @@ -27,7 +27,6 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 using NUnit.Framework; @@ -105,4 +104,3 @@ namespace MonoTests.System.Security.Cryptography.Pkcs { } } -#endif diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9DocumentNameTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9DocumentNameTest.cs index 0a683e9e554..8e151f90fa9 100644 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9DocumentNameTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9DocumentNameTest.cs @@ -27,7 +27,6 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 using NUnit.Framework; @@ -113,4 +112,3 @@ namespace MonoTests.System.Security.Cryptography.Pkcs { } } -#endif diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9MessageDigestTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9MessageDigestTest.cs index f9d5fb26e50..a0ed9d116e9 100644 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9MessageDigestTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9MessageDigestTest.cs @@ -26,7 +26,6 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 using NUnit.Framework; @@ -81,4 +80,3 @@ namespace MonoTests.System.Security.Cryptography.Pkcs { } } -#endif diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9SigningTimeTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9SigningTimeTest.cs index 1767d49992b..9558b88afe1 100644 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9SigningTimeTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9SigningTimeTest.cs @@ -27,7 +27,6 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 using NUnit.Framework; @@ -227,4 +226,3 @@ namespace MonoTests.System.Security.Cryptography.Pkcs { } } -#endif diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/PkitsTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/PkitsTest.cs index 42fb30719d9..1722359b388 100644 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/PkitsTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/PkitsTest.cs @@ -28,7 +28,6 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 using NUnit.Framework; @@ -162,4 +161,3 @@ namespace MonoTests.System.Security.Cryptography.Pkcs { } } -#endif diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkits_4_01_SignatureVerification.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkits_4_01_SignatureVerification.cs index 0f1ff8174cb..0bdc6d348a7 100644 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkits_4_01_SignatureVerification.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkits_4_01_SignatureVerification.cs @@ -27,7 +27,6 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 using NUnit.Framework; @@ -238,4 +237,3 @@ namespace MonoTests.System.Security.Cryptography.Pkcs { } } -#endif diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/SignedCmsTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/SignedCmsTest.cs index 03f2962231d..d8f1b12fadc 100644 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/SignedCmsTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/SignedCmsTest.cs @@ -27,7 +27,6 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 using NUnit.Framework; @@ -454,4 +453,3 @@ namespace MonoTests.System.Security.Cryptography.Pkcs { } } -#endif diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/SignerInfoCollectionTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/SignerInfoCollectionTest.cs index 5e82de1f266..59941a1a752 100644 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/SignerInfoCollectionTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/SignerInfoCollectionTest.cs @@ -26,7 +26,6 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 using NUnit.Framework; @@ -136,4 +135,3 @@ namespace MonoTests.System.Security.Cryptography.Pkcs { } } -#endif
\ No newline at end of file diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/SignerInfoTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/SignerInfoTest.cs index 96e0d58f5e4..50e6376ac1e 100644 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/SignerInfoTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/SignerInfoTest.cs @@ -27,7 +27,6 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 using NUnit.Framework; @@ -104,4 +103,3 @@ namespace MonoTests.System.Security.Cryptography.Pkcs { } } -#endif diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/SubjectIdentifierTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/SubjectIdentifierTest.cs index 9a8f1a50f9d..1418e8cc460 100644 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/SubjectIdentifierTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/SubjectIdentifierTest.cs @@ -27,7 +27,6 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 using NUnit.Framework; @@ -87,4 +86,3 @@ namespace MonoTests.System.Security.Cryptography.Pkcs { } } -#endif diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.X509Certificates/X509Certificate2UICas.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.X509Certificates/X509Certificate2UICas.cs index 94f9eaaa2c6..192ade125cb 100644 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.X509Certificates/X509Certificate2UICas.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.X509Certificates/X509Certificate2UICas.cs @@ -26,7 +26,6 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 using NUnit.Framework; @@ -205,4 +204,3 @@ namespace MonoCasTests.System.Security.Cryptography.X509Certificates { } } -#endif diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.X509Certificates/X509Certificate2UITest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.X509Certificates/X509Certificate2UITest.cs index 079316d6b17..4d97499fb16 100644 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.X509Certificates/X509Certificate2UITest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.X509Certificates/X509Certificate2UITest.cs @@ -26,7 +26,6 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 using NUnit.Framework; @@ -130,4 +129,3 @@ namespace MonoTests.System.Security.Cryptography.X509Certificates { } } -#endif diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/DataReferenceTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/DataReferenceTest.cs index f12c1bc2419..ff8ffb6689b 100644 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/DataReferenceTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/DataReferenceTest.cs @@ -27,7 +27,6 @@ // 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_2_0 using System; using System.Security.Cryptography; @@ -53,4 +52,3 @@ namespace MonoTests.System.Security.Cryptography.Xml { } } -#endif diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/EncryptedXmlTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/EncryptedXmlTest.cs index 45bab5fda11..6949154ec0b 100644 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/EncryptedXmlTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/EncryptedXmlTest.cs @@ -7,7 +7,6 @@ // Copyright (C) 2006 Novell, Inc (http://www.novell.com) // -#if NET_2_0 using System; using System.Collections; @@ -296,4 +295,3 @@ namespace MonoTests.System.Security.Cryptography.Xml } } } -#endif diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/KeyInfoX509DataTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/KeyInfoX509DataTest.cs index 2f6a78e544c..58cdf2d830e 100644 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/KeyInfoX509DataTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/KeyInfoX509DataTest.cs @@ -66,7 +66,6 @@ namespace MonoTests.System.Security.Cryptography.Xml { static byte[] x509crl = { 0x30, 0x82, 0x01, 0x05, 0x30, 0x72, 0x02, 0x01, 0x01, 0x30, 0x0B, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x01, 0x05, 0x30, 0x51, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x55, 0x53, 0x31, 0x18, 0x30, 0x16, 0x06, 0x03, 0x55, 0x04, 0x0A, 0x13, 0x0F, 0x55, 0x2E, 0x53, 0x2E, 0x20, 0x47, 0x6F, 0x76, 0x65, 0x72, 0x6E, 0x6D, 0x65, 0x6E, 0x74, 0x31, 0x0C, 0x30, 0x0A, 0x06, 0x03, 0x55, 0x04, 0x0B, 0x13, 0x03, 0x44, 0x6F, 0x44, 0x31, 0x1A, 0x30, 0x18, 0x06, 0x03, 0x55, 0x04, 0x03, 0x13, 0x11, 0x41, 0x72, 0x6D, 0x65, 0x64, 0x20, 0x46, 0x6F, 0x72, 0x63, 0x65, 0x73, 0x20, 0x52, 0x6F, 0x6F, 0x74, 0x17, 0x0D, 0x30, 0x32, 0x31, 0x30, 0x31, 0x31, 0x31, 0x33, 0x31, 0x32, 0x35, 0x30, 0x5A, 0x30, 0x0B, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x01, 0x05, 0x03, 0x81, 0x81, 0x00, 0x7D, 0xA2, 0xD1, 0x19, 0x6D, 0x0F, 0x0F, 0xCB, 0xE4, 0xA3, 0xBE, 0xE0, 0x36, 0x0A, 0xF3, 0x4C, 0x9B, 0xAF, 0xE6, 0x4F, 0xF6, 0xE3, 0xAF, 0xCF, 0x55, 0xF3, 0xC6, 0xDB, 0xAB, 0x4C, 0x16, 0x32, 0xAA, 0x73, 0xAD, 0xCC, 0xDC, 0x32, 0x33, 0x60, 0xDF, 0x8B, 0xCC, 0x93, 0xB5, 0x4F, 0x6A, 0xEC, 0x70, 0x53, 0xAF, 0xCF, 0x07, 0x0F, 0xA0, 0xCD, 0x66, 0xAC, 0x00, 0x57, 0xC6, 0x5C, 0x5D, 0x21, 0xB1, 0xBD, 0x30, 0x89, 0x8E, 0x77, 0x8D, 0xD4, 0x69, 0x7E, 0xC0, 0x36, 0x7E, 0xD2, 0xD8, 0x20, 0x71, 0x08, 0x80, 0xD2, 0xCB, 0x74, 0x8B, 0xD8, 0x42, 0x17, 0x04, 0x99, 0x80, 0xA4, 0x52, 0x70, 0x2E, 0xC0, 0xE3, 0x8C, 0x0B, 0xFF, 0x79, 0xB7, 0x45, 0x77, 0xDC, 0xC5, 0xCF, 0x43, 0x98, 0x91, 0x7D, 0xF1, 0x01, 0xF7, 0x53, 0xD7, 0xC6, 0x51, 0x35, 0xF0, 0x89, 0xCC, 0xC1, 0xFF, 0xE2, 0x89 }; -#if NET_2_0 [Test] public void Constructor_Empty () { @@ -85,40 +84,6 @@ namespace MonoTests.System.Security.Cryptography.Xml { { KeyInfoX509Data data = new KeyInfoX509Data ((X509Certificate)null); } -#else - [Test] - [ExpectedException (typeof (CryptographicException))] - public void Constructor_Empty () - { - KeyInfoX509Data data = new KeyInfoX509Data (); - XmlElement invalid = data.GetXml (); - } - - [Test] - public void Constructor_X509Certificate_Null () - { - KeyInfoX509Data data = new KeyInfoX509Data ((X509Certificate)null); - } - - [Test] - [ExpectedException (typeof (ArgumentNullException))] - [Category ("NotWorking")] - public void Constructor_X509Certificate_Null_GetXml () - { - KeyInfoX509Data data = new KeyInfoX509Data ((X509Certificate)null); - XmlElement invalid = data.GetXml (); - // note: even if we add a check in GetXml this will makes another unit - // test fails. We clearly are not doing this the same way as MS does. - } - - [Test] - [ExpectedException (typeof (ArgumentNullException))] - public void Constructor_X509CertificateByteArray_Null_GetXml () - { - KeyInfoX509Data data = new KeyInfoX509Data ((byte[])null); - XmlElement invalid = data.GetXml (); - } -#endif [Test] public void Constructor_X509CertificateByteArray_Null () { @@ -144,7 +109,6 @@ namespace MonoTests.System.Security.Cryptography.Xml { Assert.AreEqual ((data2.GetXml ().OuterXml), (data3.GetXml ().OuterXml), "data2==data3"); } -#if NET_2_0 [Test] public void Constructor_X509Certificate_X509IncludeOption () { @@ -199,42 +163,6 @@ namespace MonoTests.System.Security.Cryptography.Xml { KeyInfoX509Data data = new KeyInfoX509Data (); data.AddIssuerSerial ("issuer", null); } -#else - [Test] - public void AddCertificate_Null () - { - KeyInfoX509Data data = new KeyInfoX509Data (); - data.AddCertificate (null); - } - - - [Test] - [ExpectedException (typeof (NullReferenceException))] - public void AddCertificate_Null_GetXml () - { - KeyInfoX509Data data = new KeyInfoX509Data (); - data.AddCertificate (null); - XmlElement empty = data.GetXml (); - } - - [Test] - public void AddIssuerSerial_Null_Serial () - { - KeyInfoX509Data data = new KeyInfoX509Data (); - data.AddIssuerSerial (null, "serial"); - XmlElement empty = data.GetXml (); - Assert.AreEqual (empty.OuterXml, "<X509Data xmlns=\"http://www.w3.org/2000/09/xmldsig#\"><X509IssuerSerial><X509IssuerName></X509IssuerName><X509SerialNumber>serial</X509SerialNumber></X509IssuerSerial></X509Data>"); - } - - [Test] - public void AddIssuerSerial_Issuer_Null () - { - KeyInfoX509Data data = new KeyInfoX509Data (); - data.AddIssuerSerial ("issuer", null); - XmlElement empty = data.GetXml (); - Assert.AreEqual (empty.OuterXml, "<X509Data xmlns=\"http://www.w3.org/2000/09/xmldsig#\"><X509IssuerSerial><X509IssuerName>issuer</X509IssuerName><X509SerialNumber></X509SerialNumber></X509IssuerSerial></X509Data>"); - } -#endif [Test] public void AddSubjectKeyId_Byte_Null () @@ -249,7 +177,6 @@ namespace MonoTests.System.Security.Cryptography.Xml { // beta2 bug - throw an ArgumentNullException (a little too late) // Assert.AreEqual ("<X509Data xmlns=\"http://www.w3.org/2000/09/xmldsig#\" />", data.GetXml ().OuterXml); } -#if NET_2_0 [Test] [Category ("NotWorking")] // beta2 bug [ExpectedException (typeof (NullReferenceException))] @@ -272,7 +199,6 @@ namespace MonoTests.System.Security.Cryptography.Xml { Assert.AreEqual (1, data.SubjectKeyIds.Count, "SubjectKeyIds"); Assert.IsNull (data.SubjectNames, "SubjectNames"); } -#endif [Test] public void AddSubjectName_Null () { diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/ReferenceTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/ReferenceTest.cs index a776b19274f..8920ac34218 100644 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/ReferenceTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/ReferenceTest.cs @@ -158,11 +158,9 @@ namespace MonoTests.System.Security.Cryptography.Xml { } [Test] -#if NET_2_0 [Category ("NotDotNet")] // MS throws a NullReferenceException (reported as FDBK25886) but only when executed in NUnit // http://lab.msdn.microsoft.com/ProductFeedback/viewfeedback.aspx?feedbackid=3596d1e3-362b-40bd-bca9-2e8be75261ff -#endif public void AddAllTransforms () { // adding an empty hash value diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/SignedInfoTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/SignedInfoTest.cs index b850fa5f359..d96e26fd0b4 100644 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/SignedInfoTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/SignedInfoTest.cs @@ -147,11 +147,9 @@ namespace MonoTests.System.Security.Cryptography.Xml { } [Test] -#if NET_2_0 // urn:foo is'nt accepted when calling GetXml [ExpectedException (typeof (CryptographicException))] [Category ("NotWorking")] -#endif public void GetXmlWithSetProperty () { XmlDocument doc = new XmlDocument (); diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/SignedXmlTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/SignedXmlTest.cs index 4c7c6131087..0a71f570a9e 100644 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/SignedXmlTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/SignedXmlTest.cs @@ -75,10 +75,8 @@ namespace MonoTests.System.Security.Cryptography.Xml { } [Test] -#if NET_2_0 [Ignore ("2.0 throws a NullReferenceException - reported as FDBK25892")] // http://lab.msdn.microsoft.com/ProductFeedback/viewfeedback.aspx?feedbackid=02dd9730-d1ad-4170-8c82-36858c55fbe2 -#endif [ExpectedException (typeof (ArgumentNullException))] public void Constructor_XmlDocument_Null () { @@ -100,9 +98,6 @@ namespace MonoTests.System.Security.Cryptography.Xml { } [Test] -#if !NET_2_0 - [ExpectedException (typeof (CryptographicException))] -#endif public void Constructor_XmlElement_WithoutLoadXml () { XmlDocument doc = new XmlDocument (); @@ -341,11 +336,7 @@ namespace MonoTests.System.Security.Cryptography.Xml { // Compute the signature. byte[] secretkey = Encoding.Default.GetBytes ("password"); HMACSHA1 hmac = new HMACSHA1 (secretkey); -#if NET_2_0 Assert.AreEqual (0, signedXml.KeyInfo.Count, "KeyInfo"); -#else - Assert.IsNull (signedXml.KeyInfo, "KeyInfo"); -#endif Assert.IsNull (signedXml.SignatureLength, "SignatureLength"); Assert.IsNull (signedXml.SignatureMethod, "SignatureMethod"); Assert.IsNull (signedXml.SignatureValue, "SignatureValue"); @@ -353,11 +344,7 @@ namespace MonoTests.System.Security.Cryptography.Xml { signedXml.ComputeSignature (hmac); -#if NET_2_0 Assert.AreEqual (0, signedXml.KeyInfo.Count, "KeyInfo"); -#else - Assert.IsNull (signedXml.KeyInfo, "KeyInfo"); -#endif Assert.IsNull (signedXml.SignatureLength, "SignatureLength"); Assert.AreEqual (SignedXml.XmlDsigHMACSHA1Url, signedXml.SignatureMethod, "SignatureMethod"); Assert.AreEqual (20, signedXml.SignatureValue.Length, "SignatureValue"); @@ -480,7 +467,6 @@ namespace MonoTests.System.Security.Cryptography.Xml { AsymmetricAlgorithm aa2 = sxe.PublicGetPublicKey (); Assert.IsNull (aa2, "Second Public Key is null"); } -#if NET_2_0 [Test] // [ExpectedException (typeof (ArgumentNullException))] public void AddObject_Null () @@ -497,16 +483,6 @@ namespace MonoTests.System.Security.Cryptography.Xml { SignedXml sx = new SignedXml (); sx.AddReference (null); } -#else - [Test] - public void Add_Null () - { - SignedXml sx = new SignedXml (); - // no ArgumentNull exceptions for those - sx.AddObject (null); - sx.AddReference (null); - } -#endif [Test] [ExpectedException (typeof (CryptographicException))] public void GetXml_WithoutInfo () @@ -553,9 +529,6 @@ namespace MonoTests.System.Security.Cryptography.Xml { } [Test] -#if !NET_2_0 - [ExpectedException (typeof (CryptographicException))] -#endif public void CheckSignatureEmpty () { SignedXml sx = new SignedXml (); @@ -681,7 +654,6 @@ namespace MonoTests.System.Security.Cryptography.Xml { Assert.IsNull (sign.GetIdElement (new XmlDocument (), null)); } -#if NET_2_0 [Test] [Category ("NotWorking")] // bug #79483 public void DigestValue_CRLF () @@ -1374,7 +1346,6 @@ namespace MonoTests.System.Security.Cryptography.Xml { // verify MS-generated signature Assert.IsTrue (sign.CheckSignature (new HMACRIPEMD160 (hmackey))); } -#endif // CVE-2009-0217 // * a 0-length signature is the worse case - it accepts anything // * between 1-7 bits length are considered invalid (not a multiple of 8) @@ -1502,7 +1473,6 @@ namespace MonoTests.System.Security.Cryptography.Xml { SignedXml sign = GetSignedXml (xml); Assert.IsTrue (sign.CheckSignature (new HMACSHA1 (Encoding.ASCII.GetBytes ("secret")))); } -#if NET_2_0 [Test] [Category ("NotDotNet")] // will fail until a fix is available public void VerifyHMAC_SmallerHalfLength () @@ -1521,7 +1491,6 @@ namespace MonoTests.System.Security.Cryptography.Xml { SignedXml sign = GetSignedXml (xml); Assert.IsTrue (sign.CheckSignature (new HMACSHA256 (Encoding.ASCII.GetBytes ("secret")))); } -#endif [Test] public void VerifyHMAC_FullLength () { diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/TransformTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/TransformTest.cs index c831ed020e6..ab9d2bb2e30 100644 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/TransformTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/TransformTest.cs @@ -74,13 +74,11 @@ namespace MonoTests.System.Security.Cryptography.Xml { [TestFixture] public class TransformTest { -#if NET_2_0 [Test] [ExpectedException (typeof (NullReferenceException))] public void GetDigestedOutput_Null () { new ConcreteTransform ().GetDigestedOutput (null); } -#endif } } diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/XmlDecryptionTransformTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/XmlDecryptionTransformTest.cs index 4ed8a0204b5..a2a2c841eb8 100644 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/XmlDecryptionTransformTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/XmlDecryptionTransformTest.cs @@ -26,7 +26,6 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 using NUnit.Framework; @@ -70,4 +69,3 @@ namespace MonoTests.System.Security.Cryptography.Xml { } } -#endif diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/XmlDsigC14NTransformTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/XmlDsigC14NTransformTest.cs index 43cf7df2afc..abb64bb34b5 100644 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/XmlDsigC14NTransformTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/XmlDsigC14NTransformTest.cs @@ -507,7 +507,6 @@ namespace MonoTests.System.Security.Cryptography.Xml { Assert.AreEqual (xml, output); } -#if NET_2_0 [Test] public void PrefixlessNamespaceOutput () { @@ -545,6 +544,5 @@ namespace MonoTests.System.Security.Cryptography.Xml { { new XmlDsigExcC14NTransform ().GetDigestedOutput (null); } -#endif } } diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/XmlDsigC14NWithCommentsTransformTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/XmlDsigC14NWithCommentsTransformTest.cs index a97701123cf..a3608afc000 100644 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/XmlDsigC14NWithCommentsTransformTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/XmlDsigC14NWithCommentsTransformTest.cs @@ -97,11 +97,7 @@ namespace MonoTests.System.Security.Cryptography.Xml { Assert.AreEqual (null, xnl, "Default InnerXml"); } -#if NET_2_0 [ExpectedException (typeof (ArgumentException))] -#else - // LAMESPEC: input MUST be one of InputType - but no exception is thrown (not documented) -#endif public void LoadInputWithUnsupportedType () { byte[] bad = { 0xBA, 0xD }; @@ -129,19 +125,15 @@ namespace MonoTests.System.Security.Cryptography.Xml { } [Test] -#if NET_2_0 [ExpectedException (typeof (SecurityException))] -#endif public void C14NSpecExample1_WithoutResolver () { using (StreamWriter sw = new StreamWriter ("doc.dtd", false, Encoding.ASCII)) { sw.Write ("<!-- presence, not content, required -->"); sw.Close (); } -#if NET_2_0 if (!SecurityManager.SecurityEnabled) NUnit.Framework.Assert.Ignore ("SecurityManager isn't enabled."); -#endif string res = ExecuteXmlDSigC14NTransform (C14NSpecExample1Input, false); Assert.AreEqual (C14NSpecExample1Output, res, "Example 1 from c14n spec - PIs, Comments, and Outside of Document Element (with comments)"); } @@ -203,10 +195,8 @@ namespace MonoTests.System.Security.Cryptography.Xml { vreader.ValidationType = ValidationType.None; vreader.EntityHandling = EntityHandling.ExpandCharEntities; doc.Load (vreader); -#if NET_2_0 if (resolver) transform.Resolver = new XmlUrlResolver (); -#endif transform.LoadInput (doc); return Stream2String ((Stream)transform.GetOutput ()); } diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/XmlDsigExcC14NTransformTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/XmlDsigExcC14NTransformTest.cs index 50fb9ba480f..7b56a240055 100644 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/XmlDsigExcC14NTransformTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/XmlDsigExcC14NTransformTest.cs @@ -19,7 +19,6 @@ // output XML. So, they are *not* from c14n specification. // -#if NET_2_0 using System; using System.IO; @@ -598,4 +597,3 @@ namespace MonoTests.System.Security.Cryptography.Xml { } } -#endif diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/XmlDsigExcC14NWithCommentsTransformTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/XmlDsigExcC14NWithCommentsTransformTest.cs index 7d1ca4b4071..9562da1864e 100644 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/XmlDsigExcC14NWithCommentsTransformTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/XmlDsigExcC14NWithCommentsTransformTest.cs @@ -14,7 +14,6 @@ // (C) 2008 Gert Driesen // -#if NET_2_0 using System; using System.IO; @@ -140,4 +139,3 @@ namespace MonoTests.System.Security.Cryptography.Xml { } } -#endif diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/XmlDsigXPathTransformTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/XmlDsigXPathTransformTest.cs index a3fa4215609..43bb7f079bb 100644 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/XmlDsigXPathTransformTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/XmlDsigXPathTransformTest.cs @@ -86,9 +86,7 @@ namespace MonoTests.System.Security.Cryptography.Xml { } [Test] -#if NET_2_0 [Ignore ("throws a NullReferenceException - but it's (kind of internal)")] -#endif public void GetInnerXml () { XmlNodeList xnl = transform.UnprotectedGetInnerXml (); @@ -105,9 +103,7 @@ namespace MonoTests.System.Security.Cryptography.Xml { XmlNodeList inner = InnerXml (""); // empty transform.LoadInnerXml (inner); XmlNodeList xnl = (XmlNodeList) transform.GetOutput (); -#if NET_2_0 Assert.AreEqual (0, xnl.Count, "Count"); -#endif } private XmlDocument GetDoc () @@ -132,9 +128,7 @@ namespace MonoTests.System.Security.Cryptography.Xml { } [Test] -#if NET_2_0 [Category ("NotWorking")] -#endif public void LoadInputAsXmlDocument () { XmlDocument doc = GetDoc (); @@ -142,11 +136,7 @@ namespace MonoTests.System.Security.Cryptography.Xml { XmlNodeList inner = InnerXml ("//*/title"); transform.LoadInnerXml (inner); XmlNodeList xnl = (XmlNodeList) transform.GetOutput (); -#if NET_2_0 Assert.AreEqual (73, xnl.Count); -#else - Assert.AreEqual (47, xnl.Count); -#endif } [Test] @@ -182,9 +172,7 @@ namespace MonoTests.System.Security.Cryptography.Xml { } [Test] -#if NET_2_0 [Category ("NotWorking")] -#endif public void LoadInputAsStream () { XmlDocument doc = GetDoc (); @@ -196,11 +184,7 @@ namespace MonoTests.System.Security.Cryptography.Xml { XmlNodeList inner = InnerXml ("//*/title"); transform.LoadInnerXml (inner); XmlNodeList xnl = (XmlNodeList) transform.GetOutput (); -#if NET_2_0 Assert.AreEqual (73, xnl.Count); -#else - Assert.AreEqual (47, xnl.Count); -#endif } [Test] @@ -291,39 +275,22 @@ namespace MonoTests.System.Security.Cryptography.Xml { doc.LoadXml ("<element xmlns='urn:foo'><foo><bar>test</bar></foo></element>"); t.LoadInput (doc); nl = (XmlNodeList) t.GetOutput (); -#if NET_2_0 Assert.AreEqual (0, nl.Count, "1"); -#else - Assert.AreEqual (1, nl.Count, "1"); -#endif doc.LoadXml ("<element xmlns='urn:foo'><foo xmlns='urn:bar'><bar>test</bar></foo></element>"); t.LoadInput (doc); nl = (XmlNodeList) t.GetOutput (); -#if NET_2_0 Assert.AreEqual (0, nl.Count, "2"); -#else - Assert.AreEqual (2, nl.Count, "2"); -#endif doc.LoadXml ("<element xmlns='urn:foo' xmlns:x='urn:x'><foo xmlns='urn:bar'><bar>test</bar></foo></element>"); t.LoadInput (doc); nl = (XmlNodeList) t.GetOutput (); -#if NET_2_0 Assert.AreEqual (0, nl.Count, "3"); -#else - Assert.AreEqual (3, nl.Count, "3"); -#endif doc.LoadXml ("<envelope><Signature xmlns='http://www.w3.org/2000/09/xmldsig#'><XPath>blah</XPath></Signature></envelope>"); t.LoadInput (doc); nl = (XmlNodeList) t.GetOutput (); -#if NET_2_0 Assert.AreEqual (0, nl.Count, "4"); -#else - Assert.AreEqual (1, nl.Count, "4"); - Assert.AreEqual (XmlNodeType.Attribute, nl [0].NodeType, "NodeType"); -#endif } } } diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/XmlDsigXsltTransformTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/XmlDsigXsltTransformTest.cs index 2074c79333b..cc44b12d4c5 100644 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/XmlDsigXsltTransformTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/XmlDsigXsltTransformTest.cs @@ -117,11 +117,7 @@ namespace MonoTests.System.Security.Cryptography.Xml { [Test] -#if NET_2_0 [ExpectedException (typeof (ArgumentNullException))] -#else - [ExpectedException (typeof (NullReferenceException))] -#endif public void EmptyXslt () { string test = "<Test>XmlDsigXsltTransform</Test>"; @@ -158,15 +154,10 @@ namespace MonoTests.System.Security.Cryptography.Xml { transform.LoadInnerXml (doc.ChildNodes); Stream s = (Stream) transform.GetOutput (); } -#if NET_2_0 catch (Exception e) { // we must deal with an internal exception result = (e.GetType ().ToString ().EndsWith ("XsltLoadException")); result = true; -#else - catch (XsltCompileException) { - result = true; -#endif } finally { Assert.IsTrue (result, "Exception not thrown"); @@ -174,11 +165,7 @@ namespace MonoTests.System.Security.Cryptography.Xml { } [Test] -#if NET_2_0 [ExpectedException (typeof (ArgumentNullException))] -#else - [ExpectedException (typeof (NullReferenceException))] -#endif public void OnlyInner () { string test = "<xsl:stylesheet xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\" xmlns=\"http://www.w3.org/TR/xhtml1/strict\" version=\"1.0\">"; diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/XmlLicenseTransformTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/XmlLicenseTransformTest.cs index ecc16f62a46..ab05a297dc4 100644 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/XmlLicenseTransformTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/XmlLicenseTransformTest.cs @@ -13,7 +13,6 @@ // (C) 2008 Gert Driesen // -#if NET_2_0 using System; using System.IO; @@ -90,4 +89,3 @@ namespace MonoTests.System.Security.Cryptography.Xml { } } -#endif diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography/CryptographicAttributeObjectCas.cs b/mcs/class/System.Security/Test/System.Security.Cryptography/CryptographicAttributeObjectCas.cs index 804dc18a2d2..c98b6c2341f 100644 --- a/mcs/class/System.Security/Test/System.Security.Cryptography/CryptographicAttributeObjectCas.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography/CryptographicAttributeObjectCas.cs @@ -27,7 +27,6 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 using NUnit.Framework; @@ -74,4 +73,3 @@ namespace MonoCasTests.System.Security.Cryptography { } } -#endif diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography/CryptographicAttributeObjectCollectionCas.cs b/mcs/class/System.Security/Test/System.Security.Cryptography/CryptographicAttributeObjectCollectionCas.cs index 3a70665d4e8..9ea196b0989 100644 --- a/mcs/class/System.Security/Test/System.Security.Cryptography/CryptographicAttributeObjectCollectionCas.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography/CryptographicAttributeObjectCollectionCas.cs @@ -27,7 +27,6 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 using NUnit.Framework; @@ -76,4 +75,3 @@ namespace MonoCasTests.System.Security.Cryptography { } } -#endif diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography/CryptographicAttributeObjectCollectionTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography/CryptographicAttributeObjectCollectionTest.cs index 5b58cb0c610..895c3d24e38 100644 --- a/mcs/class/System.Security/Test/System.Security.Cryptography/CryptographicAttributeObjectCollectionTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography/CryptographicAttributeObjectCollectionTest.cs @@ -27,7 +27,6 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 using NUnit.Framework; @@ -224,4 +223,3 @@ namespace MonoTests.System.Security.Cryptography { } } -#endif diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography/CryptographicAttributeObjectEnumeratorCas.cs b/mcs/class/System.Security/Test/System.Security.Cryptography/CryptographicAttributeObjectEnumeratorCas.cs index 4da810c6e1f..61ce72e4f52 100644 --- a/mcs/class/System.Security/Test/System.Security.Cryptography/CryptographicAttributeObjectEnumeratorCas.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography/CryptographicAttributeObjectEnumeratorCas.cs @@ -27,7 +27,6 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 using NUnit.Framework; @@ -81,4 +80,3 @@ namespace MonoCasTests.System.Security.Cryptography { } } -#endif diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography/CryptographicAttributeObjectEnumeratorTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography/CryptographicAttributeObjectEnumeratorTest.cs index edd4f8684a9..c732799402b 100644 --- a/mcs/class/System.Security/Test/System.Security.Cryptography/CryptographicAttributeObjectEnumeratorTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography/CryptographicAttributeObjectEnumeratorTest.cs @@ -27,7 +27,6 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 using NUnit.Framework; @@ -113,4 +112,3 @@ namespace MonoTests.System.Security.Cryptography { } } -#endif diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography/CryptographicAttributeTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography/CryptographicAttributeTest.cs index 6f7543b2601..90a4dbe2d7e 100644 --- a/mcs/class/System.Security/Test/System.Security.Cryptography/CryptographicAttributeTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography/CryptographicAttributeTest.cs @@ -27,7 +27,6 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 using NUnit.Framework; @@ -94,4 +93,3 @@ namespace MonoTests.System.Security.Cryptography { } } -#endif diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography/ProtectedDataCas.cs b/mcs/class/System.Security/Test/System.Security.Cryptography/ProtectedDataCas.cs index d552b927cf8..bc2e6aeb406 100644 --- a/mcs/class/System.Security/Test/System.Security.Cryptography/ProtectedDataCas.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography/ProtectedDataCas.cs @@ -27,7 +27,6 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 using NUnit.Framework; @@ -171,4 +170,3 @@ namespace MonoCasTests.System.Security.Cryptography { } } -#endif diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography/ProtectedDataTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography/ProtectedDataTest.cs index 41c39862fbd..f18ca734af9 100644 --- a/mcs/class/System.Security/Test/System.Security.Cryptography/ProtectedDataTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography/ProtectedDataTest.cs @@ -8,7 +8,6 @@ // Copyright (C) 2005 Novell, Inc (http://www.novell.com) // -#if NET_2_0 using NUnit.Framework; @@ -157,4 +156,3 @@ namespace MonoTests.System.Security.Cryptography { } } -#endif
\ No newline at end of file diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography/ProtectedMemoryCas.cs b/mcs/class/System.Security/Test/System.Security.Cryptography/ProtectedMemoryCas.cs index c9d01d46e35..2d98ae52cb5 100644 --- a/mcs/class/System.Security/Test/System.Security.Cryptography/ProtectedMemoryCas.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography/ProtectedMemoryCas.cs @@ -27,7 +27,6 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 using NUnit.Framework; @@ -167,4 +166,3 @@ namespace MonoCasTests.System.Security.Cryptography { } } -#endif diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography/ProtectedMemoryTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography/ProtectedMemoryTest.cs index 3e751691cbf..dab36660d2f 100644 --- a/mcs/class/System.Security/Test/System.Security.Cryptography/ProtectedMemoryTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography/ProtectedMemoryTest.cs @@ -8,7 +8,6 @@ // Copyright (C) 2005 Novell, Inc (http://www.novell.com) // -#if NET_2_0 using NUnit.Framework; @@ -142,4 +141,3 @@ namespace MonoTests.System.Security.Cryptography { } } -#endif
\ No newline at end of file diff --git a/mcs/class/System.Security/Test/System.Security.Permissions/DataProtectionPermissionAttributeTest.cs b/mcs/class/System.Security/Test/System.Security.Permissions/DataProtectionPermissionAttributeTest.cs index 6e42c88429c..2ad9a384775 100644 --- a/mcs/class/System.Security/Test/System.Security.Permissions/DataProtectionPermissionAttributeTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Permissions/DataProtectionPermissionAttributeTest.cs @@ -27,7 +27,6 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 using NUnit.Framework; using System; @@ -198,4 +197,3 @@ namespace MonoTests.System.Security.Permissions { } } -#endif diff --git a/mcs/class/System.Security/Test/standalone_tests/xmldsig.cs b/mcs/class/System.Security/Test/standalone_tests/xmldsig.cs index ca996539d33..f566ec2c3df 100644 --- a/mcs/class/System.Security/Test/standalone_tests/xmldsig.cs +++ b/mcs/class/System.Security/Test/standalone_tests/xmldsig.cs @@ -258,13 +258,6 @@ DumpSignedXml (s); // some documents references other documents in the directory Directory.SetCurrentDirectory ("phaos-xmldsig-three"); foreach (FileInfo fi in new DirectoryInfo (".").GetFiles ("signature-*.xml")) { -#if !NET_2_0 - if ((fi.Name.IndexOf ("exclusive") >= 0) && (!exc14n)) { - Console.WriteLine ("NOT RUN: " + fi.Name + " : System.Security.dll cannot validate exclusive-c14n."); - skip++; - continue; - } -#endif if ((fi.Name.IndexOf ("md5") >= 0) && (!hmacmd5)) { Console.WriteLine ("NOT RUN: " + fi.Name + " : System.Security.dll doesn't support HMAC-MD5."); skip++; |