Remove more old compile defines

mcs/class/System.Security/Test/System.Security.Cryptography.Xml/KeyInfoRetrievalMethodTest.cs

@@ -24,11 +24,7 @@ namespace MonoTests.System.Security.Cryptography.Xml {
 		public void TestNewEmptyKeyNode () 
 		{
 			KeyInfoRetrievalMethod uri1 = new KeyInfoRetrievalMethod ();
-#if NET_1_0
-			Assert.AreEqual ("<RetrievalElement xmlns=\"http://www.w3.org/2000/09/xmldsig#\" />", (uri1.GetXml ().OuterXml), "Empty");
-#else
 			Assert.AreEqual ("<RetrievalMethod xmlns=\"http://www.w3.org/2000/09/xmldsig#\" />", (uri1.GetXml ().OuterXml), "Empty");
-#endif
 		}
 
 		[Test]
@@ -49,11 +45,7 @@ namespace MonoTests.System.Security.Cryptography.Xml {
 		[Test]
 		public void TestImportKeyNode () 
 		{
-#if NET_1_0
-			string value = "<RetrievalElement URI=\"http://www.go-mono.com/\" xmlns=\"http://www.w3.org/2000/09/xmldsig#\" />";
-#else
 			string value = "<RetrievalMethod URI=\"http://www.go-mono.com/\" xmlns=\"http://www.w3.org/2000/09/xmldsig#\" />";
-#endif
 			XmlDocument doc = new XmlDocument ();
 			doc.LoadXml (value);
 

mcs/class/System.Security/Test/System.Security.Cryptography.Xml/KeyInfoTest.cs

@@ -91,11 +91,7 @@ namespace MonoTests.System.Security.Cryptography.Xml {
 			KeyInfoRetrievalMethod retrieval = new KeyInfoRetrievalMethod ();
 			retrieval.Uri = "http://www.go-mono.org/";
 			info.AddClause (retrieval);
-#if NET_1_0
-			Assert.AreEqual ("<KeyInfo xmlns=\"http://www.w3.org/2000/09/xmldsig#\"><RetrievalElement URI=\"http://www.go-mono.org/\" /></KeyInfo>", (info.GetXml ().OuterXml), "RetrievalMethod");
-#else
 			Assert.AreEqual ("<KeyInfo xmlns=\"http://www.w3.org/2000/09/xmldsig#\"><RetrievalMethod URI=\"http://www.go-mono.org/\" /></KeyInfo>", (info.GetXml ().OuterXml), "RetrievalMethod");
-#endif
 			Assert.AreEqual (1, info.Count, "RetrievalMethod count");
 		}
 
@@ -143,11 +139,7 @@ namespace MonoTests.System.Security.Cryptography.Xml {
 
 			string s = "<KeyInfo xmlns=\"http://www.w3.org/2000/09/xmldsig#\"><KeyName>Mono::</KeyName><KeyValue xmlns=\"http://www.w3.org/2000/09/xmldsig#\"><DSAKeyValue><P>rjxsMU368YOCTQejWkiuO9e/vUVwkLtq1jKiU3TtJ53hBJqjFRuTa228vZe+BH2su9RPn/vYFWfQDv6zgBYe3eNdu4Afw+Ny0FatX6dl3E77Ra6Tsd3MmLXBiGSQ1mMNd5G2XQGpbt9zsGlUaexXekeMLxIufgfZLwYp67M+2WM=</P><Q>tf0K9rMyvUrU4cIkwbCrDRhQAJk=</Q><G>S8Z+1pGCed00w6DtVcqZLKjfqlCJ7JsugEFIgSy/Vxtu9YGCMclV4ijGEbPo/jU8YOSMuD7E9M7UaopMRcmKQjoKZzoJjkgVFP48Ohxl1f08lERnButsxanx3+OstFwUGQ8XNaGg3KrIoZt1FUnfxN3RHHTvVhjzNSHxMGULGaU=</G><Y>LnrxxRGLYeV2XLtK3SYz8RQHlHFZYrtznDZyMotuRfO5uC5YODhSFyLXvb1qB3WeGtF4h3Eo4KzHgMgfN2ZMlffxFRhJgTtH3ctbL8lfQoDkjeiPPnYGhspdJxr0tyZmiy0gkjJG3vwHYrLnvZWx9Wm/unqiOlGBPNuxJ+hOeP8=</Y><J>9RhE5TycDtdEIXxS3HfxFyXYgpy81zY5lVjwD6E9JP37MWEi80BlX6ab1YPm6xYSEoqReMPP9RgGiW6DuACpgI7+8vgCr4i/7VhzModJAA56PwvTu6UMt9xxKU/fT672v8ucREkMWoc7lEey</J><Seed>HxW3N4RHWVgqDQKuGg7iJTUTiCs=</Seed><PgenCounter>Asw=</PgenCounter></DSAKeyValue></KeyValue>";
 			s += "<KeyValue xmlns=\"http://www.w3.org/2000/09/xmldsig#\"><RSAKeyValue><Modulus>9DC4XNdQJwMRnz5pP2a6U51MHCODRilaIoVXqUPhCUb0lJdGroeqVYT84ZyIVrcarzD7Tqs3aEOIa3rKox0N1bxQpZPqayVQeLAkjLLtzJW/ScRJx3uEDJdgT1JnM1FH0GZTinmEdCUXdLc7+Y/c/qqIkTfbwHbRZjW0bBJyExM=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue></KeyValue>";
-#if NET_1_0
-			s += "<RetrievalElement URI=\"http://www.go-mono.org/\" />";
-#else
 			s += "<RetrievalMethod URI=\"http://www.go-mono.org/\" />";
-#endif
 			s += "<X509Data xmlns=\"http://www.w3.org/2000/09/xmldsig#\">";
 			s += "<X509Certificate>MIICHTCCAYYCARQwDQYJKoZIhvcNAQEEBQAwWDELMAkGA1UEBhMCQ0ExHzAdBgNVBAMTFktleXdpdG5lc3MgQ2FuYWRhIEluYy4xKDAmBgorBgEEASoCCwIBExhrZXl3aXRuZXNzQGtleXdpdG5lc3MuY2EwHhcNOTYwNTA3MDAwMDAwWhcNOTkwNTA3MDAwMDAwWjBYMQswCQYDVQQGEwJDQTEfMB0GA1UEAxMWS2V5d2l0bmVzcyBDYW5hZGEgSW5jLjEoMCYGCisGAQQBKgILAgETGGtleXdpdG5lc3NAa2V5d2l0bmVzcy5jYTCBnTANBgkqhkiG9w0BAQEFAAOBiwAwgYcCgYEAzSP6KuHtmPTp0JM+13qAAkzMwQKvXLYff/pXQm8w0SDFtSEHQCyphsLzZISuPYUu7YW9VLAYKO9q+BvnCxYfkyVPx/iOw7nKmIQOVdAv73h3xXIoX2C/GSvRcqK32D/glzRaAb0EnMh4Rc2TjRXydhARq7hbLp5S3YE+nGTIKZMCAQMwDQYJKoZIhvcNAQEEBQADgYEAMho1ur9DJ9a01Lh25eObTWzAhsl3NbprFi0TRkqwMlOhW1rpmeIMhogXTg3+gqxOR+/7/zms7jXI+lI3CkmtWa3iiqkcxl8f+G9zfs2gMegMvvVN2bKrihK2MHhoEXwN8UlNo/2y6f8d8JH6VIX/M5Dowb+km6RiRr1hElmYQYk=</X509Certificate></X509Data></KeyInfo>";
 			AssertCrypto.AssertXmlEquals ("Complex", s, (info.GetXml ().OuterXml));

mcs/class/System.ServiceModel/Mono.Security.Protocol.Tls/HttpsClientStream.cs

@@ -55,10 +55,8 @@ namespace Mono.Security.Protocol.Tls {
 			_status = 0;
 			if (buffer != null)
 				InputBuffer.Write (buffer, 0, buffer.Length);
-#if !NET_1_0
                         // also saved from reflection
                         base.CheckCertRevocationStatus = ServicePointManager.CheckCertificateRevocationList;
-#endif
 			ClientCertSelection += delegate (X509CertificateCollection clientCerts, X509Certificate serverCertificate,
 				string targetHost, X509CertificateCollection serverRequestedCertificates) {
 				return ((clientCerts == null) || (clientCerts.Count == 0)) ? null : clientCerts [0];

mcs/class/System.Web/System.Web.Security/PassportIdentity.cs

@@ -94,12 +94,10 @@ namespace System.Web.Security {
 			return AuthUrl2 (null, -1, -1, null, -1, null, -1, -1);
 		}
 
-#if (!NET_1_0)
 		public string AuthUrl2 (String strReturnUrl)
 		{
 			return AuthUrl2 (strReturnUrl, -1, -1, null, -1, null, -1, -1);
 		}
-#endif
 
 		public string AuthUrl2 (string strReturnUrl,
 					int iTimeWindow,
@@ -202,12 +200,10 @@ namespace System.Web.Security {
 			return GetLoginChallenge (null, -1, -1, null, -1, null, -1, -1, null);
 		}
 
-#if (!NET_1_0)
 		public string GetLoginChallenge (String strReturnUrl)
 		{
 			return GetLoginChallenge (strReturnUrl, -1, -1, null, -1, null, -1, -1, null);
 		}
-#endif
 
 		[MonoTODO("Not implemented")]
 		public string GetLoginChallenge (string szRetURL,
@@ -258,12 +254,10 @@ namespace System.Web.Security {
 			return LoginUser (null, -1, -1, null, -1, null, -1, -1, null);
 		}
 
-#if (!NET_1_0)
 		public int LoginUser (String strReturnUrl)
 		{
 			return LoginUser (strReturnUrl, -1, -1, null, -1, null, -1, -1, null);
 		}
-#endif
 
 		public int LoginUser (string szRetURL,
 				      int iTimeWindow,
@@ -297,12 +291,10 @@ namespace System.Web.Security {
 			return LogoTag (null, -1, -1, null, -1, -1, null, -1, -1);
 		}
 
-#if (!NET_1_0)
 		public string LogoTag (String strReturnUrl)
 		{
 			return LogoTag (strReturnUrl, -1, -1, null, -1, -1, null, -1, -1);
 		}
-#endif
 
 		public string LogoTag (string strReturnUrl,
 				       int iTimeWindow,
@@ -336,12 +328,10 @@ namespace System.Web.Security {
 			return LogoTag2 (null, -1, -1, null, -1, -1, null, -1, -1);
 		}
 
-#if (!NET_1_0)
 		public string LogoTag2 (String strReturnUrl)
 		{
 			return LogoTag2 (strReturnUrl, -1, -1, null, -1, -1, null, -1, -1);
 		}
-#endif
 
 		public string LogoTag2 (string strReturnUrl,
 				        int iTimeWindow,

mcs/class/System/System.Net.NetworkInformation/MulticastIPAddressInformation.cs

@@ -26,7 +26,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.
 //
-
 using System.Runtime.InteropServices;
 
 namespace System.Net.NetworkInformation {

mcs/class/System/System.Net.NetworkInformation/MulticastIPAddressInformationCollection.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.
 //
-
 using System.Collections;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;

mcs/class/System/System.Net.NetworkInformation/NetBiosNodeType.cs

@@ -25,7 +25,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.
 //
-
 namespace System.Net.NetworkInformation {
 	public enum NetBiosNodeType {
 		Unknown = 0,

mcs/class/System/System.Net.NetworkInformation/NetworkAddressChangedEventHandler.cs

@@ -25,7 +25,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.
 //
-
 namespace System.Net.NetworkInformation {
 	public delegate void NetworkAddressChangedEventHandler (object sender, EventArgs e);
 }