diff --git a/crypto/test/src/asn1/test/ASN1IntegerTest.cs b/crypto/test/src/asn1/test/ASN1IntegerTest.cs
index 3d0c6fcd0..0e37a7e10 100644
--- a/crypto/test/src/asn1/test/ASN1IntegerTest.cs
+++ b/crypto/test/src/asn1/test/ASN1IntegerTest.cs
@@ -24,7 +24,7 @@ namespace Org.BouncyCastle.Asn1.Tests
public override void PerformTest()
{
-#if NETCF_1_0 || NETCF_2_0 || SILVERLIGHT || (PORTABLE && !DOTNET) || NET_1_1
+#if PORTABLE && !DOTNET
// Can't SetEnvironmentVariable !
#else
SetAllowUnsafeProperty(true);
@@ -351,7 +351,7 @@ namespace Org.BouncyCastle.Asn1.Tests
private void SetAllowUnsafeProperty(bool allowUnsafe)
{
-#if NETCF_1_0 || NETCF_2_0 || SILVERLIGHT || (PORTABLE && !DOTNET) || NET_1_1
+#if PORTABLE && !DOTNET
// Can't SetEnvironmentVariable !
#else
Environment.SetEnvironmentVariable(DerInteger.AllowUnsafeProperty, allowUnsafe ? "true" : "false");
diff --git a/crypto/test/src/asn1/test/MiscTest.cs b/crypto/test/src/asn1/test/MiscTest.cs
index 3a7eb5af6..44158ab3e 100644
--- a/crypto/test/src/asn1/test/MiscTest.cs
+++ b/crypto/test/src/asn1/test/MiscTest.cs
@@ -85,7 +85,7 @@ namespace Org.BouncyCastle.Asn1.Tests
private void SetAllowUnsafeProperty(bool allowUnsafe)
{
-#if NETCF_1_0 || NETCF_2_0 || SILVERLIGHT || (PORTABLE && !DOTNET) || NET_1_1
+#if PORTABLE && !DOTNET
// Can't SetEnvironmentVariable !
#else
Environment.SetEnvironmentVariable(DerInteger.AllowUnsafeProperty, allowUnsafe ? "true" : "false");
diff --git a/crypto/test/src/crypto/test/SP80038GTest.cs b/crypto/test/src/crypto/test/SP80038GTest.cs
index 676a564bf..d8fe83150 100644
--- a/crypto/test/src/crypto/test/SP80038GTest.cs
+++ b/crypto/test/src/crypto/test/SP80038GTest.cs
@@ -274,7 +274,7 @@ namespace Org.BouncyCastle.Crypto.Tests
private void testDisable()
{
-#if NETCF_1_0 || NETCF_2_0 || SILVERLIGHT || (PORTABLE && !DOTNET) || NET_1_1
+#if PORTABLE && !DOTNET
// Can't SetEnvironmentVariable !
#else
Environment.SetEnvironmentVariable("org.bouncycastle.fpe.disable", "true");
diff --git a/crypto/test/src/security/test/SecureRandomTest.cs b/crypto/test/src/security/test/SecureRandomTest.cs
index a474b5339..8aac422fd 100644
--- a/crypto/test/src/security/test/SecureRandomTest.cs
+++ b/crypto/test/src/security/test/SecureRandomTest.cs
@@ -3,21 +3,19 @@ using System.Text;
using NUnit.Framework;
-using Org.BouncyCastle.Crypto;
using Org.BouncyCastle.Crypto.Digests;
using Org.BouncyCastle.Crypto.Engines;
using Org.BouncyCastle.Crypto.Macs;
using Org.BouncyCastle.Crypto.Prng;
using Org.BouncyCastle.Crypto.Parameters;
using Org.BouncyCastle.Utilities;
-using Org.BouncyCastle.Utilities.Test;
namespace Org.BouncyCastle.Security.Tests
{
[TestFixture]
public class SecureRandomTest
{
-#if !(NETCF_1_0 || PORTABLE)
+#if !PORTABLE
[Test]
public void TestCryptoApi()
{
diff --git a/crypto/test/src/security/test/TestDotNetUtil.cs b/crypto/test/src/security/test/TestDotNetUtil.cs
index 3354be0b9..062eada0e 100644
--- a/crypto/test/src/security/test/TestDotNetUtil.cs
+++ b/crypto/test/src/security/test/TestDotNetUtil.cs
@@ -1,4 +1,4 @@
-#if !(NETCF_1_0 || SILVERLIGHT || PORTABLE)
+#if !PORTABLE
using System;
using System.Security.Cryptography;
diff --git a/crypto/test/src/test/SP80038GTest.cs b/crypto/test/src/test/SP80038GTest.cs
index 05dc7dded..adf6f35d8 100644
--- a/crypto/test/src/test/SP80038GTest.cs
+++ b/crypto/test/src/test/SP80038GTest.cs
@@ -272,8 +272,8 @@ namespace Org.BouncyCastle.Tests
private void testDisable()
{
-#if NETCF_1_0 || NETCF_2_0 || SILVERLIGHT || (PORTABLE && !DOTNET) || NET_1_1
- // Can't SetEnvironmentVariable !
+#if PORTABLE && !DOTNET
+ // Can't SetEnvironmentVariable !
#else
Environment.SetEnvironmentVariable("org.bouncycastle.fpe.disable", "true");
try
diff --git a/crypto/test/src/util/test/SimpleTest.cs b/crypto/test/src/util/test/SimpleTest.cs
index b2eb670ff..fdb857fb8 100644
--- a/crypto/test/src/util/test/SimpleTest.cs
+++ b/crypto/test/src/util/test/SimpleTest.cs
@@ -196,28 +196,10 @@ namespace Org.BouncyCastle.Utilities.Test
#endif
}
-#if NETCF_1_0 || NETCF_2_0
- private static string GetNewLine()
- {
- MemoryStream buf = new MemoryStream();
- StreamWriter w = new StreamWriter(buf, Encoding.ASCII);
- w.WriteLine();
- w.Close();
- byte[] bs = buf.ToArray();
- return Encoding.ASCII.GetString(bs, 0, bs.Length);
- }
-
- internal static string GetEnvironmentVariable(
- string variable)
- {
- return null;
- }
-#else
private static string GetNewLine()
{
return Environment.NewLine;
}
-#endif
internal static readonly string NewLine = GetNewLine();
diff --git a/crypto/test/src/util/test/TestFailedException.cs b/crypto/test/src/util/test/TestFailedException.cs
index 54dc840bc..215e1fd20 100644
--- a/crypto/test/src/util/test/TestFailedException.cs
+++ b/crypto/test/src/util/test/TestFailedException.cs
@@ -2,7 +2,7 @@ using System;
namespace Org.BouncyCastle.Utilities.Test
{
-#if !(NETCF_1_0 || NETCF_2_0 || SILVERLIGHT || PORTABLE)
+#if !PORTABLE
[Serializable]
#endif
public class TestFailedException
|
