Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Safar <marek.safar@gmail.com>2009-06-05 20:27:11 +0400
committerMarek Safar <marek.safar@gmail.com>2009-06-05 20:27:11 +0400
commit2d36f507092d8d02b642dacf11def87f27143034 (patch)
tree846d27023a936e5ca9b5c923a60848db2c826690 /mcs/class/System.Security/System.Security.Cryptography
parent2230659a57a2725a61f3c7ef150d9cf54b28adcf (diff)
2009-06-05 Marek Safar <marek.safar@gmail.com>
* Makefile: Fixed NET_2_0 conditional to actually handle Mono.Security dependency. svn path=/trunk/mcs/; revision=135540
Diffstat (limited to 'mcs/class/System.Security/System.Security.Cryptography')
-rw-r--r--mcs/class/System.Security/System.Security.Cryptography/ChangeLog5
-rw-r--r--mcs/class/System.Security/System.Security.Cryptography/CryptographicAttribute.cs2
-rw-r--r--mcs/class/System.Security/System.Security.Cryptography/CryptographicAttributeCollection.cs2
-rw-r--r--mcs/class/System.Security/System.Security.Cryptography/CryptographicAttributeEnumerator.cs2
4 files changed, 8 insertions, 3 deletions
diff --git a/mcs/class/System.Security/System.Security.Cryptography/ChangeLog b/mcs/class/System.Security/System.Security.Cryptography/ChangeLog
index 8c5904a4109..047b0dfbc03 100644
--- a/mcs/class/System.Security/System.Security.Cryptography/ChangeLog
+++ b/mcs/class/System.Security/System.Security.Cryptography/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-05 Marek Safar <marek.safar@gmail.com>
+
+ * *.cs: Fixed NET_2_0 conditional to actually handle Mono.Security
+ dependency.
+
2005-10-27 Sebastien Pouliot <sebastien@ximian.com>
* ProtectedData.cs: Added support for Windows (2000 and later) by
diff --git a/mcs/class/System.Security/System.Security.Cryptography/CryptographicAttribute.cs b/mcs/class/System.Security/System.Security.Cryptography/CryptographicAttribute.cs
index 7b3fa91f1e1..659ef2fb965 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
+#if NET_2_0 && 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 d3a08efa6d8..60d3851a77a 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
+#if NET_2_0 && 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 c8d70f7cf91..ec422437934 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
+#if NET_2_0 && SECURITY_DEP
using System.Collections;