Unbreak, take 3

diff --git a/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ/RabbitMQMessagingProvider.cs b/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ/RabbitMQMessagingProvider.cs
index 41644a3505a40613c14b4ad336de60bcdb819098..9b2717c0e2ade987ab2778f3f1fef2c5255f80dd 100644 (file)
--- a/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ/RabbitMQMessagingProvider.cs
+++ b/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ/RabbitMQMessagingProvider.cs
@@ -55,8 +55,8 @@ namespace Mono.Messaging.RabbitMQ {
                
                private static uint GetLocalIP ()
                {
-                       String strHostName = Dns.GetHostName ();
-                       IPHostEntry ipEntry = Dns.GetHostByName (strHostName);
+                       String strHostName = System.Net.Dns.GetHostName ();
+                       IPHostEntry ipEntry = System.Net.Dns.GetHostByName (strHostName);
                        foreach (IPAddress ip in ipEntry.AddressList) {
                                if (AddressFamily.InterNetwork == ip.AddressFamily) {
                                        byte[] addr = ip.GetAddressBytes ();

diff --git a/mcs/class/System/Mono.Dns/DnsClass.cs b/mcs/class/System/Mono.Dns/DnsClass.cs
index bbebe4f767a754296745fed2060fdfeec9c4ab0b..cd523c7868ede05f7010c53391c5db68a44e4e33 100644 (file)
--- a/mcs/class/System/Mono.Dns/DnsClass.cs
+++ b/mcs/class/System/Mono.Dns/DnsClass.cs
@@ -19,9 +19,6 @@
 // limitations under the License.
 //
 namespace Mono.Dns {
-#if !NET_2_0
-       public
-#endif
        enum DnsClass : ushort {
                Internet = 1,
                IN = 1,

diff --git a/mcs/class/System/Mono.Dns/DnsHeader.cs b/mcs/class/System/Mono.Dns/DnsHeader.cs
index 054f735527866fcc82be88e0454f0a011a4507d1..dc2eb2dab4482ea7450a9407917ce40740e36620 100644 (file)
--- a/mcs/class/System/Mono.Dns/DnsHeader.cs
+++ b/mcs/class/System/Mono.Dns/DnsHeader.cs
@@ -23,9 +23,6 @@ using System.Collections.Generic;
 using System.Text;
 
 namespace Mono.Dns {
-#if !NET_2_0
-       public
-#endif
        class DnsHeader {
                public const int DnsHeaderLength = 12;
                ArraySegment<byte> bytes;

diff --git a/mcs/class/System/Mono.Dns/DnsOpCode.cs b/mcs/class/System/Mono.Dns/DnsOpCode.cs
index 2558afa778fe0172f90e7794b4b6b273dbc5afc2..6100a8a0d92a874dd1b5570cd4de1968507ac5a5 100644 (file)
--- a/mcs/class/System/Mono.Dns/DnsOpCode.cs
+++ b/mcs/class/System/Mono.Dns/DnsOpCode.cs
@@ -20,9 +20,6 @@
 //
 using System;
 namespace Mono.Dns {
-#if !NET_2_0
-       public
-#endif
        enum DnsOpCode : byte {
                Query = 0,
                [Obsolete] IQuery = 1,

diff --git a/mcs/class/System/Mono.Dns/DnsPacket.cs b/mcs/class/System/Mono.Dns/DnsPacket.cs
index 5e9155e74d57a66a1e0c617421af5816d009bf63..31d949e3340a6b39d7d5bcfb7b5f639ddac42fab 100644 (file)
--- a/mcs/class/System/Mono.Dns/DnsPacket.cs
+++ b/mcs/class/System/Mono.Dns/DnsPacket.cs
@@ -24,9 +24,6 @@ using System.Text;
 using System.IO;
 
 namespace Mono.Dns {
-#if !NET_2_0
-       public
-#endif
        abstract class DnsPacket {
                protected byte [] packet;
                protected int position;

diff --git a/mcs/class/System/Mono.Dns/DnsQClass.cs b/mcs/class/System/Mono.Dns/DnsQClass.cs
index cd6f6ec173563449e190c9b0587aa0faac6ee4c8..edce5c8aead71cbaac03d0f8af75aa83e6733d33 100644 (file)
--- a/mcs/class/System/Mono.Dns/DnsQClass.cs
+++ b/mcs/class/System/Mono.Dns/DnsQClass.cs
@@ -19,9 +19,6 @@
 // limitations under the License.
 //
 namespace Mono.Dns {
-#if !NET_2_0
-       public
-#endif
        enum DnsQClass : ushort {
                Internet = 1,
                IN = 1,

diff --git a/mcs/class/System/Mono.Dns/DnsQType.cs b/mcs/class/System/Mono.Dns/DnsQType.cs
index 523fe82ab6984114c627d370da3da40f513e3f8a..0b0b57a5fad7dba0806b8866372c24f4cd7be1de 100644 (file)
--- a/mcs/class/System/Mono.Dns/DnsQType.cs
+++ b/mcs/class/System/Mono.Dns/DnsQType.cs
@@ -20,9 +20,6 @@
 //
 using System;
 namespace Mono.Dns {
-#if !NET_2_0
-       public
-#endif
        enum DnsQType : ushort {
                A             =         1,
                NS            =         2,

diff --git a/mcs/class/System/Mono.Dns/DnsQuery.cs b/mcs/class/System/Mono.Dns/DnsQuery.cs
index 2a0cfb0e036fe558ac8045fec3a11b59b0825bc1..1930ee5126ed5172b5ef4746c967a7fa373e3e6f 100644 (file)
--- a/mcs/class/System/Mono.Dns/DnsQuery.cs
+++ b/mcs/class/System/Mono.Dns/DnsQuery.cs
@@ -24,9 +24,6 @@ using System.IO;
 using System.Text;
 
 namespace Mono.Dns {
-#if !NET_2_0
-       public
-#endif
        class DnsQuery : DnsPacket {
                public DnsQuery (string name, DnsQType qtype, DnsQClass qclass)
                {

diff --git a/mcs/class/System/Mono.Dns/DnsQuestion.cs b/mcs/class/System/Mono.Dns/DnsQuestion.cs
index e4d9a38790c5d9d099d2ede967845e42ad118e25..3875676faaca33334c3baee8cb580c33149d54d1 100644 (file)
--- a/mcs/class/System/Mono.Dns/DnsQuestion.cs
+++ b/mcs/class/System/Mono.Dns/DnsQuestion.cs
@@ -23,9 +23,6 @@ using System.Collections.Generic;
 using System.Text;
 
 namespace Mono.Dns {
-#if !NET_2_0
-       public
-#endif
        class DnsQuestion {
                string name;
                DnsQType type;

diff --git a/mcs/class/System/Mono.Dns/DnsRCode.cs b/mcs/class/System/Mono.Dns/DnsRCode.cs
index ae510e6b395e18b8a2ac4ac35b047dfbe0bd0fa1..bbb6fdd098d098e3552bcff81bcb511f45ff1890 100644 (file)
--- a/mcs/class/System/Mono.Dns/DnsRCode.cs
+++ b/mcs/class/System/Mono.Dns/DnsRCode.cs
@@ -19,9 +19,6 @@
 // limitations under the License.
 //
 namespace Mono.Dns {
-#if !NET_2_0
-       public
-#endif
        enum DnsRCode : ushort {
                NoError = 0,
                FormErr = 1,

diff --git a/mcs/class/System/Mono.Dns/DnsResourceRecord.cs b/mcs/class/System/Mono.Dns/DnsResourceRecord.cs
index 5a190012dbd9c30b797d843cb6a72df8f597f871..a122e33b48769d72607c9c823cd4ac89e691165d 100644 (file)
--- a/mcs/class/System/Mono.Dns/DnsResourceRecord.cs
+++ b/mcs/class/System/Mono.Dns/DnsResourceRecord.cs
@@ -24,9 +24,6 @@ using System.IO;
 using System.Text;
 
 namespace Mono.Dns {
-#if !NET_2_0
-       public
-#endif
        class DnsResourceRecord {
                string name;
                DnsType type;

diff --git a/mcs/class/System/Mono.Dns/DnsResourceRecordA.cs b/mcs/class/System/Mono.Dns/DnsResourceRecordA.cs
index b367d8dc66d700cc209bfde545933eef69a80cb8..857fe0ad24099ee1a0c55ee3d49d35fdff16ea41 100644 (file)
--- a/mcs/class/System/Mono.Dns/DnsResourceRecordA.cs
+++ b/mcs/class/System/Mono.Dns/DnsResourceRecordA.cs
@@ -24,9 +24,6 @@ using System.Net;
 using System.Text;
 
 namespace Mono.Dns {
-#if !NET_2_0
-       public
-#endif
        class DnsResourceRecordA : DnsResourceRecordIPAddress {
                internal DnsResourceRecordA (DnsResourceRecord rr)
                        : base (rr, 4)

diff --git a/mcs/class/System/Mono.Dns/DnsResourceRecordAAAA.cs b/mcs/class/System/Mono.Dns/DnsResourceRecordAAAA.cs
index c2d9571fb8cf31856786dec21d0a83ae4d6474f8..f46b06f7e99d62f0f0a986d84dc368c2569003a5 100644 (file)
--- a/mcs/class/System/Mono.Dns/DnsResourceRecordAAAA.cs
+++ b/mcs/class/System/Mono.Dns/DnsResourceRecordAAAA.cs
@@ -24,9 +24,6 @@ using System.Net;
 using System.Text;
 
 namespace Mono.Dns {
-#if !NET_2_0
-       public
-#endif
        class DnsResourceRecordAAAA : DnsResourceRecordIPAddress {
                internal DnsResourceRecordAAAA (DnsResourceRecord rr)
                        : base (rr, 16)

diff --git a/mcs/class/System/Mono.Dns/DnsResourceRecordCName.cs b/mcs/class/System/Mono.Dns/DnsResourceRecordCName.cs
index e2b58d784048c9e3f3b5ad88ef9e27a35dc6e29f..d1d1c8072c0e291eec37994ecf3ddedcc034232a 100644 (file)
--- a/mcs/class/System/Mono.Dns/DnsResourceRecordCName.cs
+++ b/mcs/class/System/Mono.Dns/DnsResourceRecordCName.cs
@@ -23,9 +23,6 @@ using System.Collections.Generic;
 using System.Text;
 
 namespace Mono.Dns {
-#if !NET_2_0
-       public
-#endif
        class DnsResourceRecordCName : DnsResourceRecord {
                string cname;
 

diff --git a/mcs/class/System/Mono.Dns/DnsResourceRecordIPAddress.cs b/mcs/class/System/Mono.Dns/DnsResourceRecordIPAddress.cs
index 5c3c09ad2030d8ef6dea5c2d1d6e7965e8676196..1b9331ddc2a67e56b102d6b49199a1a5f5055dcf 100644 (file)
--- a/mcs/class/System/Mono.Dns/DnsResourceRecordIPAddress.cs
+++ b/mcs/class/System/Mono.Dns/DnsResourceRecordIPAddress.cs
@@ -24,9 +24,6 @@ using System.Net;
 using System.Text;
 
 namespace Mono.Dns {
-#if !NET_2_0
-       public
-#endif
        abstract class DnsResourceRecordIPAddress : DnsResourceRecord {
                IPAddress address;
 

diff --git a/mcs/class/System/Mono.Dns/DnsResourceRecordPTR.cs b/mcs/class/System/Mono.Dns/DnsResourceRecordPTR.cs
index 5b74fdab11dffe4da76960b80b5d7ed02efc3c2a..b54ab527b2b84c6918ceda3c87156b9a5c0bb293 100644 (file)
--- a/mcs/class/System/Mono.Dns/DnsResourceRecordPTR.cs
+++ b/mcs/class/System/Mono.Dns/DnsResourceRecordPTR.cs
@@ -23,9 +23,6 @@ using System.Collections.Generic;
 using System.Text;
 
 namespace Mono.Dns {
-#if !NET_2_0
-       public
-#endif
        class DnsResourceRecordPTR : DnsResourceRecord {
                string dname;
 

diff --git a/mcs/class/System/Mono.Dns/DnsResponse.cs b/mcs/class/System/Mono.Dns/DnsResponse.cs
index d5d9496c34c751f9d2d70e8ba26db151bfa32f24..3521548fa288332f04a8df40da8391298c14eb40 100644 (file)
--- a/mcs/class/System/Mono.Dns/DnsResponse.cs
+++ b/mcs/class/System/Mono.Dns/DnsResponse.cs
@@ -25,9 +25,6 @@ using System.IO;
 using System.Text;
 
 namespace Mono.Dns {
-#if !NET_2_0
-       public
-#endif
        class DnsResponse : DnsPacket {
                static readonly ReadOnlyCollection<DnsResourceRecord> EmptyRR = new ReadOnlyCollection<DnsResourceRecord> (new DnsResourceRecord [0]);
                static readonly ReadOnlyCollection<DnsQuestion> EmptyQS = new ReadOnlyCollection<DnsQuestion> (new DnsQuestion [0]);

diff --git a/mcs/class/System/Mono.Dns/DnsType.cs b/mcs/class/System/Mono.Dns/DnsType.cs
index d23cafbb5da7d146b8bc79eb35f2f1e91485be13..16fdc548579ac6efdc03a4f1ebdf8b53f9a039e9 100644 (file)
--- a/mcs/class/System/Mono.Dns/DnsType.cs
+++ b/mcs/class/System/Mono.Dns/DnsType.cs
@@ -20,9 +20,6 @@
 //
 using System;
 namespace Mono.Dns {
-#if !NET_2_0
-       public
-#endif
        enum DnsType : ushort {
                A             =         1,
                NS            =         2,

diff --git a/mcs/class/System/Mono.Dns/DnsUtil.cs b/mcs/class/System/Mono.Dns/DnsUtil.cs
index fc722c3c95f61c5a3738b09e6e15fd8128a2d329..b1a43c710abf7a9dadb307c667cdd51deb0362de 100644 (file)
--- a/mcs/class/System/Mono.Dns/DnsUtil.cs
+++ b/mcs/class/System/Mono.Dns/DnsUtil.cs
@@ -23,9 +23,6 @@ using System.Collections.Generic;
 using System.Text;
 
 namespace Mono.Dns {
-#if !NET_2_0
-       public
-#endif
        static class DnsUtil {
                // RFC 2181 - Section 11
                public static bool IsValidDnsName (string name)

diff --git a/mcs/class/System/Mono.Dns/ResolverAsyncOperation.cs b/mcs/class/System/Mono.Dns/ResolverAsyncOperation.cs
index c97842a865dee491bb68bb59fbe5f117d5bce5b1..5faa796d746ef4ada3186fa4ec8177b09eef2d92 100644 (file)
--- a/mcs/class/System/Mono.Dns/ResolverAsyncOperation.cs
+++ b/mcs/class/System/Mono.Dns/ResolverAsyncOperation.cs
@@ -19,9 +19,6 @@
 // limitations under the License.
 //
 namespace Mono.Dns {
-#if !NET_2_0
-       public
-#endif
        enum ResolverAsyncOperation {
                None,
                GetHostEntry,

diff --git a/mcs/class/System/Mono.Dns/ResolverError.cs b/mcs/class/System/Mono.Dns/ResolverError.cs
index 136901ca8784e6805eae25a60a51ba3b5dd9824e..0695b381414fcf5c6d29549844e771afca70c66d 100644 (file)
--- a/mcs/class/System/Mono.Dns/ResolverError.cs
+++ b/mcs/class/System/Mono.Dns/ResolverError.cs
@@ -18,9 +18,6 @@
 // limitations under the License.
 //
 namespace Mono.Dns {
-#if !NET_2_0
-       public
-#endif
        enum ResolverError {
                NoError,                // From DNS server
                FormatError,            //

diff --git a/mcs/class/System/Mono.Dns/SimpleResolver.cs b/mcs/class/System/Mono.Dns/SimpleResolver.cs
index ca790e60817c87fc345b160a10ea7b2a4edc8d9f..65697276ec8ec9f571ad6d403ded59c45a4b14a5 100644 (file)
--- a/mcs/class/System/Mono.Dns/SimpleResolver.cs
+++ b/mcs/class/System/Mono.Dns/SimpleResolver.cs
@@ -29,9 +29,6 @@ using System.Text;
 using System.Threading;
 
 namespace Mono.Dns {
-#if !NET_2_0
-       public
-#endif
        sealed class SimpleResolver : IDisposable {
                static string [] EmptyStrings = new string [0];
                static IPAddress [] EmptyAddresses = new IPAddress [0];

diff --git a/mcs/class/System/Mono.Dns/SimpleResolverEventArgs.cs b/mcs/class/System/Mono.Dns/SimpleResolverEventArgs.cs
index 599bebe72721e0ff6439f1037c966a8b412e273c..551752079238caf92f1bf3916fea6886d0fd00d5 100644 (file)
--- a/mcs/class/System/Mono.Dns/SimpleResolverEventArgs.cs
+++ b/mcs/class/System/Mono.Dns/SimpleResolverEventArgs.cs
@@ -23,9 +23,6 @@ using System.Net;
 using System.Threading;
 
 namespace Mono.Dns {
-#if !NET_2_0
-       public
-#endif
        class SimpleResolverEventArgs : EventArgs {
                public event EventHandler<SimpleResolverEventArgs> Completed;