diff --git a/crypto/src/cms/CMSProcessableFile.cs b/crypto/src/cms/CMSProcessableFile.cs
index b514bdbda..c74d2a846 100644
--- a/crypto/src/cms/CMSProcessableFile.cs
+++ b/crypto/src/cms/CMSProcessableFile.cs
@@ -1,4 +1,4 @@
-#if !PORTABLE
+#if !PORTABLE || DOTNET
using System;
using System.IO;
diff --git a/crypto/src/openpgp/PgpLiteralDataGenerator.cs b/crypto/src/openpgp/PgpLiteralDataGenerator.cs
index 17a6eeef2..7672659ca 100644
--- a/crypto/src/openpgp/PgpLiteralDataGenerator.cs
+++ b/crypto/src/openpgp/PgpLiteralDataGenerator.cs
@@ -141,8 +141,8 @@ namespace Org.BouncyCastle.Bcpg.OpenPgp
return new WrappedGeneratorStream(this, pkOut);
}
-#if !PORTABLE
- /// <summary>
+#if !PORTABLE || DOTNET
+ /// <summary>
/// <p>
/// Open a literal data packet for the passed in <c>FileInfo</c> object, returning
/// an output stream for saving the file contents.
diff --git a/crypto/src/openpgp/PgpUtilities.cs b/crypto/src/openpgp/PgpUtilities.cs
index 9238edcfc..055f99636 100644
--- a/crypto/src/openpgp/PgpUtilities.cs
+++ b/crypto/src/openpgp/PgpUtilities.cs
@@ -347,7 +347,7 @@ namespace Org.BouncyCastle.Bcpg.OpenPgp
return MakeKey(algorithm, keyBytes);
}
-#if !PORTABLE
+#if !PORTABLE || DOTNET
/// <summary>Write out the passed in file as a literal data packet.</summary>
public static void WriteFileToLiteralData(
Stream output,
diff --git a/crypto/test/src/asn1/test/AllTests.cs b/crypto/test/src/asn1/test/AllTests.cs
index ad2f90362..981b5a4df 100644
--- a/crypto/test/src/asn1/test/AllTests.cs
+++ b/crypto/test/src/asn1/test/AllTests.cs
@@ -1,3 +1,4 @@
+#if !LIB
using System;
using NUnit.Core;
@@ -28,3 +29,4 @@ namespace Org.BouncyCastle.Asn1.Tests
}
}
}
+#endif
diff --git a/crypto/test/src/cms/test/AllTests.cs b/crypto/test/src/cms/test/AllTests.cs
index b7ac7644b..b47374914 100644
--- a/crypto/test/src/cms/test/AllTests.cs
+++ b/crypto/test/src/cms/test/AllTests.cs
@@ -1,3 +1,4 @@
+#if !LIB
using System;
using NUnit.Core;
@@ -32,3 +33,4 @@ namespace Org.BouncyCastle.Cms.Tests
}
}
}
+#endif
diff --git a/crypto/test/src/crypto/agreement/test/AllTests.cs b/crypto/test/src/crypto/agreement/test/AllTests.cs
index ea8f438e5..66853b285 100644
--- a/crypto/test/src/crypto/agreement/test/AllTests.cs
+++ b/crypto/test/src/crypto/agreement/test/AllTests.cs
@@ -1,4 +1,5 @@
-using System;
+#if !LIB
+using System;
using NUnit.Core;
using NUnit.Framework;
@@ -29,3 +30,4 @@ namespace Org.BouncyCastle.Crypto.Agreement.Tests
}
}
}
+#endif
diff --git a/crypto/test/src/crypto/io/test/AllTests.cs b/crypto/test/src/crypto/io/test/AllTests.cs
index 5c8c759f9..2634b4ab1 100644
--- a/crypto/test/src/crypto/io/test/AllTests.cs
+++ b/crypto/test/src/crypto/io/test/AllTests.cs
@@ -1,3 +1,4 @@
+#if !LIB
using System;
using NUnit.Core;
@@ -24,3 +25,4 @@ namespace Org.BouncyCastle.Crypto.IO.Tests
}
}
}
+#endif
diff --git a/crypto/test/src/crypto/test/AllTests.cs b/crypto/test/src/crypto/test/AllTests.cs
index 3d8ef5602..e7035a663 100644
--- a/crypto/test/src/crypto/test/AllTests.cs
+++ b/crypto/test/src/crypto/test/AllTests.cs
@@ -1,6 +1,8 @@
using System;
+#if !LIB
using NUnit.Core;
+#endif
using NUnit.Framework;
using Org.BouncyCastle.Utilities.Test;
@@ -10,6 +12,7 @@ namespace Org.BouncyCastle.Crypto.Tests
[TestFixture]
public class AllTests
{
+#if !LIB
public static void Main(string[] args)
{
Suite.Run(new NullListener(), NUnit.Core.TestFilter.Empty);
@@ -26,6 +29,7 @@ namespace Org.BouncyCastle.Crypto.Tests
return suite;
}
}
+#endif
[Test]
public void TestCrypto()
diff --git a/crypto/test/src/math/ec/test/AllTests.cs b/crypto/test/src/math/ec/test/AllTests.cs
index 3e014ffd2..0517ac713 100644
--- a/crypto/test/src/math/ec/test/AllTests.cs
+++ b/crypto/test/src/math/ec/test/AllTests.cs
@@ -1,3 +1,4 @@
+#if !LIB
using System;
using NUnit.Core;
@@ -25,3 +26,4 @@ namespace Org.BouncyCastle.Math.EC.Tests
}
}
}
+#endif
diff --git a/crypto/test/src/math/test/AllTests.cs b/crypto/test/src/math/test/AllTests.cs
index 2bcc129ea..53feff954 100644
--- a/crypto/test/src/math/test/AllTests.cs
+++ b/crypto/test/src/math/test/AllTests.cs
@@ -1,3 +1,4 @@
+#if !LIB
using System;
using NUnit.Core;
@@ -25,3 +26,4 @@ namespace Org.BouncyCastle.Math.Tests
}
}
}
+#endif
diff --git a/crypto/test/src/ocsp/test/AllTests.cs b/crypto/test/src/ocsp/test/AllTests.cs
index 5e919fd91..5e799cd09 100644
--- a/crypto/test/src/ocsp/test/AllTests.cs
+++ b/crypto/test/src/ocsp/test/AllTests.cs
@@ -1,3 +1,4 @@
+#if !LIB
using System;
using NUnit.Core;
@@ -26,3 +27,4 @@ namespace Org.BouncyCastle.Ocsp.Tests
}
}
}
+#endif
diff --git a/crypto/test/src/openpgp/examples/test/AllTests.cs b/crypto/test/src/openpgp/examples/test/AllTests.cs
index 9a515ea15..3403a4fdc 100644
--- a/crypto/test/src/openpgp/examples/test/AllTests.cs
+++ b/crypto/test/src/openpgp/examples/test/AllTests.cs
@@ -1,3 +1,4 @@
+#if !LIB
using System;
using System.IO;
@@ -434,3 +435,4 @@ namespace Org.BouncyCastle.Bcpg.OpenPgp.Examples.Tests
}
}
}
+#endif
diff --git a/crypto/test/src/openssl/test/AllTests.cs b/crypto/test/src/openssl/test/AllTests.cs
index f843d0479..0cc2dcd85 100644
--- a/crypto/test/src/openssl/test/AllTests.cs
+++ b/crypto/test/src/openssl/test/AllTests.cs
@@ -2,7 +2,9 @@ using System;
using System.IO;
using System.Text;
+#if !LIB
using NUnit.Core;
+#endif
using NUnit.Framework;
using Org.BouncyCastle.Crypto;
@@ -33,6 +35,7 @@ namespace Org.BouncyCastle.OpenSsl.Tests
}
}
+#if !LIB
public static void Main(string[] args)
{
Suite.Run(new NullListener(), NUnit.Core.TestFilter.Empty);
@@ -48,6 +51,7 @@ namespace Org.BouncyCastle.OpenSsl.Tests
return suite;
}
}
+#endif
[Test]
public void TestOpenSsl()
diff --git a/crypto/test/src/tsp/test/AllTests.cs b/crypto/test/src/tsp/test/AllTests.cs
index 3e8b0cd5e..58d096d54 100644
--- a/crypto/test/src/tsp/test/AllTests.cs
+++ b/crypto/test/src/tsp/test/AllTests.cs
@@ -1,3 +1,4 @@
+#if !LIB
using System;
using NUnit.Core;
@@ -29,3 +30,4 @@ namespace Org.BouncyCastle.Tsp.Tests
}
}
}
+#endif
diff --git a/crypto/test/src/util/io/pem/test/AllTests.cs b/crypto/test/src/util/io/pem/test/AllTests.cs
index c36f79304..921c40cb8 100644
--- a/crypto/test/src/util/io/pem/test/AllTests.cs
+++ b/crypto/test/src/util/io/pem/test/AllTests.cs
@@ -4,7 +4,9 @@ using System.Collections.Specialized;
using System.IO;
using System.Text;
+#if !LIB
using NUnit.Core;
+#endif
using NUnit.Framework;
using Org.BouncyCastle.Crypto;
@@ -19,6 +21,7 @@ namespace Org.BouncyCastle.Utilities.IO.Pem.Tests
[TestFixture]
public class AllTests
{
+#if !LIB
public static void Main(string[] args)
{
Suite.Run(new NullListener(), NUnit.Core.TestFilter.Empty);
@@ -34,6 +37,7 @@ namespace Org.BouncyCastle.Utilities.IO.Pem.Tests
return suite;
}
}
+#endif
[Test]
public void TestPemLength()
|