[mcs] Replace NET_2_1 by MOBILE
authorLudovic Henry <ludovic@xamarin.com>
Wed, 17 Aug 2016 15:40:30 +0000 (17:40 +0200)
committerLudovic Henry <ludovic@xamarin.com>
Thu, 18 Aug 2016 14:34:36 +0000 (16:34 +0200)
NET_2_1 is also defined whenever we define MOBILE, so they have the same effect. Silverlight was 2.1 but it's been dead for a while now, and we do not even support it.

228 files changed:
mcs/build/common/AssemblyRef.cs
mcs/build/common/Consts.cs.in
mcs/class/Mono.Security/Assembly/AssemblyInfo.cs
mcs/class/Mono.Security/Mono.Security.Protocol.Tls/DebugHelper.cs
mcs/class/Mono.Security/Mono.Security.X509/X509Store.cs
mcs/class/SMDiagnostics/Assembly/AssemblyInfo.cs
mcs/class/System.Core/Assembly/AssemblyInfo.cs
mcs/class/System.Core/System.Security.Cryptography/AesTransform.cs
mcs/class/System.Core/System.Security.Cryptography/MD5Cng.cs
mcs/class/System.Core/System.Security.Cryptography/SHA1Cng.cs
mcs/class/System.Core/System.Security.Cryptography/SHA256Cng.cs
mcs/class/System.Core/System.Security.Cryptography/SHA256CryptoServiceProvider.cs
mcs/class/System.Core/System.Security.Cryptography/SHA384Cng.cs
mcs/class/System.Core/System.Security.Cryptography/SHA384CryptoServiceProvider.cs
mcs/class/System.Core/System.Security.Cryptography/SHA512Cng.cs
mcs/class/System.Core/System.Security.Cryptography/SHA512CryptoServiceProvider.cs
mcs/class/System.Core/tools/hashwrap.cs
mcs/class/System.IdentityModel/Assembly/AssemblyInfo.cs
mcs/class/System.Net/Assembly/AssemblyInfo.cs
mcs/class/System.Net/System.Net.NetworkInformation/NetworkChange_2_1.cs
mcs/class/System.Net/System.Net.NetworkInformation/NetworkInterface_2_1.cs
mcs/class/System.Net/System.Net.Policy/BaseDomainPolicy.cs
mcs/class/System.Net/System.Net.Policy/ClientAccessPolicy.cs
mcs/class/System.Net/System.Net.Policy/ClientAccessPolicyParser.cs
mcs/class/System.Net/System.Net.Policy/CrossDomainPolicyManager.cs
mcs/class/System.Net/System.Net.Policy/FlashCrossDomainPolicy.cs
mcs/class/System.Net/System.Net.Policy/FlashCrossDomainPolicyParser.cs
mcs/class/System.Net/System.Net.Policy/ICrossDomainPolicy.cs
mcs/class/System.Net/System.Net.Policy/NoAccessPolicy.cs
mcs/class/System.Net/System.Net.Policy/PolicyDownloadPolicy.cs
mcs/class/System.Net/System.Net.Policy/SiteOfOriginPolicy.cs
mcs/class/System.Net/System.Net.Sockets/AddressFamily_2_1.cs
mcs/class/System.Net/System.Net.Sockets/ProtocolType_2_1.cs
mcs/class/System.Net/System.Net.Sockets/SocketAsyncOperation_2_1.cs
mcs/class/System.Net/System.Net.Sockets/SocketType_2_1.cs
mcs/class/System.Net/System.Net.Sockets/UdpAnySourceMulticastClient.cs
mcs/class/System.Net/System.Net.Sockets/UdpSingleSourceMulticastClient.cs
mcs/class/System.Net/System.Net/HttpWebRequest_2_1.cs
mcs/class/System.Net/System.Net/HttpWebResponse_2_1.cs
mcs/class/System.Net/System.Net/WebExceptionStatus_2_1.cs
mcs/class/System.Net/System.Net/WebHeaderCollection_2_1.cs
mcs/class/System.Net/System.Net/WebRequest_2_1.cs
mcs/class/System.Net/System.Net/WebResponse_2_1.cs
mcs/class/System.Net/System.Net/WriteStreamClosedEventArgs_2_1.cs
mcs/class/System.Net/System.Net/WriteStreamClosedEventHandler_2_1.cs
mcs/class/System.Runtime.DurableInstancing/Assembly/AssemblyInfo.cs
mcs/class/System.Runtime.Serialization/Assembly/AssemblyInfo.cs
mcs/class/System.ServiceModel.Discovery/Assembly/AssemblyInfo.cs
mcs/class/System.ServiceModel.Internals/Assembly/AssemblyInfo.cs
mcs/class/System.ServiceModel.Routing/Assembly/AssemblyInfo.cs
mcs/class/System.ServiceModel.Syndication/Assembly/AssemblyInfo.cs
mcs/class/System.ServiceModel.Web.Extensions/Assembly/AssemblyInfo.cs
mcs/class/System.ServiceModel.Web/Assembly/AssemblyInfo.cs
mcs/class/System.ServiceModel.Web/System.ServiceModel.Channels/WebMessageEncoder.cs
mcs/class/System.ServiceModel.Web/System.ServiceModel.Channels/WebMessageEncodingBindingElement.cs
mcs/class/System.ServiceModel.Web/System.ServiceModel.Description/WebHttpBehavior.cs
mcs/class/System.ServiceModel.Web/System.ServiceModel.Dispatcher/WebMessageFormatter.cs
mcs/class/System.ServiceModel.Web/System.ServiceModel.Web/WebChannelFactory.cs
mcs/class/System.ServiceModel.Web/System.ServiceModel.Web/WebOperationContext.cs
mcs/class/System.ServiceModel.Web/System.ServiceModel/WebHttpBinding.cs
mcs/class/System.ServiceModel.Web/System.ServiceModel/WebHttpSecurity.cs
mcs/class/System.ServiceModel/Assembly/AssemblyInfo.cs
mcs/class/System.ServiceModel/Mono.CodeGeneration/CodeModule.cs
mcs/class/System.ServiceModel/Mono.Security.Protocol.Tls/DebugHelper.cs
mcs/class/System.ServiceModel/System.ServiceModel.Channels/BinaryMessageEncodingBindingElement.cs
mcs/class/System.ServiceModel/System.ServiceModel.Channels/Binding.cs
mcs/class/System.ServiceModel/System.ServiceModel.Channels/BindingContext.cs
mcs/class/System.ServiceModel/System.ServiceModel.Channels/BindingElement.cs
mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChannelManagerBase.cs
mcs/class/System.ServiceModel/System.ServiceModel.Channels/FaultConverter.cs
mcs/class/System.ServiceModel/System.ServiceModel.Channels/HttpRequestChannel.cs
mcs/class/System.ServiceModel/System.ServiceModel.Channels/HttpTransportBindingElement.cs
mcs/class/System.ServiceModel/System.ServiceModel.Channels/HttpsTransportBindingElement.cs
mcs/class/System.ServiceModel/System.ServiceModel.Channels/LocalClientSecuritySettings.cs
mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageBufferImpl.cs
mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageEncodingBindingElement.cs
mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageHeader.cs
mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageHeaders.cs
mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageProperties.cs
mcs/class/System.ServiceModel/System.ServiceModel.Channels/ReliableSessionBindingElement.cs
mcs/class/System.ServiceModel/System.ServiceModel.Channels/SecurityBindingElement.cs
mcs/class/System.ServiceModel/System.ServiceModel.Channels/TextMessageEncodingBindingElement.cs
mcs/class/System.ServiceModel/System.ServiceModel.Channels/TransportBindingElement.cs
mcs/class/System.ServiceModel/System.ServiceModel.Channels/TransportSecurityBindingElement.cs
mcs/class/System.ServiceModel/System.ServiceModel.Description/ClientCredentials.cs
mcs/class/System.ServiceModel/System.ServiceModel.Description/ContractDescriptionGenerator.cs
mcs/class/System.ServiceModel/System.ServiceModel.Description/DataContractSerializerOperationBehavior.cs
mcs/class/System.ServiceModel/System.ServiceModel.Description/MessagePartDescription.cs
mcs/class/System.ServiceModel/System.ServiceModel.Description/XmlSerializerOperationBehavior.cs
mcs/class/System.ServiceModel/System.ServiceModel.Diagnostics/MessageLoggingSettings.cs
mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/BaseMessagesFormatter.cs
mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ClientOperation.cs
mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ClientRuntime.cs
mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/DispatchOperation.cs
mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/DispatchRuntime.cs
mcs/class/System.ServiceModel/System.ServiceModel.Security/X509CertificateInitiatorClientCredential.cs
mcs/class/System.ServiceModel/System.ServiceModel.Security/X509CertificateRecipientClientCredential.cs
mcs/class/System.ServiceModel/System.ServiceModel/BasicHttpBinding_4_5.cs
mcs/class/System.ServiceModel/System.ServiceModel/BasicHttpsBinding.cs
mcs/class/System.ServiceModel/System.ServiceModel/ChannelFactory.cs
mcs/class/System.ServiceModel/System.ServiceModel/ClientProxyGenerator.cs
mcs/class/System.ServiceModel/System.ServiceModel/ClientRealProxy.cs
mcs/class/System.ServiceModel/System.ServiceModel/EndpointAddress.cs
mcs/class/System.ServiceModel/System.ServiceModel/EndpointAddress10.cs
mcs/class/System.ServiceModel/System.ServiceModel/EndpointAddressBuilder.cs
mcs/class/System.ServiceModel/System.ServiceModel/Logger.cs
mcs/class/System.ServiceModel/System.ServiceModel/OperationContext.cs
mcs/class/System.ServiceModel/System.ServiceModel/SilverlightClientConfigLoader.cs
mcs/class/System.ServiceModel/Test/System.ServiceModel.Channels/CommunicationObjectSyncTest.cs
mcs/class/System.XML/Assembly/AssemblyInfo.cs
mcs/class/System.XML/Makefile
mcs/class/System.XML/System.Xml.Serialization/XmlChoiceIdentifierAttribute.cs
mcs/class/System.XML/System.Xml.Serialization/XmlMemberMapping.cs
mcs/class/System.XML/System.Xml.Serialization/XmlReflectionImporter.cs
mcs/class/System.XML/System.Xml.Serialization/XmlSerializer.cs
mcs/class/System.Xaml/Assembly/AssemblyInfo.cs
mcs/class/System.Xaml/System.Xaml/TypeExtensionMethods.cs
mcs/class/System.Xml.Linq/Assembly/AssemblyInfo.cs
mcs/class/System/Assembly/AssemblyInfo.cs
mcs/class/System/System.Diagnostics/FileVersionInfo.cs
mcs/class/System/System.Diagnostics/ProcessModuleCollection.cs
mcs/class/System/System.Diagnostics/ProcessThreadCollection.cs
mcs/class/System/System.Net.Mail/MailMessage.cs
mcs/class/System/System.Net.Sockets/Socket.cs
mcs/class/System/System.Net.Sockets/SocketAsyncEventArgs.cs
mcs/class/System/System.Net/AuthenticationManager.cs
mcs/class/System/System.Net/FtpWebRequest.cs
mcs/class/System/System.Net/HttpWebRequest.cs
mcs/class/System/System.Net/ServicePointManager.cs
mcs/class/System/System/UriTypeConverter.cs
mcs/class/System/Test/System.ComponentModel/CategoryAttributeTests.cs
mcs/class/System/Test/System.Net/ServicePointManagerTest.cs
mcs/class/corlib/Assembly/AssemblyInfo.cs
mcs/class/corlib/Makefile
mcs/class/corlib/Microsoft.Win32/IRegistryApi.cs
mcs/class/corlib/Microsoft.Win32/RegistryKeyPermissionCheck.cs
mcs/class/corlib/Microsoft.Win32/UnixRegistryApi.cs
mcs/class/corlib/Microsoft.Win32/Win32RegistryApi.cs
mcs/class/corlib/Microsoft.Win32/Win32ResultCode.cs
mcs/class/corlib/System.Diagnostics/StackFrame.cs
mcs/class/corlib/System.Globalization/CultureInfo.cs
mcs/class/corlib/System.IO/Directory.cs
mcs/class/corlib/System.IO/File.cs
mcs/class/corlib/System.IO/FileStream.cs
mcs/class/corlib/System.IO/MonoIO.cs
mcs/class/corlib/System.IO/Path.cs
mcs/class/corlib/System.Reflection.Emit/AssemblyBuilder.cs
mcs/class/corlib/System.Reflection.Emit/ConstructorBuilder.cs
mcs/class/corlib/System.Reflection.Emit/MethodBuilder.cs
mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs
mcs/class/corlib/System.Reflection/Assembly.cs
mcs/class/corlib/System.Reflection/EventInfo.cs
mcs/class/corlib/System.Reflection/MonoMethod.cs
mcs/class/corlib/System.Reflection/MonoModule.cs
mcs/class/corlib/System.Reflection/MonoProperty.cs
mcs/class/corlib/System.Reflection/StrongNameKeyPair.cs
mcs/class/corlib/System.Reflection/TargetException.cs
mcs/class/corlib/System.Reflection/TargetInvocationException.cs
mcs/class/corlib/System.Reflection/TargetParameterCountException.cs
mcs/class/corlib/System.Runtime.InteropServices/_Assembly.cs
mcs/class/corlib/System.Runtime.Remoting.Activation/ActivationServices.cs
mcs/class/corlib/System.Runtime.Remoting/RemotingServices.cs
mcs/class/corlib/System.Security.Cryptography.X509Certificates/X509Certificate.cs
mcs/class/corlib/System.Security.Cryptography.X509Certificates/X509ContentType.cs
mcs/class/corlib/System.Security.Cryptography.X509Certificates/X509Helper.cs
mcs/class/corlib/System.Security.Cryptography.X509Certificates/X509KeyStorageFlags.cs
mcs/class/corlib/System.Security.Cryptography/RNGCryptoServiceProvider.cs
mcs/class/corlib/System.Security.Permissions/CodeAccessSecurityAttribute.cs
mcs/class/corlib/System.Security.Permissions/EnvironmentPermissionAttribute.cs
mcs/class/corlib/System.Security.Permissions/FileIOPermissionAttribute.cs
mcs/class/corlib/System.Security.Permissions/HostProtectionAttribute.cs
mcs/class/corlib/System.Security.Permissions/PermissionSetAttribute.cs
mcs/class/corlib/System.Security.Permissions/ReflectionPermissionAttribute.cs
mcs/class/corlib/System.Security.Permissions/SecurityAction.cs
mcs/class/corlib/System.Security.Permissions/SecurityAttribute.cs
mcs/class/corlib/System.Security.Permissions/SecurityPermissionAttribute.cs
mcs/class/corlib/System.Security.Permissions/SecurityPermissionFlag.cs
mcs/class/corlib/System.Security.Permissions/StrongNamePermissionAttribute.cs
mcs/class/corlib/System.Security.Policy/Evidence.cs
mcs/class/corlib/System.Security.Policy/Evidence_2_1.cs
mcs/class/corlib/System.Security/SecurityManager.cs
mcs/class/corlib/System.Threading/EventWaitHandle.cs
mcs/class/corlib/System.Threading/Mutex.cs
mcs/class/corlib/System/AppDomain.cs
mcs/class/corlib/System/AppDomainManager_2_1.cs
mcs/class/corlib/System/AppDomainSetup.cs
mcs/class/corlib/System/CStreamReader.cs
mcs/class/corlib/System/CStreamWriter.cs
mcs/class/corlib/System/Console.cs
mcs/class/corlib/System/ConsoleDriver.cs
mcs/class/corlib/System/Environment.cs
mcs/class/corlib/System/NullConsoleDriver.cs
mcs/class/corlib/System/Nullable.cs
mcs/class/corlib/System/TermInfoDriver.cs
mcs/class/corlib/System/TermInfoNumbers.cs
mcs/class/corlib/System/TermInfoReader.cs
mcs/class/corlib/System/TermInfoStrings.cs
mcs/class/corlib/System/TimeZoneInfo.cs
mcs/class/corlib/System/WeakReference.cs
mcs/class/corlib/System/WindowsConsoleDriver.cs
mcs/class/corlib/System/_AppDomain.cs
mcs/class/corlib/Test/System.IO.IsolatedStorage/IsolatedStorageFileTest.cs
mcs/class/corlib/Test/System.IO/FileStreamSafeHandleTest.cs
mcs/class/corlib/Test/System.Reflection.Emit/MethodBuilderTest.cs
mcs/class/corlib/Test/System.Reflection/MonoGenericClassTest.cs
mcs/class/corlib/Test/System.Reflection/ParameterInfoTest.cs
mcs/class/corlib/Test/System.Runtime.InteropServices/MarshalTest.cs
mcs/class/corlib/Test/System.Runtime.InteropServices/RuntimeEnvironmentTest.cs
mcs/class/corlib/Test/System.Security.Cryptography.X509Certificates/X509CapiTest.cs
mcs/class/corlib/Test/System.Security.Cryptography/CryptoConfigTest.cs
mcs/class/corlib/Test/System.Security.Cryptography/CryptoStreamTest.cs
mcs/class/corlib/Test/System.Security.Cryptography/DSACryptoServiceProviderTest.cs
mcs/class/corlib/Test/System.Security.Cryptography/HashAlgorithmTest.cs
mcs/class/corlib/Test/System.Security.Cryptography/PasswordDeriveBytesTest.cs
mcs/class/corlib/Test/System.Security.Cryptography/RNGCryptoServiceProviderTest.cs
mcs/class/corlib/Test/System.Security.Cryptography/RSACryptoServiceProviderTest.cs
mcs/class/corlib/Test/System.Security.Cryptography/RijndaelManagedTest.cs
mcs/class/corlib/Test/System.Security/HostSecurityManagerTest.cs
mcs/class/corlib/Test/System/EnvironmentTest.cs
mcs/mcs/class.cs
mcs/mcs/decl.cs
mcs/mcs/doc-bootstrap.cs
mcs/mcs/eval.cs
mcs/mcs/method.cs
mcs/mcs/property.cs
mcs/mcs/reflection.cs
mcs/tools/compiler-tester/compiler-tester.cs
mcs/tools/compiler-tester/xmldocdiff.cs

index a38d371845a0d89544a628389bebdc2cb7c0117d..0a4673203d5048f0edff23a20fefc49d9bdadd6c 100644 (file)
@@ -5,7 +5,7 @@ static class AssemblyRef
        internal const string System = "System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35";
 
        public const string EcmaPublicKey = "b77a5c561934e089";
-#if NET_2_1
+#if MOBILE
        public const string FrameworkPublicKeyFull = "0024000004800000940000000602000000240000525341310004000001000100B5FC90E7027F67871E773A8FDE8938C81DD402BA65B9201D60593E96C492651E889CC13F1415EBB53FAC1131AE0BD333C5EE6021672D9718EA31A8AEBD0DA0072F25D87DBA6FC90FFD598ED4DA35E44C398C454307E8E33B8426143DAEC9F596836F97C8F74750E5975C64E2189F45DEF46B2A2B1247ADC3652BF5C308055DA9";
        public const string FrameworkPublicKeyFull2 = "00240000048000009400000006020000002400005253413100040000010001008D56C76F9E8649383049F383C44BE0EC204181822A6C31CF5EB7EF486944D032188EA1D3920763712CCB12D75FB77E9811149E6148E5D32FBAAB37611C1878DDC19E20EF135D0CB2CFF2BFEC3D115810C3D9069638FE4BE215DBF795861920E5AB6F7DB2E2CEEF136AC23D5DD2BF031700AEC232F6C6B1C785B4305C123B37AB";
 #else
index 7351be92b403d5543aa0be8ccebb45a45add2842..87b005e763a2c4b30abb0dd0f05862fe49c10380 100644 (file)
@@ -39,7 +39,7 @@ static class Consts
        public const string MonoProduct = "Mono Common Language Infrastructure";
        public const string MonoCopyright = "(c) Various Mono authors";
 
-#if NET_2_1
+#if MOBILE
        // Versions of .NET Framework for Silverlight 4.0
        public const string FxVersion = "2.0.5.0";
        public const string VsVersion = "9.0.0.0"; // unused, but needed for compilation
@@ -118,7 +118,7 @@ static class Consts
        public const string AssemblyPresentationCore_4_0 = "PresentationCore, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35";
        public const string AssemblyPresentationFramework_3_5 = "PresentationFramework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35";
        public const string AssemblySystemServiceModel_3_0 = "System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089";
-#elif NET_2_1
+#elif MOBILE
        public const string AssemblySystem_Core = "System.Core, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b77a5c561934e089";
 #endif
 }
index b5bf191148e12eb7995fa6f6b1ebbddc328ce77e..3e79d28a8fe09fc504f1cba2557b16b862df859c 100644 (file)
@@ -60,7 +60,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyDelaySign (true)]
 [assembly: AssemblyKeyFile ("../mono.pub")]
 
-#if NET_2_1
+#if MOBILE
 [assembly: InternalsVisibleTo ("System, PublicKey=00240000048000009400000006020000002400005253413100040000010001008D56C76F9E8649383049F383C44BE0EC204181822A6C31CF5EB7EF486944D032188EA1D3920763712CCB12D75FB77E9811149E6148E5D32FBAAB37611C1878DDC19E20EF135D0CB2CFF2BFEC3D115810C3D9069638FE4BE215DBF795861920E5AB6F7DB2E2CEEF136AC23D5DD2BF031700AEC232F6C6B1C785B4305C123B37AB")]
 #else
 [assembly: InternalsVisibleTo ("System, PublicKey=00000000000000000400000000000000")]
index 70b25bd1d576926e397c6d3352a8ef1e8f887efd..ff122878c95b737e5b1572d85dd2aa9e29f2bd8a 100644 (file)
@@ -36,7 +36,7 @@ namespace Mono.Security.Protocol.Tls
                {
                        if (!isInitialized)
                        {
-#if !NET_2_1
+#if !MOBILE
                                Debug.Listeners.Add(new TextWriterTraceListener(Console.Out));
                                // Debug.Listeners.Add(new TextWriterTraceListener(@"c:\ssl.log"));
                                Debug.AutoFlush = true;
index 23ccc8316eb33e91380eb63a3c1a931c42ee7715..cb96ce12e4626fcb93c168b0d84a461f2b3a5a57 100644 (file)
@@ -148,7 +148,7 @@ namespace Mono.Security.X509 {
                                        ClearCertificates ();   // We have modified the store on disk.  So forget the old state.
                                }
                        }
-#if !NET_2_1
+#if !MOBILE
                        // Try to save privateKey if available..
                        CspParameters cspParams = new CspParameters ();
                        cspParams.KeyContainerName = CryptoConvert.ToHex (certificate.Hash);
@@ -279,7 +279,7 @@ namespace Mono.Security.X509 {
                {
                        byte[] data = Load (filename);
                        X509Certificate cert = new X509Certificate (data);
-#if !NET_2_1
+#if !MOBILE
                        // If privateKey it's available, load it too..
                        CspParameters cspParams = new CspParameters ();
                        cspParams.KeyContainerName = CryptoConvert.ToHex (cert.Hash);
@@ -371,7 +371,7 @@ namespace Mono.Security.X509 {
                        }
                        return list;
                }
-#if !NET_2_1
+#if !MOBILE
                private void ImportPrivateKey (X509Certificate certificate, CspParameters cspParams)
                {
                        RSACryptoServiceProvider rsaCsp = certificate.RSA as RSACryptoServiceProvider;
index 561d2fef4b2a656d5dde288fab45d8d9ca8cdd83..ce13a3687709430312c06b3db0079f700f1d80b5 100644 (file)
@@ -40,7 +40,7 @@ using System.Runtime.InteropServices;
 [assembly: NeutralResourcesLanguage ("en-US")]
 [assembly: CLSCompliant (true)]
 [assembly: AssemblyDelaySign (true)]
-#if NET_2_1
+#if MOBILE
 [assembly: AssemblyKeyFile ("../winfx.pub")]
 #else
 [assembly: AssemblyKeyFile ("../ecma.pub")]
index aa3a0e53cccccec171e0c8e6eeba6e971f605886..c4ab9f0d23af8c11ac3f09211981388aeda4118e 100644 (file)
@@ -52,7 +52,7 @@ using System.Runtime.InteropServices;
 [assembly: NeutralResourcesLanguage ("en-US")]
 [assembly: CLSCompliant (true)]
 [assembly: AssemblyDelaySign (true)]
-#if NET_2_1
+#if MOBILE
        // attributes specific to FX 3.5
        [assembly: AssemblyKeyFile ("../silverlight.pub")]
 #else
index b9700de921e1c062d5f52bc77c22986ee61149aa..9e7d82c176b80df23e92be00d6b3249996a3202e 100644 (file)
@@ -99,7 +99,7 @@ namespace System.Security.Cryptography {
                                exKey [i] = exKey [i-Nk] ^ temp;
                        }
 
-#if NET_2_1
+#if MOBILE
                        // Silverlight 2.0 only supports CBC
                        if (!encryption) {
 #else
index 9a6920efe174229b019e79590659daa2b158ebd5..0e3658c5c12486ed181c527de817734742aae1a1 100644 (file)
@@ -29,7 +29,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if !NET_2_1
+#if !MOBILE
 
 namespace System.Security.Cryptography {
 
index 45d4ab55ea39f86d412d9e8574ded1ab5a154275..95d1034aa31586ee64aaaadf34be43b8dbc3a01f 100644 (file)
@@ -29,7 +29,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if !NET_2_1
+#if !MOBILE
 
 namespace System.Security.Cryptography {
 
index 347683170e0fe5ef7eaba8bad27a9b8b01077617..772b81faabf772b16bc70e14dd62d1cd45250f66 100644 (file)
@@ -29,7 +29,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if !NET_2_1
+#if !MOBILE
 
 namespace System.Security.Cryptography {
 
index ac1016d726572f65037145c343a64bd39016ea22..9012c58b2167cd1607cbf267db3783e60fa53b89 100644 (file)
@@ -29,7 +29,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if !NET_2_1
+#if !MOBILE
 
 namespace System.Security.Cryptography {
 
index bbcdde1ffa737fc9abfbf30217a35bdbdde853d1..b573aad961e66e3f8e77a50ffd19ba6a45e5da82 100644 (file)
@@ -29,7 +29,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if !NET_2_1
+#if !MOBILE
 
 namespace System.Security.Cryptography {
 
index 43d8e0921afcee31901a4122ade038078ec2e074..af0abc744bf3592cdb588aa88a027486cfdb897f 100644 (file)
@@ -29,7 +29,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if !NET_2_1
+#if !MOBILE
 
 namespace System.Security.Cryptography {
 
index 5bcdcc29982204f552ad2d8da2cc6474e53f1dbe..bf5689ecb392c5352a5c42c586f8ed88abe4e7ed 100644 (file)
@@ -29,7 +29,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if !NET_2_1
+#if !MOBILE
 
 namespace System.Security.Cryptography {
 
index ed8dabec1750554e723dd42c6d70996366a66e1d..9425a94e0c0361a6a85506891b4abd1ab39002d7 100644 (file)
@@ -29,7 +29,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if !NET_2_1
+#if !MOBILE
 
 namespace System.Security.Cryptography {
 
index cc22c959c4e55300d9ec3a7be30b42c424b30947..e80e209fe74e67d3b058e13e2ed833d3b4474113 100644 (file)
@@ -62,7 +62,7 @@ class Program {
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if !NET_2_1
+#if !MOBILE
 
 namespace System.Security.Cryptography {
 
index 05426acf59fa26a02389725838c1db7926f7c226..4c70c66dfd6b98fd9243afc32aa69c0305e8c2ee 100644 (file)
@@ -61,6 +61,6 @@ using System.Runtime.InteropServices;
 [assembly: ComCompatibleVersion (1, 0, 3300, 0)]
 [assembly: AllowPartiallyTrustedCallers]
 
-#if !NET_2_1
+#if !MOBILE
 [assembly: SecurityCritical (SecurityCriticalScope.Explicit)]
 #endif
\ No newline at end of file
index 249f6ebf8f6b561c09b00998194bddeaefe6526c..600e5eb6c6c1f16ba6fbbc9e100e52e2b8f4eb7e 100644 (file)
@@ -54,7 +54,7 @@ using System.Runtime.InteropServices;
 [assembly: NeutralResourcesLanguage ("en-US")]
 [assembly: CLSCompliant (true)]
 [assembly: AssemblyDelaySign (true)]
-#if NET_2_1
+#if MOBILE
        [assembly: AssemblyKeyFile ("../silverlight.pub")]
        [assembly: InternalsVisibleTo ("System.Windows, PublicKey=00240000048000009400000006020000002400005253413100040000010001008D56C76F9E8649383049F383C44BE0EC204181822A6C31CF5EB7EF486944D032188EA1D3920763712CCB12D75FB77E9811149E6148E5D32FBAAB37611C1878DDC19E20EF135D0CB2CFF2BFEC3D115810C3D9069638FE4BE215DBF795861920E5AB6F7DB2E2CEEF136AC23D5DD2BF031700AEC232F6C6B1C785B4305C123B37AB")]
        [assembly: InternalsVisibleTo ("System.Windows.Browser, PublicKey=00240000048000009400000006020000002400005253413100040000010001008D56C76F9E8649383049F383C44BE0EC204181822A6C31CF5EB7EF486944D032188EA1D3920763712CCB12D75FB77E9811149E6148E5D32FBAAB37611C1878DDC19E20EF135D0CB2CFF2BFEC3D115810C3D9069638FE4BE215DBF795861920E5AB6F7DB2E2CEEF136AC23D5DD2BF031700AEC232F6C6B1C785B4305C123B37AB")]
index 3ec3f7dce028c2530f288238c0d3cd873983eec9..5cdf15f1db97b99fe82d0cce1dc85d7c75c2bc0d 100644 (file)
@@ -25,7 +25,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_2_1
+#if MOBILE
 using System.Runtime.InteropServices;
 
 namespace System.Net.NetworkInformation {
index 4d68350ebaf7ad63b5c06eaa4d05a2b5082b5b50..cafd9ed86e01086103657539975cca73e885f462 100644 (file)
@@ -30,7 +30,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_1
+#if MOBILE
 
 namespace System.Net.NetworkInformation {
 
index ed40418052c502b18550f3834addb8f57d806b40..16089b5c933a83871d210cca6aadf82cdba03b3b 100644 (file)
@@ -27,7 +27,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_1
+#if MOBILE
 
 using System;
 using System.Collections.Generic;
index ab6af6c6d3ada59fd36d1b9fcca7f18fd15e63e1..bd136e29803db01409060ec897905d160b60fd2d 100644 (file)
@@ -27,7 +27,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_1
+#if MOBILE
 
 using System;
 using System.Collections.Generic;
index 78308a96b699e539baf78ee4126fdcde484f35b5..91c45e58801ceb3fc61134893fb0cbd2fdb3edbd 100644 (file)
@@ -27,7 +27,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_1
+#if MOBILE
 
 using System;
 using System.Collections.Generic;
index 0319404caf65549ab6f202948287bb6fd7253bd8..82ac9f93cae12f71c89046031aa66374d527d9e0 100644 (file)
@@ -27,7 +27,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_1
+#if MOBILE
 
 using System;
 using System.Collections.Generic;
index 0ed9107e46756d4e6d67cdc0247596d5d6ffa3f1..4bb8ffa3ff648022c3a20fe86ca3a77578f9bfbb 100644 (file)
@@ -27,7 +27,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_1
+#if MOBILE
 
 using System;
 using System.Collections.Generic;
index b3157df2a1c7ef48208b3f497f0ab87231d5baf4..c546e9d971a5489d5de03d9bcdfda6ec730d14cb 100644 (file)
@@ -27,7 +27,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_1
+#if MOBILE
 
 using System;
 using System.Collections.Generic;
index 6a376685c15b84080ef61496a90743f5cb3eddf4..a580fdd1bba59498d40b927da68911142834d91b 100644 (file)
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_1
+#if MOBILE
 
 namespace System.Net.Policy {
 
index 8d51d8361baa26ef177a09271249f5b451e65cf7..d15e57dd103ce5d962ace32129ad001e74062e6b 100644 (file)
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_1
+#if MOBILE
 
 using System.Security;
 
index 797d4d9f7a43c63519a0cff6656e013e87c07309..1114d7ec05540969d8a350492cb7a159ec4ab5e4 100644 (file)
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_1
+#if MOBILE
 
 namespace System.Net.Policy {
 
index 9b2ca1f4b71e759c8d424fa3f8ad1448e3249417..8b17bcad1f0fa06addb095554569d4a23f252f10 100644 (file)
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_1
+#if MOBILE
 
 namespace System.Net.Policy {
 
index 0b9bb2b479da6f1fdafa002439d38356b4bf8dbe..597109b3bb5d40036e11749fe8ab9e61b361c93d 100644 (file)
@@ -20,7 +20,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_1
+#if MOBILE
 
 namespace System.Net.Sockets {
 
index d806f72367171d3e9588009d0d4194aa4514925d..06a814a5fd088ea14263883aba346402774a5d0f 100644 (file)
@@ -20,7 +20,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_1
+#if MOBILE
 
 namespace System.Net.Sockets {
 
index 1260c7add6cb87c820774ee13eb7e6c99d6deb75..475742b1bdf09412395512e58d88a425fabd28b6 100644 (file)
@@ -27,7 +27,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_1
+#if MOBILE
 namespace System.Net.Sockets {
        public enum SocketAsyncOperation {
                None,
index 5e76dd9f61c65ed697f89f69b93b3e2a66386b35..c1d7c3b1da40b08db4de2fb9d24b2c58cfb954f3 100644 (file)
@@ -20,7 +20,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_1
+#if MOBILE
 
 namespace System.Net.Sockets {
 
index d44f7be28a627763913bde5cda30575dcd0038e3..a56c4db6b4bf2a8d99e8c1620d890d3101f23a9b 100644 (file)
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_1
+#if MOBILE
 
 namespace System.Net.Sockets {
 
index c33c24f37947949cf4c6b8532894c709e8c350f9..e84762a7f31dc7ccc7f7c6d76813b7ba1dba59b5 100644 (file)
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_1
+#if MOBILE
 
 namespace System.Net.Sockets {
 
index 69001b5d89bae14753ac7515b3cc462db6477661..fecd786e7fb9d2bdb27bc068534e9c05682177c5 100644 (file)
@@ -29,7 +29,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_1
+#if MOBILE
 
 using System.IO;
 
index d26af21025023478d58626d169e8921651806e6d..a461f3029f4f31250d5ca3271080e984eb26acc4 100644 (file)
@@ -29,7 +29,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_1
+#if MOBILE
 
 namespace System.Net {
 
index 4af48941bf0f47da3c3eae2a3112f4ea1dd2178c..b6b8739f86db823f103f1f3fadcb53486087db90 100644 (file)
@@ -27,7 +27,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_1
+#if MOBILE
 
 namespace System.Net {
        public enum WebExceptionStatus {
index 16a0d38b7ebe327eac46f04d1f674b7eaeb0c6d3..aa865bc077b1c508af843beaae9395d062c7992b 100644 (file)
@@ -33,7 +33,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_1
+#if MOBILE
 
 using System;
 using System.Collections;
index 128708d31d622f189c61409f3c80d054d19fca6b..bc8d445c5d216b29de4ec12e7836525c533b9d72 100644 (file)
@@ -29,7 +29,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_1
+#if MOBILE
 
 using System.Collections.Generic;
 using System.IO;
index 495069b64cb8c5b892a269fbdc9d3060010510a0..1f991db627614cbf3441791eeba8df0303d83164 100644 (file)
@@ -28,7 +28,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_1
+#if MOBILE
 
 using System.IO;
 
index 049d93922591acd2bac4343a8a5fbec5224f4727..51ad85c2e06292901dcb9e1334bc3d46193f5c69 100644 (file)
@@ -28,7 +28,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_1
+#if MOBILE
 
 using System.ComponentModel;
 using System.IO;
index b901c07142f7f347995bd7e3ac07fc6eb4d6cc3c..26e4dbc454b115e361b087421c96dd34f227e61e 100644 (file)
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_1
+#if MOBILE
 
 namespace System.Net
 {
index 72f0502653ff20a5fbdbc762065705a8df2670fc..edeecbe4e5c1be47790c2b1240bd3a83eaba3be9 100644 (file)
@@ -55,7 +55,7 @@ using System.Runtime.InteropServices;
 [assembly: NeutralResourcesLanguage ("en-US")]
 [assembly: CLSCompliant (true)]
 [assembly: AssemblyDelaySign (true)]
-#if NET_2_1
+#if MOBILE
 [assembly: AssemblyKeyFile ("../silverlight.pub")]
 #else
 [assembly: AssemblyKeyFile ("../winfx.pub")]
index bc2dc31dae842ba60fd7dfa13f9dfd37961030fd..5995195a22e3cde5b56578d389fda76f64c180f4 100644 (file)
@@ -55,7 +55,7 @@ using System.Runtime.InteropServices;
 [assembly: NeutralResourcesLanguage ("en-US")]
 [assembly: CLSCompliant (true)]
 [assembly: AssemblyDelaySign (true)]
-#if NET_2_1
+#if MOBILE
 [assembly: AssemblyKeyFile ("../silverlight.pub")]
 #else
 [assembly: AssemblyKeyFile ("../ecma.pub")]
index f8ff5c399cfdd252f14eb773c177ad9a819830eb..6a9d85f5c70431892b5bf30138af2f4514ab0cd6 100644 (file)
@@ -54,7 +54,7 @@ using System.Runtime.InteropServices;
 [assembly: ComVisible (false)]
 
 [assembly: AssemblyDelaySign (true)]
-#if NET_2_1
+#if MOBILE
 [assembly: AssemblyKeyFile ("../silverlight.pub")]
 #else
 [assembly: AssemblyKeyFile("../winfx.pub")]
index 80b1075ba774d6f04c853e2082f415cc14e0a7e7..a9f41b5c7f9eeaea9d00e09803c5b7a9dbf8e2b2 100644 (file)
@@ -40,7 +40,7 @@ using System.Runtime.InteropServices;
 [assembly: NeutralResourcesLanguage ("en-US")]
 [assembly: CLSCompliant (true)]
 [assembly: AssemblyDelaySign (true)]
-#if NET_2_1
+#if MOBILE
 [assembly: AssemblyKeyFile ("../winfx.pub")]
 #else
 [assembly: AssemblyKeyFile ("../ecma.pub")]
index 6dd4a866226374c44866bffddf2b0dd0f236fc69..0202afecb934074fa0089ed2b77ef53d7d4596cf 100644 (file)
@@ -54,7 +54,7 @@ using System.Runtime.InteropServices;
 [assembly: ComVisible (false)]
 
 [assembly: AssemblyDelaySign (true)]
-#if NET_2_1
+#if MOBILE
 [assembly: AssemblyKeyFile ("../silverlight.pub")]
 #else
 [assembly: AssemblyKeyFile("../winfx.pub")]
index c7c676fb7bf0b8905edd3e77e394f70968a71d55..f9e112c54ebb0caabc2ef36f7557f15eec4da5d0 100644 (file)
@@ -54,7 +54,7 @@ using System.Runtime.InteropServices;
 [assembly: NeutralResourcesLanguage ("en-US")]
 [assembly: CLSCompliant (true)]
 [assembly: AssemblyDelaySign (true)]
-#if NET_2_1
+#if MOBILE
 [assembly: AssemblyKeyFile ("../silverlight.pub")]
 #else
 [assembly: AssemblyKeyFile ("../ecma.pub")]
index 0bd1bd0e04faacdd2557954259abd096179a98e1..fc271094cd0a3ead95b072186f788d40a4b48c06 100644 (file)
@@ -54,7 +54,7 @@ using System.Runtime.InteropServices;
 [assembly: NeutralResourcesLanguage ("en-US")]
 [assembly: CLSCompliant (true)]
 [assembly: AssemblyDelaySign (true)]
-#if NET_2_1
+#if MOBILE
 [assembly: AssemblyKeyFile ("../silverlight.pub")]
 #else
 [assembly: AssemblyKeyFile ("../silverlight.pub")] // easing InternalVisibleTo use.
index a974b19de94aceb0878e5db698031a2121f5914f..2e2baf595ce49623904ffc7704e814c7b510d39c 100644 (file)
@@ -53,7 +53,7 @@ using System.Runtime.InteropServices;
 [assembly: ComVisible (false)]
 
 [assembly: AssemblyDelaySign (true)]
-#if NET_2_1
+#if MOBILE
 [assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
 [assembly: AssemblyKeyFile ("../silverlight.pub")]
 #else
@@ -61,7 +61,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyKeyFile("../winfx.pub")]
 #endif
 
-#if NET_2_1
+#if MOBILE
 [assembly: InternalsVisibleTo ("System.Json, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
 [assembly: InternalsVisibleTo ("System.ServiceModel.Web.Extensions, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
 [assembly: InternalsVisibleTo ("System.Windows.Browser, PublicKey=00240000048000009400000006020000002400005253413100040000010001008D56C76F9E8649383049F383C44BE0EC204181822A6C31CF5EB7EF486944D032188EA1D3920763712CCB12D75FB77E9811149E6148E5D32FBAAB37611C1878DDC19E20EF135D0CB2CFF2BFEC3D115810C3D9069638FE4BE215DBF795861920E5AB6F7DB2E2CEEF136AC23D5DD2BF031700AEC232F6C6B1C785B4305C123B37AB")]
index b438b10968481216020eb087dce8d5b0e6b6a0f6..0cf2bc5778b114f4863056bc7e8961701aef14bf 100644 (file)
@@ -47,7 +47,7 @@ namespace System.ServiceModel.Channels
                }
 
                public override string ContentType {
-#if NET_2_1
+#if MOBILE
                        get { return MediaType; }
 #else
                        get { return MediaType + "; charset=" + source.WriteEncoding.HeaderName; }
@@ -114,7 +114,7 @@ namespace System.ServiceModel.Channels
                                break;
                        case WebContentFormat.Json:
                                // FIXME: is it safe/unsafe/required to keep XmlReader open?
-#if NET_2_1
+#if MOBILE
                                msg = Message.CreateMessage (MessageVersion.None, null, JsonReaderWriterFactory.CreateJsonReader (stream, source.ReaderQuotas));
 #else
                                msg = Message.CreateMessage (MessageVersion.None, null, JsonReaderWriterFactory.CreateJsonReader (stream, enc, source.ReaderQuotas, null));
@@ -174,7 +174,7 @@ namespace System.ServiceModel.Channels
 
                        switch (GetContentFormat (message)) {
                        case WebContentFormat.Xml:
-#if NET_2_1
+#if MOBILE
                                using (XmlWriter w = XmlDictionaryWriter.CreateDictionaryWriter (XmlWriter.Create (new StreamWriter (stream, source.WriteEncoding))))
                                        message.WriteMessage (w);
 #else
index 3049f2901e31c1f6a2f0ecb322ac6ad03aab9507..c6a0b107553529843667fcbb3348a985ec104b3b 100644 (file)
@@ -34,7 +34,7 @@ using System.Xml;
 namespace System.ServiceModel.Channels
 {
        public sealed class WebMessageEncodingBindingElement
-#if NET_2_1
+#if MOBILE
                : MessageEncodingBindingElement
 #else
                : MessageEncodingBindingElement, IWsdlExportExtension
@@ -109,7 +109,7 @@ namespace System.ServiceModel.Channels
                        return base.BuildChannelFactory<TChannel> (context);
                }
 
-#if !NET_2_1
+#if !MOBILE
                [MonoTODO ("Why is it overriden?")]
                public override bool CanBuildChannelListener<TChannel> (BindingContext context)
                {
@@ -146,7 +146,7 @@ namespace System.ServiceModel.Channels
                        return context.GetInnerProperty<T> ();
                }
 
-#if !NET_2_1 && !XAMMAC_4_5
+#if !MOBILE && !XAMMAC_4_5
                [MonoTODO]
                void IWsdlExportExtension.ExportContract (WsdlExporter exporter, WsdlContractConversionContext context)
                {
index d207385c97ee641f880e4d251c7e95e60a0ebb27..dc8915ff76d1f6306769e1dd71493a2572f6c076 100644 (file)
@@ -84,7 +84,7 @@ namespace System.ServiceModel.Description
                        // clientRuntime.MessageInspectors.Add (something);
                }
 
-#if !NET_2_1 && !XAMMAC_4_5
+#if !MOBILE && !XAMMAC_4_5
                protected virtual void AddServerErrorHandlers (ServiceEndpoint endpoint, EndpointDispatcher endpointDispatcher)
                {
                        endpointDispatcher.ChannelDispatcher.ErrorHandlers.Add (new WebHttpErrorHandler ());
@@ -103,7 +103,7 @@ namespace System.ServiceModel.Description
 
                public virtual void ApplyDispatchBehavior (ServiceEndpoint endpoint, EndpointDispatcher endpointDispatcher)
                {
-#if NET_2_1 || XAMMAC_4_5
+#if MOBILE || XAMMAC_4_5
                        throw new NotImplementedException ();
 #else
                        endpointDispatcher.DispatchRuntime.OperationSelector = GetOperationSelector (endpoint);
@@ -146,7 +146,7 @@ namespace System.ServiceModel.Description
                        }
                }
 
-#if !NET_2_1 && !XAMMAC_4_5
+#if !MOBILE && !XAMMAC_4_5
                internal class DispatchPairFormatter : IDispatchMessageFormatter
                {
                        public DispatchPairFormatter (IDispatchMessageFormatter request, IDispatchMessageFormatter reply)
@@ -185,7 +185,7 @@ namespace System.ServiceModel.Description
                        return new WebMessageFormatter.ReplyClientFormatter (operationDescription, endpoint, GetQueryStringConverter (operationDescription), this);
                }
 
-#if !NET_2_1
+#if !MOBILE
                protected virtual IDispatchMessageFormatter GetReplyDispatchFormatter (OperationDescription operationDescription, ServiceEndpoint endpoint)
                {
                        return new WebMessageFormatter.ReplyDispatchFormatter (operationDescription, endpoint, GetQueryStringConverter (operationDescription), this);
@@ -197,7 +197,7 @@ namespace System.ServiceModel.Description
                        return new WebMessageFormatter.RequestClientFormatter (operationDescription, endpoint, GetQueryStringConverter (operationDescription), this);
                }
 
-#if !NET_2_1
+#if !MOBILE
                protected virtual IDispatchMessageFormatter GetRequestDispatchFormatter (OperationDescription operationDescription, ServiceEndpoint endpoint)
                {
                        return new WebMessageFormatter.RequestDispatchFormatter (operationDescription, endpoint, GetQueryStringConverter (operationDescription), this);
@@ -287,7 +287,7 @@ namespace System.ServiceModel.Description
                                throw new InvalidOperationException ("ManualAddressing in the transport binding element in the binding must be true for WebHttpBehavior");
                }
 
-#if !NET_2_1
+#if !MOBILE
                internal class WebHttpErrorHandler : IErrorHandler
                {
                        public void ProvideFault (Exception error, MessageVersion version, ref Message fault)
index 6fb3b86590393c340b967a78401b5bee91c3b58e..aa1590759986e05d47cf1d741a2aa2d027a522c5 100644 (file)
@@ -41,7 +41,7 @@ using System.ServiceModel.Web;
 using System.Text;
 using System.Xml;
 
-#if NET_2_1
+#if MOBILE
 using XmlObjectSerializer = System.Object;
 #endif
 
@@ -81,7 +81,7 @@ namespace System.ServiceModel.Dispatcher
                        this.converter = converter;
                        this.behavior = behavior;
                        ApplyWebAttribute ();
-#if !NET_2_1
+#if !MOBILE
                        // This is a hack for WebScriptEnablingBehavior
                        var jqc = converter as JsonQueryStringConverter;
                        if (jqc != null)
@@ -248,7 +248,7 @@ namespace System.ServiceModel.Dispatcher
                
                protected object ReadObjectBody (XmlObjectSerializer serializer, XmlReader reader)
                {
-#if NET_2_1
+#if MOBILE
                        return (serializer is DataContractJsonSerializer) ?
                                ((DataContractJsonSerializer) serializer).ReadObject (reader) :
                                ((DataContractSerializer) serializer).ReadObject (reader, true);
@@ -283,7 +283,7 @@ namespace System.ServiceModel.Dispatcher
                        }
                }
 
-#if !NET_2_1
+#if !MOBILE
                internal class RequestDispatchFormatter : WebDispatchMessageFormatter
                {
                        public RequestDispatchFormatter (OperationDescription operation, ServiceEndpoint endpoint, QueryStringConverter converter, WebHttpBehavior behavior)
@@ -363,7 +363,7 @@ namespace System.ServiceModel.Dispatcher
                                // FIXME: get encoding from somewhere
                                hp.Headers ["Content-Type"] = mediaType + "; charset=utf-8";
 
-#if !NET_2_1
+#if !MOBILE
                                if (WebOperationContext.Current != null)
                                        WebOperationContext.Current.OutgoingRequest.Apply (hp);
 #endif
@@ -382,7 +382,7 @@ namespace System.ServiceModel.Dispatcher
                                        throw new ArgumentNullException ("parameters");
                                CheckMessageVersion (message.Version);
 
-#if !NET_2_1
+#if !MOBILE
                                if (OperationContext.Current != null) {
                                        // Set response in the context
                                        OperationContext.Current.IncomingMessage = message;
@@ -423,7 +423,7 @@ namespace System.ServiceModel.Dispatcher
                        object value;
                        XmlObjectSerializer serializer;
 
-#if !NET_2_1
+#if !MOBILE
                        protected override BodyWriter OnCreateBufferedCopy (int maxBufferSize)
                        {
                                return new WrappedBodyWriter (value, serializer, name, ns, fmt);
@@ -473,7 +473,7 @@ namespace System.ServiceModel.Dispatcher
                        void WriteObject (XmlObjectSerializer serializer, XmlDictionaryWriter writer, object value)
                        {
                                if (serializer != null){
-#if NET_2_1
+#if MOBILE
                                        if (serializer is DataContractJsonSerializer)
                                                ((DataContractJsonSerializer) serializer).WriteObject (writer, value);
                                        else
@@ -485,7 +485,7 @@ namespace System.ServiceModel.Dispatcher
                        }
                }
 
-#if !NET_2_1
+#if !MOBILE
                internal abstract class WebDispatchMessageFormatter : WebMessageFormatter, IDispatchMessageFormatter
                {
                        protected WebDispatchMessageFormatter (OperationDescription operation, ServiceEndpoint endpoint, QueryStringConverter converter, WebHttpBehavior behavior)
index bee02209a1a5c5276bdb1a39aa6345e290278448..4a5289dd51f235ed5f8067c560a1b46c627893f0 100644 (file)
@@ -39,7 +39,7 @@ namespace System.ServiceModel.Web
 {
        public class WebChannelFactory<TChannel> : ChannelFactory<TChannel>
        {
-#if !NET_2_1
+#if !MOBILE
                public WebChannelFactory ()
                        : base ()
                {
@@ -84,7 +84,7 @@ namespace System.ServiceModel.Web
 
                protected override void OnOpening ()
                {
-#if !NET_2_1
+#if !MOBILE
                        if (Endpoint.Behaviors.Find<WebHttpBehavior> () == null)
                                Endpoint.Behaviors.Add (new WebHttpBehavior ());
 #endif
index dfec47afe0e33b33c401216448ee906143664340..a372b24c6b696e9bc809f0f58a9f5312092f6666 100644 (file)
@@ -31,7 +31,7 @@ using System.ServiceModel;
 using System.ServiceModel.Channels;
 using System.ServiceModel.Description;
 
-#if NET_2_1 // Note that moonlight System.ServiceModel.Web.dll does not contain this class.
+#if MOBILE // Note that moonlight System.ServiceModel.Web.dll does not contain this class.
 using IncomingWebRequestContext = System.Object;
 using OutgoingWebResponseContext = System.Object;
 #else
@@ -44,11 +44,11 @@ using System.Xml.Serialization;
 namespace System.ServiceModel.Web
 {
        public class WebOperationContext
-#if !NET_2_1
+#if !MOBILE
         : IExtension<OperationContext>
 #endif
        {
-#if !NET_2_1
+#if !MOBILE
                public static WebOperationContext Current {
                        get {
                                if (OperationContext.Current == null)
@@ -75,13 +75,13 @@ namespace System.ServiceModel.Web
 
                        outgoing_request = new OutgoingWebRequestContext ();
                        incoming_response = new IncomingWebResponseContext (operation);
-#if !NET_2_1
+#if !MOBILE
                        incoming_request = new IncomingWebRequestContext (operation);
                        outgoing_response = new OutgoingWebResponseContext ();
 #endif
                }
 
-#if !NET_2_1
+#if !MOBILE
                public IncomingWebRequestContext IncomingRequest {
                        get { return incoming_request; }
                }
@@ -95,7 +95,7 @@ namespace System.ServiceModel.Web
                        get { return outgoing_request; }
                }
 
-#if !NET_2_1
+#if !MOBILE
                public OutgoingWebResponseContext OutgoingResponse {
                        get { return outgoing_response; }
                }
index 8eee88bb876ad8387abadae15f001784359e2f8f..a182f4f51925f62060168b98897b55e0ee087950 100644 (file)
@@ -31,7 +31,7 @@ using System.Linq;
 using System.ServiceModel.Channels;
 using System.Text;
 using System.Xml;
-#if !NET_2_1
+#if !MOBILE
 using System.Configuration;
 using System.ServiceModel.Configuration;
 #endif
@@ -52,7 +52,7 @@ namespace System.ServiceModel
 
                public WebHttpBinding (string configurationName)
                {
-#if !NET_2_1 && !XAMMAC_4_5
+#if !MOBILE && !XAMMAC_4_5
                        BindingsSection bindingsSection = ConfigUtil.BindingsSection;
                        WebHttpBindingElement el = (WebHttpBindingElement) bindingsSection ["webHttpBinding"].ConfiguredBindings.FirstOrDefault (c => c.Name == configurationName);
                        if (el != null) {
@@ -88,7 +88,7 @@ namespace System.ServiceModel
                        get { return EnvelopeVersion.None; }
                }
 
-#if !NET_2_1 && !XAMMAC_4_5
+#if !MOBILE && !XAMMAC_4_5
                [DefaultValue (false)]
                public bool AllowCookies {
                        get { return t.AllowCookies; }
index 4effb2e71a7d4f5a51c0e0c0de63122986f7c1e0..b7aefe52dfda3232ca9258fa9d0cd3d8402ebc47 100644 (file)
@@ -34,7 +34,7 @@ namespace System.ServiceModel
                public WebHttpSecurity ()
                {
                        // there is no public constructor for transport ...
-#if !NET_2_1
+#if !MOBILE
                        Transport = new BasicHttpBinding ().Security.Transport;
 #endif
                }
index c13a103d20ad7ccd09b8e50ca1cf87b70b6bcc9d..4f5776d2736f6c31b7b643c8b1daf42222dee08b 100644 (file)
@@ -54,7 +54,7 @@ using System.Runtime.InteropServices;
 [assembly: NeutralResourcesLanguage ("en-US")]
 [assembly: CLSCompliant (true)]
 [assembly: AssemblyDelaySign (true)]
-#if NET_2_1
+#if MOBILE
 [assembly: AssemblyKeyFile ("../winfx.pub")]
 #else
 [assembly: AssemblyKeyFile ("../ecma.pub")]
@@ -65,11 +65,11 @@ using System.Runtime.InteropServices;
 
 [assembly: ComVisible (false)]
 
-#if NET_2_1
+#if MOBILE
 //[assembly: InternalsVisibleTo ("System.Xml.Serialization, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
 #endif
 
-#if !NET_2_1
+#if !MOBILE
 [assembly: InternalsVisibleTo ("System.ServiceModel.Web, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
 [assembly: InternalsVisibleTo ("System.ServiceModel.Routing, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
 [assembly: InternalsVisibleTo ("System.ServiceModel.Discovery, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")] // AnnouncementChannelEndpointElementCollection requires it.
index ff8251f18158475d04de5c4707eb0a6fa5a389de..f7031432d8506a14aa4f6bf95de0773c2eccc7c3 100644 (file)
@@ -40,7 +40,7 @@ namespace Mono.CodeGeneration
                        AppDomain myDomain = System.Threading.Thread.GetDomain();
                        AssemblyName myAsmName = new AssemblyName();
                        myAsmName.Name = name;
-#if NET_2_1
+#if MOBILE
                        AssemblyBuilder myAsmBuilder = myDomain.DefineDynamicAssembly (myAsmName, AssemblyBuilderAccess.Run);
 #else
                        AssemblyBuilder myAsmBuilder = myDomain.DefineDynamicAssembly (myAsmName, AssemblyBuilderAccess.RunAndSave);
index 70b25bd1d576926e397c6d3352a8ef1e8f887efd..ff122878c95b737e5b1572d85dd2aa9e29f2bd8a 100644 (file)
@@ -36,7 +36,7 @@ namespace Mono.Security.Protocol.Tls
                {
                        if (!isInitialized)
                        {
-#if !NET_2_1
+#if !MOBILE
                                Debug.Listeners.Add(new TextWriterTraceListener(Console.Out));
                                // Debug.Listeners.Add(new TextWriterTraceListener(@"c:\ssl.log"));
                                Debug.AutoFlush = true;
index 32ab72a9cb95ff67528d99e30d3e5f63914f4492..b89e21a55270c212a238d1c8c3e633cb2008c31c 100644 (file)
@@ -94,7 +94,7 @@ namespace System.ServiceModel.Channels
                        return base.BuildChannelFactory<TChannel> (context);
                }
 
-#if !NET_2_1
+#if !MOBILE
                public override IChannelListener<TChannel> BuildChannelListener<TChannel> (
                        BindingContext context)
                {
@@ -131,7 +131,7 @@ namespace System.ServiceModel.Channels
                        return new BinaryMessageEncoderFactory (this);
                }
 
-#if !NET_2_1 && !XAMMAC_4_5
+#if !MOBILE && !XAMMAC_4_5
                [MonoTODO]
                void IWsdlExportExtension.ExportContract (WsdlExporter exporter,
                        WsdlContractConversionContext context)
index 12c8ed6af07bc806a0a4a1afdcd05d202fe7adeb..9e66babb71aff4f93a2a183a089baa7ec2dba92f 100644 (file)
@@ -133,7 +133,7 @@ namespace System.ServiceModel.Channels
                        return CreateContext (parameters).BuildInnerChannelFactory<TChannel> ();
                }
 
-#if !NET_2_1
+#if !MOBILE
                public virtual IChannelListener<TChannel>
                        BuildChannelListener<TChannel> (
                        Uri listenUriBaseAddress,
@@ -267,7 +267,7 @@ namespace System.ServiceModel.Channels
                        return CreateContext (parameters).CanBuildInnerChannelFactory<TChannel> ();
                }
 
-#if !NET_2_1
+#if !MOBILE
                public bool CanBuildChannelListener<TChannel> (
                        params object [] parameters)
                        where TChannel : class, IChannel
index ad0742ce8de18c2ccdd27831f53e9bf0b8b4aa36..06e682748d36104e694baf03bf8a44aa6604e1d5 100644 (file)
@@ -149,7 +149,7 @@ namespace System.ServiceModel.Channels
                        return ctx.DequeueBindingElement ().BuildChannelFactory<TChannel> (ctx);
                }
 
-#if !NET_2_1
+#if !MOBILE
                public IChannelListener<TChannel>
                        BuildInnerChannelListener<TChannel> ()
                        where TChannel : class, IChannel
@@ -168,7 +168,7 @@ namespace System.ServiceModel.Channels
                        return ctx.DequeueBindingElement ().CanBuildChannelFactory<TChannel> (ctx);
                }
 
-#if !NET_2_1
+#if !MOBILE
                public bool CanBuildInnerChannelListener<TChannel> ()
                        where TChannel : class, IChannel
                {
index d7bd810a4f6d7d6a2aaf409560fe12c35843f94a..a41eb6ed6deda42ab106de8c342b7cfb121d31df 100644 (file)
@@ -52,7 +52,7 @@ namespace System.ServiceModel.Channels
                        return context.BuildInnerChannelFactory<TChannel> ();
                }
 
-#if !NET_2_1
+#if !MOBILE
                public virtual IChannelListener<TChannel>
                        BuildChannelListener<TChannel> (
                        BindingContext context)
@@ -70,7 +70,7 @@ namespace System.ServiceModel.Channels
                        return context.CanBuildInnerChannelFactory<TChannel> ();
                }
 
-#if !NET_2_1
+#if !MOBILE
                public virtual bool CanBuildChannelListener<TChannel> (
                        BindingContext context)
                        where TChannel : class, IChannel
index 7541ca08a04d2b9f214f7d1572308ff252e23e9b..3be8fa805694d664837bca1f6f921f750e102417 100644 (file)
@@ -65,7 +65,7 @@ namespace System.ServiceModel.Channels
                        var f = mbe.CreateMessageEncoderFactory ();
                        var t = typeof (TChannel);
                        if (t == typeof (IRequestSessionChannel) ||
-#if !NET_2_1
+#if !MOBILE
                            t == typeof (IReplySessionChannel) ||
 #endif
                            t == typeof (IInputSessionChannel) ||
index 23c8081ebebe84c480ffac4f03540850c6ae5a3f..37217165ecf94daf58a4a61d0330987cc36828a7 100644 (file)
@@ -137,7 +137,7 @@ namespace System.ServiceModel.Channels
 
                        OperationContext ctx = OperationContext.Current;
                        // FIXME: support more fault code depending on the exception type.
-#if !NET_2_1 && !XAMMAC_4_5
+#if !MOBILE && !XAMMAC_4_5
                        // FIXME: set correct fault reason.
                        if (ctx != null && ctx.EndpointDispatcher.ChannelDispatcher.IncludeExceptionDetailInFaults) {
                                ExceptionDetail detail = new ExceptionDetail (error);
index 19faf78c143de4c491c1896c040b61ef2aca1f40..77995b55137a7127af793c38a406ebe1bb7fe3d3 100644 (file)
@@ -56,7 +56,7 @@ namespace System.ServiceModel.Channels
                        get { return source.MessageEncoder; }
                }
 
-#if NET_2_1
+#if MOBILE
                public override T GetProperty<T> ()
                {
                        if (typeof (T) == typeof (IHttpCookieContainerManager))
@@ -189,7 +189,7 @@ namespace System.ServiceModel.Channels
                                        suppressEntityBody = true;
                        }
 
-#if !NET_2_1
+#if !MOBILE
                        if (source.ClientCredentials != null) {
                                var cred = source.ClientCredentials;
                                if ((cred.ClientCertificate != null) && (cred.ClientCertificate.Certificate != null))
@@ -476,7 +476,7 @@ namespace System.ServiceModel.Channels
                                        // FIXME: Do we need to use the timeout? If so, what happens when the timeout is reached.
                                        // Is the current request cancelled and an exception thrown? If so we need to pass the
                                        // exception to the Complete () method and allow the result to complete 'normally'.
-#if NET_2_1
+#if MOBILE
                                        // neither Moonlight nor MonoTouch supports contexts (WaitOne default to false)
                                        bool result = AsyncWaitHandle.WaitOne (Timeout);
 #else
index 6b70a26e3b8ec5eb229631210f77928330faaaf1..191a182dfc70d4903f68d234834e0e11a25e09bc 100644 (file)
@@ -32,7 +32,7 @@ using System.Net;
 using System.Net.Security;
 using System.Security.Authentication.ExtendedProtection;
 using System.ServiceModel.Channels;
-#if !NET_2_1
+#if !MOBILE
 using System.ServiceModel.Channels.Http;
 #endif
 using System.ServiceModel.Description;
@@ -185,7 +185,7 @@ namespace System.ServiceModel.Channels
                        return typeof (TChannel) == typeof (IRequestChannel);
                }
 
-#if !NET_2_1 && !XAMMAC_4_5
+#if !MOBILE && !XAMMAC_4_5
                public override bool CanBuildChannelListener<TChannel> (
                        BindingContext context)
                {
@@ -201,7 +201,7 @@ namespace System.ServiceModel.Channels
                        return new HttpChannelFactory<TChannel> (this, context);
                }
 
-#if !NET_2_1 && !XAMMAC_4_5
+#if !MOBILE && !XAMMAC_4_5
                internal static object ListenerBuildLock = new object ();
 
                public override IChannelListener<TChannel> BuildChannelListener<TChannel> (
@@ -242,7 +242,7 @@ namespace System.ServiceModel.Channels
                        set { throw new NotImplementedException (); }
                }
 
-#if !NET_2_1 && !XAMMAC_4_5
+#if !MOBILE && !XAMMAC_4_5
                void IPolicyExportExtension.ExportPolicy (
                        MetadataExporter exporter,
                        PolicyConversionContext context)
index d95dd5f35ef09e0c2122eef6b84f20450ed617d3..d281d484d8689e10310d8bc680b94ee6b7992d08 100644 (file)
@@ -68,7 +68,7 @@ namespace System.ServiceModel.Channels
                        return base.BuildChannelFactory <TChannel> (context);
                }
 
-#if !NET_2_1 && !XAMMAC_4_5
+#if !MOBILE && !XAMMAC_4_5
                [MonoTODO]
                public override IChannelListener<TChannel>
                        BuildChannelListener<TChannel> (
@@ -83,7 +83,7 @@ namespace System.ServiceModel.Channels
                        return new HttpsTransportBindingElement (this);
                }
 
-#if !NET_2_1 && !XAMMAC_4_5
+#if !MOBILE && !XAMMAC_4_5
                public XmlElement GetTransportTokenAssertion ()
                {
                        var doc = new XmlDocument ();
index ef58f946dff47038fb7ba7205b1bcf65e850b9ff..05fc00512be492a08dc4461d885916ef254911cc 100644 (file)
@@ -33,7 +33,7 @@ namespace System.ServiceModel.Channels
        [MonoTODO]
        public sealed class LocalClientSecuritySettings
        {
-#if !NET_2_1
+#if !MOBILE
                bool cache_cookies = true;
                int cookie_renewal = 60;
                bool detect_replays = true;
@@ -56,7 +56,7 @@ namespace System.ServiceModel.Channels
                public TimeSpan ReplayWindow { get; set; }
                public TimeSpan TimestampValidityDuration { get; set; }
 
-#if !NET_2_1
+#if !MOBILE
                public bool CacheCookies {
                        get { return cache_cookies; }
                        set { cache_cookies = value; }
index 4f3d010088ab78b68be8535be00fa4d8e06bc565..caebb3a7eba951ed814029b5f0caf6a2c05fe37e 100644 (file)
@@ -89,7 +89,7 @@ namespace System.ServiceModel.Channels
                }
        }
 
-#if !NET_2_1
+#if !MOBILE
        internal class XPathMessageBuffer : MessageBuffer
        {
                IXPathNavigable source;
index 49a8478f6f98af7b61a9254940ec6df38bb958b3..bc3405e53412e455543ef1039a2ded8e49846225 100644 (file)
@@ -59,7 +59,7 @@ namespace System.ServiceModel.Channels
                        return ctx.GetInnerProperty<T> ();
                }
 
-#if !NET_2_1 && !XAMMAC_4_5
+#if !MOBILE && !XAMMAC_4_5
                [MonoTODO]
                protected virtual void OnImportPolicy (XmlElement assertion,
                        MessageVersion messageVersion,
index 8427b92c5697d643b7cd42c1b813ce5c1750c879..4e37df9c865837039543d01319d9fb10a582c0bf 100644 (file)
@@ -209,7 +209,7 @@ namespace System.ServiceModel.Channels
                {
                        bool is_ref, must_understand, relay;
                        string actor;
-#if NET_2_1
+#if MOBILE
                        string body;
 #else
                        // This is required to completely clone body xml that 
@@ -238,7 +238,7 @@ namespace System.ServiceModel.Channels
 
                                local_name = reader.LocalName;
                                namespace_uri = reader.NamespaceURI;
-#if NET_2_1
+#if MOBILE
                                body = reader.ReadOuterXml ();
 #else
                                body = new XmlDocument ();
@@ -250,7 +250,7 @@ namespace System.ServiceModel.Channels
 
                        public XmlReader CreateReader ()
                        {
-#if NET_2_1
+#if MOBILE
                                var reader = XmlReader.Create (new StringReader (body));
 #else
                                var reader = new XmlNodeReader (body);
index 4060586ca1c164ccb7d44b9620101412663ceb7a..fc4a8e139a1f6a933e750c2e87ee12226ac6df49 100644 (file)
@@ -327,7 +327,7 @@ namespace System.ServiceModel.Channels
                                return;
                        if (MessageVersion.Addressing.Equals (AddressingVersion.WSAddressing10))
                                Add (MessageHeader.CreateHeader (name, ns, EndpointAddress10.FromEndpointAddress (address)));
-#if !NET_2_1
+#if !MOBILE
                        else if (MessageVersion.Addressing.Equals (AddressingVersion.WSAddressingAugust2004))
                                Add (MessageHeader.CreateHeader (name, ns, EndpointAddressAugust2004.FromEndpointAddress (address)));
 #endif
index db1c8fd46b7c2dfa6dc72f6f2ef2f7f871a566d5..f46f2ffe2cfa5926ea8ed7e05b3d93231f812fbc 100644 (file)
@@ -98,7 +98,7 @@ namespace System.ServiceModel.Channels
                        }
                }
 
-#if !NET_2_1
+#if !MOBILE
                public SecurityMessageProperty Security {
                        get { return (SecurityMessageProperty) this ["Security"]; }
                        set { this ["Security"] = value; }
index 422e6e92c1f74619a899c1979d834bcd91a09733..1e3bf6cbefb1d3df14ac9d211672e1f4f787eb46 100644 (file)
@@ -69,7 +69,7 @@ namespace System.ServiceModel.Channels
                        throw new NotImplementedException ();
                }
                
-#if !NET_2_1
+#if !MOBILE
                [MonoTODO]
                public override IChannelListener<TChannel> BuildChannelListener<TChannel> (BindingContext context)
                {
index 1f47b906c0367a0d89384401d31f0723fa51deb7..ae23b3e3336f50c4c44411d98975dd19faf3c1eb 100644 (file)
@@ -30,7 +30,7 @@ using System.Collections.ObjectModel;
 using System.ServiceModel.Description;
 using System.ServiceModel.Channels;
 using System.ServiceModel.Security;
-#if !NET_2_1 && !XAMMAC_4_5
+#if !MOBILE && !XAMMAC_4_5
 using System.ServiceModel.Channels.Security;
 using System.IdentityModel.Selectors;
 using System.IdentityModel.Tokens;
@@ -46,7 +46,7 @@ namespace System.ServiceModel.Channels
                {
                        MessageSecurityVersion = MessageSecurityVersion.Default;
                        endpoint = new SupportingTokenParameters ();
-#if !NET_2_1 && !XAMMAC_4_5
+#if !MOBILE && !XAMMAC_4_5
                        DefaultAlgorithmSuite = SecurityAlgorithmSuite.Default;
                        KeyEntropyMode = SecurityKeyEntropyMode.CombinedEntropy;
                        operation = new Dictionary<string,SupportingTokenParameters> ();
@@ -63,7 +63,7 @@ namespace System.ServiceModel.Channels
                        security_header_layout = other.security_header_layout;
                        msg_security_version = other.msg_security_version;
                        endpoint = other.endpoint.Clone ();
-#if !NET_2_1 && !XAMMAC_4_5
+#if !MOBILE && !XAMMAC_4_5
                        alg_suite = other.alg_suite;
                        key_entropy_mode = other.key_entropy_mode;
                        opt_endpoint = other.opt_endpoint.Clone ();
@@ -83,7 +83,7 @@ namespace System.ServiceModel.Channels
                MessageSecurityVersion msg_security_version;
                SupportingTokenParameters endpoint;
 
-#if !NET_2_1 && !XAMMAC_4_5
+#if !MOBILE && !XAMMAC_4_5
                SecurityAlgorithmSuite alg_suite;
                SecurityKeyEntropyMode key_entropy_mode;
                SupportingTokenParameters opt_endpoint;
@@ -109,7 +109,7 @@ namespace System.ServiceModel.Channels
                        get { return endpoint; }
                }
 
-#if !NET_2_1 && !XAMMAC_4_5
+#if !MOBILE && !XAMMAC_4_5
                public SecurityAlgorithmSuite DefaultAlgorithmSuite {
                        get { return alg_suite; }
                        set { alg_suite = value; }
@@ -140,7 +140,7 @@ namespace System.ServiceModel.Channels
                [MonoTODO ("Implement for TransportSecurityBindingElement")]
                public override bool CanBuildChannelFactory<TChannel> (BindingContext context)
                {
-#if NET_2_1 || XAMMAC_4_5
+#if MOBILE || XAMMAC_4_5
                        // not sure this should be like this, but there isn't Symmetric/Asymmetric elements in 2.1 anyways.
                        return context.CanBuildInnerChannelFactory<TChannel> ();
 #else
@@ -185,7 +185,7 @@ namespace System.ServiceModel.Channels
                protected abstract IChannelFactory<TChannel>
                        BuildChannelFactoryCore<TChannel> (BindingContext context);
 
-#if !NET_2_1 && !XAMMAC_4_5
+#if !MOBILE && !XAMMAC_4_5
                [MonoTODO ("Implement for TransportSecurityBindingElement")]
                public override bool CanBuildChannelListener<TChannel> (BindingContext context)
                {
@@ -272,7 +272,7 @@ namespace System.ServiceModel.Channels
 #endif
 
                #region Factory methods
-#if !NET_2_1 && !XAMMAC_4_5
+#if !MOBILE && !XAMMAC_4_5
                public static SymmetricSecurityBindingElement 
                        CreateAnonymousForCertificateBindingElement ()
                {
@@ -548,7 +548,7 @@ namespace System.ServiceModel.Channels
                        SecurityBindingElement binding, bool requireCancellation,
                        ChannelProtectionRequirements protectionRequirements)
                {
-#if !NET_2_1 && !XAMMAC_4_5
+#if !MOBILE && !XAMMAC_4_5
                        SymmetricSecurityBindingElement be =
                                new SymmetricSecurityBindingElement ();
                        be.ProtectionTokenParameters =
@@ -565,14 +565,14 @@ namespace System.ServiceModel.Channels
                        CreateUserNameOverTransportBindingElement ()
                {
                        var be = new TransportSecurityBindingElement ();
-#if !NET_2_1 && !XAMMAC_4_5 // FIXME: there should be whatever else to do for 2.1 instead.
+#if !MOBILE && !XAMMAC_4_5 // FIXME: there should be whatever else to do for 2.1 instead.
                        be.EndpointSupportingTokenParameters.SignedEncrypted.Add (new UserNameSecurityTokenParameters ());
 #endif
                        return be;
                }
                #endregion
 
-#if !NET_2_1 && !XAMMAC_4_5
+#if !MOBILE && !XAMMAC_4_5
                // It seems almost internal, hardcoded like this (I tried
                // custom parameters that sets IssuedTokenSecurityTokenParameters
                // like below ones, but that didn't trigger this method).
index 2330e8134c39c15a71d720b170f436b6c700f5de..2b27840eec5d201757835b542bf2c23d97c0c85b 100644 (file)
@@ -105,7 +105,7 @@ namespace System.ServiceModel.Channels
                        return base.BuildChannelFactory<TChannel> (context);
                }
 
-#if !NET_2_1
+#if !MOBILE
                public override IChannelListener<TChannel> BuildChannelListener<TChannel> (
                        BindingContext context)
                {
@@ -143,7 +143,7 @@ namespace System.ServiceModel.Channels
                        return new TextMessageEncoderFactory (this);
                }
 
-#if !NET_2_1 && !XAMMAC_4_5
+#if !MOBILE && !XAMMAC_4_5
                [MonoTODO]
                protected override void OnImportPolicy (XmlElement assertion,
                        MessageVersion messageVersion,
index bab577c5bae65551901ae3f14e54e84dc1b61a06..deb4b4b49f5d28010a7de6eadcdb9edc65477eac 100644 (file)
@@ -81,7 +81,7 @@ namespace System.ServiceModel.Channels
                                q.MaxStringContentLength = (int) MaxReceivedMessageSize;
                                return (T) (object) q;
                        }
-#if !NET_2_1
+#if !MOBILE
                        if (typeof (T) == typeof (ChannelProtectionRequirements))
                                // blank one, basically it should not be used
                                // for any secure channels (
@@ -92,7 +92,7 @@ namespace System.ServiceModel.Channels
                        return context.GetInnerProperty<T> ();
                }
 
-#if !NET_2_1 && !XAMMAC_4_5
+#if !MOBILE && !XAMMAC_4_5
                internal static XmlElement CreateTransportBinding (XmlElement transportToken)
                {
                        var doc = new XmlDocument ();
index e29e6f0c554491303a5028ff7c5c8c982a848b0d..60ff280d327a810566546583cffa34d0ec9c1835 100644 (file)
@@ -36,7 +36,7 @@ using System.ServiceModel.Security.Tokens;
 namespace System.ServiceModel.Channels
 {
        public sealed class TransportSecurityBindingElement
-#if NET_2_1
+#if MOBILE
                : SecurityBindingElement
 #else
                : SecurityBindingElement, IPolicyExportExtension
@@ -65,7 +65,7 @@ namespace System.ServiceModel.Channels
                        throw new NotImplementedException ();
                }
 
-#if !NET_2_1 && !XAMMAC_4_5
+#if !MOBILE && !XAMMAC_4_5
                [MonoTODO]
                protected override IChannelListener<TChannel>
                        BuildChannelListenerCore<TChannel> (
index c50146bfb3cbdd1dd7d54056172046b2756b30f9..4314c221857dbd41ee6dbd70cbdd1e00b6d785ee 100644 (file)
@@ -31,7 +31,7 @@ using System.ServiceModel.Channels;
 using System.ServiceModel.Description;
 using System.ServiceModel.Dispatcher;
 using System.ServiceModel.Security;
-#if !NET_2_1
+#if !MOBILE
 using System.IdentityModel.Selectors;
 using System.IdentityModel.Tokens;
 using System.ServiceModel.Security.Tokens;
@@ -40,7 +40,7 @@ using System.ServiceModel.Security.Tokens;
 namespace System.ServiceModel.Description
 {
        public class ClientCredentials
-#if NET_2_1 || XAMMAC_4_5
+#if MOBILE || XAMMAC_4_5
                : IEndpointBehavior
 #else
                : SecurityCredentialsManager, IEndpointBehavior
@@ -58,7 +58,7 @@ namespace System.ServiceModel.Description
                        initiator = source.initiator.Clone ();
                        recipient = source.recipient.Clone ();
                        windows = source.windows.Clone ();
-#if !NET_2_1
+#if !MOBILE
                        issued_token = source.issued_token.Clone ();
                        peer = source.peer.Clone ();
                        support_interactive = source.support_interactive;
@@ -93,7 +93,7 @@ namespace System.ServiceModel.Description
                        get { return windows; }
                }
 
-#if !NET_2_1
+#if !MOBILE
                IssuedTokenClientCredential issued_token =
                        new IssuedTokenClientCredential ();
                PeerCredential peer = new PeerCredential ();
@@ -130,7 +130,7 @@ namespace System.ServiceModel.Description
                        return new ClientCredentials (this);
                }
 
-#if !NET_2_1 && !XAMMAC_4_5
+#if !MOBILE && !XAMMAC_4_5
                public override SecurityTokenManager CreateSecurityTokenManager ()
                {
                        return new ClientCredentialsSecurityTokenManager (this);
index 80238d41ff89bf3ee89270260cc6cbfb82a4f12d..50ea0a905887f8d234ca42e194a61857698b34d1 100644 (file)
@@ -373,7 +373,7 @@ namespace System.ServiceModel.Description
                                        var fname = a.Name ?? a.DetailType.Name + "Fault";
                                        var fns = a.Namespace ?? cd.Namespace;
                                        var fd = new FaultDescription (a.Action ?? cd.Namespace + cd.Name + "/" + od.Name + fname) { DetailType = a.DetailType, Name = fname, Namespace = fns };
-#if !NET_2_1
+#if !MOBILE
                                        if (a.HasProtectionLevel)
                                                fd.ProtectionLevel = a.ProtectionLevel;
 #endif
@@ -400,7 +400,7 @@ namespace System.ServiceModel.Description
                                foreach (object obj in serviceMethod.GetCustomAttributes (typeof(IOperationBehavior),true))
                                        od.Behaviors.Add ((IOperationBehavior) obj);
                        }
-#if !NET_2_1
+#if !MOBILE
                        if (od.Behaviors.Find<OperationBehaviorAttribute>() == null)
                                od.Behaviors.Add (new OperationBehaviorAttribute ());
 #endif
index dc25161d460e7f1d1af46ac6637f046f1f76f09b..b763c15ca98f62b7eda8cda01db00a7795a43d4f 100644 (file)
@@ -65,13 +65,13 @@ namespace System.ServiceModel.Description
 
                public int MaxItemsInObjectGraph { get; set; }
 
-#if !NET_2_1
+#if !MOBILE
                public IDataContractSurrogate DataContractSurrogate { get; set; }
 #endif
 
                public virtual XmlObjectSerializer CreateSerializer (Type type, string name, string ns, IList<Type> knownTypes)
                {
-#if NET_2_1
+#if MOBILE
                        return new DataContractSerializer (type, name, ns, knownTypes);
 #else
                        return new DataContractSerializer (type, name, ns, knownTypes, MaxItemsInObjectGraph, IgnoreExtensionDataObject, false, DataContractSurrogate);
@@ -80,7 +80,7 @@ namespace System.ServiceModel.Description
 
                public virtual XmlObjectSerializer CreateSerializer (Type type, XmlDictionaryString name, XmlDictionaryString ns, IList<Type> knownTypes)
                {
-#if NET_2_1
+#if MOBILE
                        return new DataContractSerializer (type, name, ns, knownTypes);
 #else
                        return new DataContractSerializer (type, name, ns, knownTypes, MaxItemsInObjectGraph, IgnoreExtensionDataObject, false, DataContractSurrogate);
@@ -112,7 +112,7 @@ namespace System.ServiceModel.Description
                {
                }
                
-#if !NET_2_1 && !XAMMAC_4_5
+#if !MOBILE && !XAMMAC_4_5
                //IWsdlExportExtension
 
                void IWsdlExportExtension.ExportContract (WsdlExporter exporter,
index 5e3924b26ee1b5e69e5e1a3bed6252213ec4feb3..6dc65cc0d54274783f3d3c4c145cf2567c1815d2 100644 (file)
@@ -100,7 +100,7 @@ namespace System.ServiceModel.Description
                        set { type = value; }
                }
 
-#if !NET_2_1 && !XAMMAC_4_5
+#if !MOBILE && !XAMMAC_4_5
                internal XsdDataContractImporter DataContractImporter { get; set; }
                internal XmlSerializerMessageContractImporterInternal XmlSerializationImporter { get; set; }
                internal System.CodeDom.CodeTypeReference CodeTypeReference { get; set; }
index 1895c10e75968bf968d91bae86ea149212f5b744..26ee9d753d8beec3770a30e0154032b6e7534cc7 100644 (file)
@@ -36,7 +36,7 @@ namespace System.ServiceModel.Description
 {
        public class XmlSerializerOperationBehavior
                : IOperationBehavior
-#if !NET_2_1
+#if !MOBILE
                        , IWsdlExportExtension
 #endif
        {
@@ -104,7 +104,7 @@ namespace System.ServiceModel.Description
                {
                }
 
-#if !NET_2_1 && !XAMMAC_4_5
+#if !MOBILE && !XAMMAC_4_5
                void IWsdlExportExtension.ExportContract (
                        WsdlExporter exporter,
                        WsdlContractConversionContext context)
index db050b9067f727c474ed694a46e39a81ba62d7cf..435b7ef3234b7dbf2818d839f5a1bb397aa7afc4 100644 (file)
@@ -36,7 +36,7 @@ namespace System.ServiceModel.Diagnostics
        {
                public MessageLoggingSettings ()
                {
-#if !NET_2_1 && !XAMMAC_4_5
+#if !MOBILE && !XAMMAC_4_5
                        var e = ConfigUtil.DiagnosticSection.MessageLogging;
                        LogEntireMessage = e.LogEntireMessage;
                        LogKnownPii = e.LogKnownPii;
index db1c49650c16598dc9b8b01cec02eb90aad6459b..dd50fedc3ffd26cfbbbf4cb37ba3b8d2c30ae26b 100644 (file)
@@ -243,7 +243,7 @@ namespace System.ServiceModel.Dispatcher
                        var headers = MessageToHeaderObjects (md, message);
                        object [] parts = MessageToParts (md, message);
                        if (md.MessageType != null) {
-#if NET_2_1
+#if MOBILE
                                parameters [0] = Activator.CreateInstance (md.MessageType);
 #else
                                parameters [0] = Activator.CreateInstance (md.MessageType, true);
@@ -271,7 +271,7 @@ namespace System.ServiceModel.Dispatcher
                        var headers = MessageToHeaderObjects (md, message);
                        object [] parts = MessageToParts (md, message);
                        if (md.MessageType != null) {
-#if NET_2_1
+#if MOBILE
                                object msgObject = Activator.CreateInstance (md.MessageType);
 #else
                                object msgObject = Activator.CreateInstance (md.MessageType, true);
@@ -355,14 +355,14 @@ namespace System.ServiceModel.Dispatcher
        class DataContractMessagesFormatter : BaseMessagesFormatter
        {
                DataContractFormatAttribute attr;
-#if !NET_2_1
+#if !MOBILE
                DataContractSerializerOperationBehavior serializerBehavior;
 #endif
 
                public DataContractMessagesFormatter (OperationDescription desc, DataContractFormatAttribute attr)
                        : base (desc)
                {
-#if !NET_2_1
+#if !MOBILE
                        this.serializerBehavior = desc.Behaviors.Find<DataContractSerializerOperationBehavior>();
 #endif
                        this.attr = attr;
@@ -442,7 +442,7 @@ namespace System.ServiceModel.Dispatcher
                XmlObjectSerializer GetSerializer (MessagePartDescription partDesc)
                {
                        if (!serializers.ContainsKey (partDesc))
-#if !NET_2_1
+#if !MOBILE
                                if (serializerBehavior != null)
                                        serializers [partDesc] = serializerBehavior.CreateSerializer(
                                                partDesc.Type, partDesc.Name, partDesc.Namespace, OperationKnownTypes as IList<Type>);
index 3f218beb72812439719c749adf694da4db120165..1984a76985cc63a9e14de39769bf8d7119d6cb08 100644 (file)
@@ -39,7 +39,7 @@ namespace System.ServiceModel.Dispatcher
        public sealed class ClientOperation
        {
                internal class ClientOperationCollection :
-#if NET_2_1
+#if MOBILE
                        KeyedCollection<string, ClientOperation>
 #else
                        SynchronizedKeyedCollection<string, ClientOperation>
index 08f1839c4f7fbec31faf7228f1e9cf947528168e..b23a6ef834532c563166bd0ad2695bd232b690c8 100644 (file)
@@ -54,7 +54,7 @@ namespace System.ServiceModel.Dispatcher
                {
                        contract_name = name;
                        contract_ns = ns;
-#if !NET_2_1
+#if !MOBILE
                        CallbackDispatchRuntime = (DispatchRuntime) callbackDispatchRuntime ?? new DispatchRuntime (null, this);
 #endif
                }
@@ -80,7 +80,7 @@ namespace System.ServiceModel.Dispatcher
                
                public Type ContractClientType { get; set; }
 
-#if !NET_2_1
+#if !MOBILE
                public DispatchRuntime CallbackDispatchRuntime { get; internal set; }
 #endif
 
@@ -88,7 +88,7 @@ namespace System.ServiceModel.Dispatcher
                        get { return inspectors; }
                }
 
-#if NET_2_1
+#if MOBILE
                public KeyedCollection<string,ClientOperation> Operations {
                        get { return operations; }
                }
index e9fb67f98e9e2c13265ba3fd6e333911b8fc016c..0397c9bf3cb67cd52221db9d9744d21b18765585 100644 (file)
@@ -54,7 +54,7 @@ namespace System.ServiceModel.Dispatcher
                        tx_auto_complete, tx_required,
                        auto_dispose_params = true;
                IDispatchMessageFormatter formatter;
-#if !NET_2_1
+#if !MOBILE
                ImpersonationOption impersonation;
                IOperationInvoker invoker;
                SynchronizedCollection<IParameterInspector> inspectors
@@ -93,7 +93,7 @@ namespace System.ServiceModel.Dispatcher
                        get { return action; }
                }
 
-#if !NET_2_1
+#if !MOBILE
                public SynchronizedCollection<ICallContextInitializer> CallContextInitializers {
                        get { return ctx_initializers; }
                }
@@ -214,7 +214,7 @@ namespace System.ServiceModel.Dispatcher
 
                void ThrowIfOpened ()
                {
-#if !NET_2_1 && !XAMMAC_4_5
+#if !MOBILE && !XAMMAC_4_5
                        // FIXME: get callback client runtime status when ChannelDispatcher is not available.
                        var state = Parent.ChannelDispatcher != null ? Parent.ChannelDispatcher.State : CommunicationState.Created; // Parent.CallbackClientRuntime.ChannelFactory.State;
                        switch (state) {
index f6660e1c19c3826ffc1892a3898ffe97152e434d..8dc605443efb802a0aab68a19e879a16f3cfdd8b 100644 (file)
@@ -29,7 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Reflection;
-#if !NET_2_1
+#if !MOBILE
 using System.IdentityModel.Policy;
 #if !XAMMAC_4_5
 using System.Web.Security;
@@ -45,7 +45,7 @@ namespace System.ServiceModel.Dispatcher
 {
        public sealed class DispatchRuntime
        {
-#if NET_2_1 || XAMMAC_4_5
+#if MOBILE || XAMMAC_4_5
                internal DispatchRuntime (EndpointDispatcher dispatcher, ClientRuntime callbackClientRuntime)
                {
                        UnhandledDispatchOperation = new DispatchOperation (
index 3a1da201c8ca41db568c1c0d00e0bac671e84d62..c823ce38e9502a483c05ada7c0198f094a802a27 100644 (file)
@@ -57,7 +57,7 @@ namespace System.ServiceModel.Security
                        StoreName storeName, X509FindType findType,
                        object findValue)
                {
-#if !NET_2_1
+#if !MOBILE
                        certificate = ConfigUtil.CreateCertificateFrom (storeLocation, storeName, findType, findValue);
 #else
                        throw new NotImplementedException ();
@@ -68,7 +68,7 @@ namespace System.ServiceModel.Security
                        string subjectName, StoreLocation storeLocation,
                        StoreName storeName)
                {
-#if !NET_2_1
+#if !MOBILE
                        certificate = ConfigUtil.CreateCertificateFrom (storeLocation, storeName, X509FindType.FindBySubjectName, subjectName);
 #else
                        throw new NotImplementedException ();
index c6aa5acfa973d46f95fb8ac2e732db1dcebaa45e..93dc52005453c59d50b3f0b6cc9c3e233549778f 100644 (file)
@@ -27,7 +27,7 @@
 //
 using System;
 using System.Collections.Generic;
-#if !NET_2_1
+#if !MOBILE
 using System.IdentityModel.Selectors;
 #endif
 using System.Security.Cryptography.X509Certificates;
@@ -49,7 +49,7 @@ namespace System.ServiceModel.Security
                X509Certificate2 certificate;
                Dictionary<Uri,X509Certificate2> scoped =
                        new Dictionary<Uri,X509Certificate2> ();
-#if !NET_2_1
+#if !MOBILE
                X509CertificateValidator validator;
 #endif
                X509RevocationMode revocation_mode;
@@ -92,7 +92,7 @@ namespace System.ServiceModel.Security
                public void SetDefaultCertificate (StoreLocation storeLocation,
                        StoreName storeName, X509FindType findType, Object findValue)
                {
-#if !NET_2_1
+#if !MOBILE
                        DefaultCertificate = ConfigUtil.CreateCertificateFrom (storeLocation, storeName, findType, findValue);
 #else
                        throw new NotImplementedException ();
@@ -110,7 +110,7 @@ namespace System.ServiceModel.Security
                        StoreName storeName, X509FindType findType,
                        Object findValue, Uri targetService)
                {
-#if !NET_2_1
+#if !MOBILE
                        ScopedCertificates [targetService] = ConfigUtil.CreateCertificateFrom (storeLocation, storeName, findType, findValue);
 #else
                        throw new NotImplementedException ();
index ef9715fb4b4fb00e0cc5ffb30c1fac359060ec25..49140b9f6477d0140b24cccc78c4d97b190796e3 100644 (file)
@@ -50,7 +50,7 @@ namespace System.ServiceModel
                {
                }
                
-#if !NET_2_1 && !XAMMAC_4_5
+#if !MOBILE && !XAMMAC_4_5
                public BasicHttpBinding (string configurationName)
                        : this ()
                {
@@ -110,7 +110,7 @@ namespace System.ServiceModel
                        SecurityBindingElement element;
                        switch (Security.Mode) {
                        case BasicHttpSecurityMode.Message:
-#if NET_2_1 || XAMMAC_4_5
+#if MOBILE || XAMMAC_4_5
                                throw new NotImplementedException ();
 #else
                                if (Security.Message.ClientCredentialType != BasicHttpMessageCredentialType.Certificate)
@@ -121,7 +121,7 @@ namespace System.ServiceModel
 #endif
 
                        case BasicHttpSecurityMode.TransportWithMessageCredential:
-#if NET_2_1 || XAMMAC_4_5
+#if MOBILE || XAMMAC_4_5
                                throw new NotImplementedException ();
 #else
                                if (Security.Message.ClientCredentialType != BasicHttpMessageCredentialType.Certificate)
@@ -135,7 +135,7 @@ namespace System.ServiceModel
                                return null;
                        }
                        
-#if !NET_2_1 && !XAMMAC_4_5
+#if !MOBILE && !XAMMAC_4_5
                        element.SetKeyDerivation (false);
                        element.SecurityHeaderLayout = SecurityHeaderLayout.Lax;
 #endif
@@ -150,7 +150,7 @@ namespace System.ServiceModel
                                ReaderQuotas.CopyTo (tm.ReaderQuotas);
                                return tm;
                        } else {
-#if NET_2_1 || XAMMAC_4_5
+#if MOBILE || XAMMAC_4_5
                                throw new NotImplementedException ();
 #else
                                return new MtomMessageEncodingBindingElement (
index 21e66a4f65b462670d2c38ea5b0ee018943b6617..b328f91e146957814bea82bae4867a86a0c1fcd9 100644 (file)
@@ -50,7 +50,7 @@ namespace System.ServiceModel
                {
                }
                
-#if !NET_2_1 && !XAMMAC_4_5
+#if !MOBILE && !XAMMAC_4_5
                public BasicHttpsBinding (string configurationName)
                        : this ()
                {
@@ -102,7 +102,7 @@ namespace System.ServiceModel
                        SecurityBindingElement element;
                        switch (Security.Mode) {
                        case BasicHttpsSecurityMode.TransportWithMessageCredential:
-#if NET_2_1 || XAMMAC_4_5
+#if MOBILE || XAMMAC_4_5
 
                                throw new NotImplementedException ();
 #else
@@ -117,7 +117,7 @@ namespace System.ServiceModel
                                return null;
                        }
                        
-#if !NET_2_1 && !XAMMAC_4_5
+#if !MOBILE && !XAMMAC_4_5
                        element.SetKeyDerivation (false);
                        element.SecurityHeaderLayout = SecurityHeaderLayout.Lax;
 #endif
@@ -132,7 +132,7 @@ namespace System.ServiceModel
                                ReaderQuotas.CopyTo (tm.ReaderQuotas);
                                return tm;
                        } else {
-#if NET_2_1 || XAMMAC_4_5
+#if MOBILE || XAMMAC_4_5
                                throw new NotImplementedException ();
 #else
                                return new MtomMessageEncodingBindingElement (
index e5ef83357f35ebc8401a4bed40e6d6fb43a5a2e6..732a51022992a0a1e39175fe61a8555583908149 100644 (file)
@@ -90,7 +90,7 @@ namespace System.ServiceModel
                        if (endpointConfig == null)
                                return;
 
-#if NET_2_1 || XAMMAC_4_5
+#if MOBILE || XAMMAC_4_5
                        try {
                                // It should automatically use XmlXapResolver
                                var cfg = new SilverlightClientConfigLoader ().Load (XmlReader.Create ("ServiceReferences.ClientConfig"));
@@ -160,7 +160,7 @@ namespace System.ServiceModel
 #endif
                }
 
-#if !NET_2_1 && !XAMMAC_4_5
+#if !MOBILE && !XAMMAC_4_5
                private void ApplyBehavior (string behaviorConfig)
                {
                        BehaviorsSection behaviorsSection = ConfigUtil.BehaviorsSection;
@@ -260,7 +260,7 @@ namespace System.ServiceModel
                                new BindingParameterCollection ();
 
                        ContractDescription cd = Endpoint.Contract;
-#if !NET_2_1
+#if !MOBILE
                        pl.Add (ChannelProtectionRequirements.CreateFromContract (cd));
 #endif
 
index a7b5587abf84f9809a24c4dae57b31ee730ae139..1e2724f95434c49768dd7c4fe6eee4d0c32e11cf 100644 (file)
@@ -79,7 +79,7 @@ namespace System.ServiceModel
 
                        string modname = "dummy";
                        Type crtype =
-#if !NET_2_1
+#if !MOBILE
                                duplex ? typeof (DuplexClientRuntimeChannel) :
 #endif
                                typeof (ClientRuntimeChannel);
@@ -131,7 +131,7 @@ namespace System.ServiceModel
                        BindingFlags bf = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance;
                        foreach (OperationDescription od in cd.Operations) {
                                // FIXME: handle properties and events.
-#if !NET_2_1
+#if !MOBILE
                                if (od.SyncMethod != null)
                                        GenerateMethodImpl (c, crtype.GetMethod ("Process", bf), od.Name, od.SyncMethod);
 #endif
index 41d75e98f9cf83d16024f9373086d2d27c56cf99..986fb69f1ec8ac95b1a7403819bb232da64946ac 100644 (file)
@@ -71,7 +71,7 @@ namespace System.ServiceModel
                {
                        if (CanCastTo<IClientChannel> (t))
                                return true;
-#if !NET_2_1
+#if !MOBILE
                        if (isDuplex && CanCastTo<IDuplexContextChannel> (t))
                                return true;
 #endif
index 7c09860e4813298410ab4efaa3fc671a6b20ebc0..737bad6244d948288fc0c5f6fc1e5dbab0bf658d 100644 (file)
@@ -37,7 +37,7 @@ using System.Xml.Schema;
 using System.Xml.Serialization;
 using System.ServiceModel.Channels;
 using System.ServiceModel.Description;
-#if !NET_2_1
+#if !MOBILE
 using System.Security.Cryptography.Xml;
 #endif
 
@@ -116,7 +116,7 @@ namespace System.ServiceModel
                        get { return address; }
                }
 
-#if !NET_2_1
+#if !MOBILE
                internal static XmlSchema Schema {
                        get {
                                if (schema == null) {
@@ -187,7 +187,7 @@ namespace System.ServiceModel
                        return ! (address1 == address2);
                }
 
-//#if !NET_2_1
+//#if !MOBILE
                public static EndpointAddress ReadFrom (
                        XmlDictionaryReader reader)
                {
@@ -296,7 +296,7 @@ namespace System.ServiceModel
                                        addressingVersion.Namespace, reader.LocalName, reader.NamespaceURI));
 
                        reader.MoveToContent ();
-#if !NET_2_1
+#if !MOBILE
                        MetadataSet metadata = null;
                        if (reader.LocalName == "Metadata" &&
                            reader.NamespaceURI == addressingVersion.Namespace &&
@@ -317,7 +317,7 @@ namespace System.ServiceModel
                        if (addressingVersion == AddressingVersion.WSAddressing10 && uri == w3c_anonymous)
                                uri = anonymous_role;
 
-#if NET_2_1
+#if MOBILE
                        return new EndpointAddress (uri, identity);
 #else
                        if (metadata == null)
@@ -338,7 +338,7 @@ namespace System.ServiceModel
                {
                        if (writer == null)
                                throw new ArgumentNullException ("writer");
-#if NET_2_1
+#if MOBILE
                        if (addressingVersion == AddressingVersion.None) {
                                writer.WriteString (Uri.AbsoluteUri);
                        } else {
index 862830b0c76eb927a2b38a78c9b321365f3b2440..d26293b0e70ef6b0900fbbef725c56710f88ae3e 100644 (file)
@@ -42,7 +42,7 @@ namespace System.ServiceModel
 {
        [XmlSchemaProvider ("GetSchema")]
        [XmlRoot ("EndpointReference", Namespace = "http://www.w3.org/2005/08/addressing")]
-#if NET_2_1
+#if MOBILE
        internal class EndpointAddress10 : IXmlSerializable
 #else
        public class EndpointAddress10 : IXmlSerializable
index 7500d76322cdc1abb5b123c28fb6f896c3ad22c0..f56bb33330dedc5ccdddcd0091c872b1ef26ef52 100644 (file)
@@ -67,7 +67,7 @@ namespace System.ServiceModel
                        set { identity = value; }
                }
 
-#if !NET_2_1
+#if !MOBILE
                public XmlDictionaryReader GetReaderAtExtensions ()
                {
                        if (extension == null)
index 79c743c48fba84d2da4e0d3f0582a3100f464f87..b00afa8203f0401657bac473dbc9bfc164ffa64e 100644 (file)
@@ -50,7 +50,7 @@ namespace System.ServiceModel
 
        internal static class Logger
        {
-#if NET_2_1
+#if MOBILE
                enum TraceEventType // dummy
                {
                        Critical,
@@ -71,7 +71,7 @@ namespace System.ServiceModel
                static int event_id;
                static TextWriter log_writer;
                static XmlWriter xml_writer;
-#if !NET_2_1
+#if !MOBILE
                static readonly TraceSource source = new TraceSource ("System.ServiceModel");
                static readonly TraceSource message_source = new TraceSource ("System.ServiceModel.MessageLogging");
 #endif
@@ -89,7 +89,7 @@ namespace System.ServiceModel
                        case "stderr":
                                log_writer = Console.Error;
                                break;
-#if !NET_2_1
+#if !MOBILE
                        default:
                                try {
                                        if (!String.IsNullOrEmpty (env))
@@ -104,7 +104,7 @@ namespace System.ServiceModel
                        if (log_writer != null)
                                xml_writer = XmlWriter.Create (log_writer, new XmlWriterSettings () { OmitXmlDeclaration = true });
 
-#if !NET_2_1
+#if !MOBILE
                        message_source.Switch.Level = SourceLevels.Information;
 #endif
                }
@@ -143,7 +143,7 @@ namespace System.ServiceModel
                        if (log_writer != null) {
                                lock (log_writer){
                                        event_id++;
-#if NET_2_1
+#if MOBILE
                                        log_writer.Write ("[{0}] ", event_id);
 #endif
                                        TraceCore (TraceEventType.Information, event_id,
@@ -151,7 +151,7 @@ namespace System.ServiceModel
                                                message, args);
                                        log_writer.WriteLine (message, args);
                                        log_writer.Flush ();
-#if !NET_2_1
+#if !MOBILE
                                        source.TraceEvent (eventType, event_id, message, args);
 #endif
                                }
@@ -179,7 +179,7 @@ namespace System.ServiceModel
                {
                        if (log_writer != null) {
                                var sw = new StringWriter ();
-#if NET_2_1
+#if MOBILE
                                var xw = XmlWriter.Create (sw, xws);
 #else
                                var doc = new XmlDocument ();
@@ -199,7 +199,7 @@ namespace System.ServiceModel
 
                                event_id++;
                                lock (log_writer){
-#if NET_2_1
+#if MOBILE
                                        log_writer.Write ("[{0}] ", event_id);
 
                                        TraceCore (TraceEventType.Information, event_id, /*FIXME*/false, /*FIXME*/Guid.Empty, sw);
index 097e8cbfa4e1097b207794fafa5e9921ee43479c..7d64d43d6350908c6edb78c6bc2acd47efd009ca 100644 (file)
@@ -45,7 +45,7 @@ namespace System.ServiceModel
                }
 
                Message incoming_message;
-#if !NET_2_1 && !XAMMAC_4_5
+#if !MOBILE && !XAMMAC_4_5
                EndpointDispatcher dispatcher;
 #endif
                IContextChannel channel;
@@ -83,7 +83,7 @@ namespace System.ServiceModel
                }
 
 
-#if !NET_2_1 && !XAMMAC_4_5
+#if !MOBILE && !XAMMAC_4_5
                public EndpointDispatcher EndpointDispatcher {
                        get { return dispatcher; }
                        set { dispatcher = value; }
@@ -146,7 +146,7 @@ namespace System.ServiceModel
                        get { return Channel.SessionId; }
                }
 
-#if !NET_2_1
+#if !MOBILE
                public ServiceSecurityContext ServiceSecurityContext {
                        get { return IncomingMessageProperties != null ? IncomingMessageProperties.Security.ServiceSecurityContext : null; }
                }
index 75d412d50c25720ad3b65b08644607ae5d15cc75..eaf7d5ce2c42f28ca2836757bbf0626f11162c06 100644 (file)
@@ -25,7 +25,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_2_1 || XAMMAC_4_5
+#if MOBILE || XAMMAC_4_5
 
 using System;
 using System.Collections.Generic;
index 798a77915f1087768fd516c00c5d492ece21ed14..6f448cb59a34b2269cd9c4a93f3defa2857fea83 100644 (file)
@@ -168,7 +168,7 @@ namespace MonoTests.System.ServiceModel.Channels {
                }
 
                [TestMethod]
-#if NET_2_1
+#if MOBILE
                [MoonlightBug]
 #else
                [NUnit.Framework.Ignore]
@@ -237,7 +237,7 @@ namespace MonoTests.System.ServiceModel.Channels {
                }
 
                [TestMethod]
-#if NET_2_1
+#if MOBILE
                [MoonlightBug]
 #else
                [NUnit.Framework.Ignore]
@@ -340,7 +340,7 @@ namespace MonoTests.System.ServiceModel.Channels {
                }
 
                [TestMethod]
-#if NET_2_1
+#if MOBILE
                [MoonlightBug]
 #else
                [NUnit.Framework.Ignore]
@@ -361,7 +361,7 @@ namespace MonoTests.System.ServiceModel.Channels {
                }
 
                [TestMethod]
-#if NET_2_1
+#if MOBILE
                [MoonlightBug]
 #else
                [NUnit.Framework.Ignore]
@@ -453,7 +453,7 @@ namespace MonoTests.System.ServiceModel.Channels {
                }
 
                [TestMethod]
-#if NET_2_1
+#if MOBILE
                [MoonlightBug]
 #else
                [NUnit.Framework.Ignore]
@@ -546,7 +546,7 @@ namespace MonoTests.System.ServiceModel.Channels {
                }
 
                [TestMethod]
-#if NET_2_1
+#if MOBILE
                [MoonlightBug]
 #else
                [NUnit.Framework.Ignore]
@@ -641,7 +641,7 @@ namespace MonoTests.System.ServiceModel.Channels {
                }
 
                [TestMethod]
-#if NET_2_1
+#if MOBILE
                [MoonlightBug]
 #else
                [NUnit.Framework.Ignore]
@@ -733,7 +733,7 @@ namespace MonoTests.System.ServiceModel.Channels {
                }
 
                [TestMethod]
-#if NET_2_1
+#if MOBILE
                [MoonlightBug]
 #else
                [NUnit.Framework.Ignore]
@@ -777,7 +777,7 @@ namespace MonoTests.System.ServiceModel.Channels {
                // ThrowIfDisposed throws an exception if the state is Closing, Closed or Faulted.
 
                [TestMethod]
-#if NET_2_1
+#if MOBILE
                [MoonlightBug]
 #else
                [NUnit.Framework.Ignore]
@@ -843,7 +843,7 @@ namespace MonoTests.System.ServiceModel.Channels {
 
 
                [TestMethod]
-#if NET_2_1
+#if MOBILE
                [MoonlightBug]
 #else
                [NUnit.Framework.Ignore]
@@ -910,7 +910,7 @@ namespace MonoTests.System.ServiceModel.Channels {
                // ThrowIfDisposedOrImmutable throws an exception if the state is not Created.
 
                [TestMethod]
-#if NET_2_1
+#if MOBILE
                [MoonlightBug]
 #else
                [NUnit.Framework.Ignore]
@@ -979,7 +979,7 @@ namespace MonoTests.System.ServiceModel.Channels {
                }
 
                [TestMethod]
-#if NET_2_1
+#if MOBILE
                [MoonlightBug]
 #else
                [NUnit.Framework.Ignore]
@@ -1050,7 +1050,7 @@ namespace MonoTests.System.ServiceModel.Channels {
                // ThrowIfDisposedOrNotOpen throws an exception if the state is not Opened. 
 
                [TestMethod]
-#if NET_2_1
+#if MOBILE
                [MoonlightBug]
 #else
                [NUnit.Framework.Ignore]
@@ -1119,7 +1119,7 @@ namespace MonoTests.System.ServiceModel.Channels {
                }
 
                [TestMethod]
-#if NET_2_1
+#if MOBILE
                [MoonlightBug]
 #else
                [NUnit.Framework.Ignore]
@@ -1196,7 +1196,7 @@ namespace MonoTests.System.ServiceModel.Channels {
                }
 
                [TestMethod]
-#if NET_2_1
+#if MOBILE
                [MoonlightBug]
 #else
                [NUnit.Framework.Ignore]
@@ -1223,7 +1223,7 @@ namespace MonoTests.System.ServiceModel.Channels {
                }
 
                [TestMethod]
-#if NET_2_1
+#if MOBILE
                [MoonlightBug]
 #else
                [NUnit.Framework.Ignore]
@@ -1239,7 +1239,7 @@ namespace MonoTests.System.ServiceModel.Channels {
                }
 
                [TestMethod]
-#if NET_2_1
+#if MOBILE
                [MoonlightBug]
 #else
                [NUnit.Framework.Ignore]
@@ -1267,7 +1267,7 @@ namespace MonoTests.System.ServiceModel.Channels {
                }
 
                [TestMethod]
-#if NET_2_1
+#if MOBILE
                [MoonlightBug]
 #else
                [NUnit.Framework.Ignore]
@@ -1303,7 +1303,7 @@ namespace MonoTests.System.ServiceModel.Channels {
                }
 
                [TestMethod]
-#if NET_2_1
+#if MOBILE
                [MoonlightBug]
 #else
                [NUnit.Framework.Ignore]
index 3b61fe6384ad5cb0384fd7b329d1f7ac1133b281..cd45fc2ed31b7cc5e276ddbe11193c286a03bf16 100644 (file)
@@ -55,13 +55,13 @@ using System.Runtime.InteropServices;
 
        [assembly: CLSCompliant (true)]
        [assembly: AssemblyDelaySign (true)]
-#if NET_2_1
+#if MOBILE
        [assembly: AssemblyKeyFile ("../silverlight.pub")]
 #else
        [assembly: AssemblyKeyFile ("../ecma.pub")]
 #endif
 
-#if NET_2_1
+#if MOBILE
        [assembly: InternalsVisibleTo ("System.ServiceModel.Web, PublicKey=00240000048000009400000006020000002400005253413100040000010001008D56C76F9E8649383049F383C44BE0EC204181822A6C31CF5EB7EF486944D032188EA1D3920763712CCB12D75FB77E9811149E6148E5D32FBAAB37611C1878DDC19E20EF135D0CB2CFF2BFEC3D115810C3D9069638FE4BE215DBF795861920E5AB6F7DB2E2CEEF136AC23D5DD2BF031700AEC232F6C6B1C785B4305C123B37AB")]
 #else
        [assembly: AllowPartiallyTrustedCallers]
index 84a898e6ee38c368c523ded16755554ad6833bb1..4c6d072bd6e54f1d941afc3c26b58a573101ae96 100644 (file)
@@ -20,7 +20,7 @@ TXT_RESOURCE_STRINGS = \
 LIB_MCS_FLAGS = -nowarn:219,414,649,1717 -unsafe -d:ASYNC
 
 ifeq (2.1, $(FRAMEWORK_VERSION))
-LIB_MCS_FLAGS += -d:AGCLR -d:NET_2_1_HACK -d:DISABLE_XSLT_COMPILER -d:DISABLE_XSLT_SCRIPT,MONO_HYBRID_SYSTEM_XML -d:DISABLE_CAS_USE
+LIB_MCS_FLAGS += -d:AGCLR -d:DISABLE_XSLT_COMPILER -d:DISABLE_XSLT_SCRIPT,MONO_HYBRID_SYSTEM_XML -d:DISABLE_CAS_USE
 endif
 
 TEST_LIB_REFS = System.Data System.Core
index cf1434afff2497758d294f9e84a6cc9ee47bae2e..fc4fefc96676946ef278c46093de0e3e346f384d 100644 (file)
@@ -60,7 +60,7 @@ namespace System.Xml.Serialization
                        set { memberName = value; }
                }
 
-#if NET_2_1
+#if MOBILE
                MemberInfo member;
                // It is used only in 2.1 S.X.Serialization.dll in MS SDK.
                internal MemberInfo MemberInfo {
index b68d33eec94f2109a6cbad94f7e44d05ba41897a..fc0a36035c75421a3c37c18d4f1208defd465bd0 100644 (file)
@@ -126,7 +126,7 @@ namespace System.Xml.Serialization
                {
                        get { return _mapMember.Name; }
                }
-#if !NET_2_1
+#if !MOBILE
                public string GenerateTypeName (System.CodeDom.Compiler.CodeDomProvider codeProvider)
                {
                        string ret = codeProvider.CreateValidIdentifier (_mapMember.TypeData.FullTypeName);
index 6338a8dc14fa969a063a25a33b655de5242ce88c..0c4e131b87d993693f86e80fab46b45468e4464a 100644 (file)
@@ -157,7 +157,7 @@ namespace System.Xml.Serialization {
                        mps.RelatedMaps = relatedMaps;
                        mps.Format = SerializationFormat.Literal;
                        Type[] extraTypes = includedTypes != null ? (Type[])includedTypes.ToArray(typeof(Type)) : null;
-#if !NET_2_1
+#if !MOBILE
                        mps.Source = new MembersSerializationSource (elementName, hasWrapperElement, members, false, true, ns, extraTypes);
                        if (allowPrivateTypes) mps.Source.CanBeGenerated = false;
 #endif
@@ -226,7 +226,7 @@ namespace System.Xml.Serialization {
                                map.RelatedMaps = relatedMaps;
                                map.Format = SerializationFormat.Literal;
                                Type[] extraTypes = includedTypes != null ? (Type[]) includedTypes.ToArray (typeof (Type)) : null;
-#if !NET_2_1
+#if !MOBILE
                                map.Source = new XmlTypeSerializationSource (typeData.Type, root, attributeOverrides, defaultNamespace, extraTypes);
                                if (allowPrivateTypes) map.Source.CanBeGenerated = false;
 #endif
index aa2852faf196b08b887679ada589ac6bd6b3c5f2..0805d7f61a6d71d000a41ddb1474e7200e67ec11 100644 (file)
@@ -37,7 +37,7 @@ using System.Reflection;
 using System.Xml;
 using System.Xml.Schema;
 using System.Text;
-#if !NET_2_1
+#if !MOBILE
 using System.CodeDom;
 using System.CodeDom.Compiler;
 using Microsoft.CSharp;
@@ -121,7 +121,7 @@ namespace System.Xml.Serialization
                        //       debugging pourposes by adding the "nofallback" option.
                        //       For example: MONO_XMLSERIALIZER_THS=0,nofallback
                        
-#if NET_2_1
+#if MOBILE
                        string db = null;
                        string th = null;
                        generationThreshold = -1;
@@ -150,7 +150,7 @@ namespace System.Xml.Serialization
                        }
 #endif
                        deleteTempFiles = (db == null || db == "no");
-#if !NET_2_1 && CONFIGURATION_DEP
+#if !MOBILE && CONFIGURATION_DEP
                        // DiagnosticsSection
                        ConfigurationSection table = (ConfigurationSection) ConfigurationSettings.GetConfig("system.diagnostics");
                        var bf = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance;
@@ -579,7 +579,7 @@ namespace System.Xml.Serialization
                                }
                        }
                        
-#if !NET_2_1
+#if !MOBILE
                        if (!typeMapping.Source.CanBeGenerated || generationThreshold == -1)
                                return new XmlSerializationWriterInterpreter (typeMapping);
 
@@ -600,7 +600,7 @@ namespace System.Xml.Serialization
                
                XmlSerializationReader CreateReader (XmlMapping typeMapping)
                {
-#if !NET_2_1
+#if !MOBILE
                        XmlSerializationReader reader;
                        
                        lock (this) {
@@ -630,7 +630,7 @@ namespace System.Xml.Serialization
                        return new XmlSerializationReaderInterpreter (typeMapping);
                }
                
-#if NET_2_1
+#if MOBILE
                void CheckGeneratedTypes (XmlMapping typeMapping)
                {
                        throw new NotImplementedException();
index 54cd8471352f2f1c9ea6a643504f3dabec99775c..8581509e354e17a2f75f4272a381b626a0d56ee6 100644 (file)
@@ -54,7 +54,7 @@ using System.Runtime.InteropServices;
 [assembly: NeutralResourcesLanguage ("en-US")]
 [assembly: CLSCompliant (true)]
 [assembly: AssemblyDelaySign (true)]
-#if NET_2_1
+#if MOBILE
 [assembly: AssemblyKeyFile ("../silverlight.pub")]
 #else
 [assembly: AssemblyKeyFile ("../ecma.pub")]
index c7002e5c8eeecc6a33cfee6ba0e17835af563f41..ccf8e0f703a662f10c5a92fc720fa16c1813dd84 100644 (file)
@@ -124,7 +124,7 @@ namespace System.Xaml
                        return TypeDescriptor.GetConverter (type);
                }
                
-               // FIXME: I want this to cover all the existing types and make it valid in both NET_2_1 and !NET_2_1.
+               // FIXME: I want this to cover all the existing types and make it valid in both MOBILE and !MOBILE.
                class ConvertibleTypeConverter<T> : TypeConverter
                {
                        Type type;
index 169f6d172715e457bc3f6a70965a988e439ab012..e6ac4809d4bd86044e8fd37cbf8a635bd9e0c647 100644 (file)
@@ -54,7 +54,7 @@ using System.Runtime.InteropServices;
 [assembly: NeutralResourcesLanguage ("en-US")]
 [assembly: CLSCompliant (true)]
 [assembly: AssemblyDelaySign (true)]
-#if NET_2_1
+#if MOBILE
 [assembly: AssemblyKeyFile ("../winfx.pub")]
 #else
 [assembly: AssemblyKeyFile ("../ecma.pub")]
index 69456085a2bda90e18facc43bc4dcfcdffedf776..a21094034ef6f1c76f6604004a1c798adbeb3d05 100644 (file)
@@ -55,21 +55,21 @@ using System.Runtime.InteropServices;
 [assembly: NeutralResourcesLanguage ("en-US")]
 
 [assembly: ComVisible (false)]
-#if !NET_2_1
+#if !MOBILE
 [assembly: ComCompatibleVersion (1, 0, 3300, 0)]
 [assembly: AllowPartiallyTrustedCallers]
 #endif
 
 #if !BOOTSTRAP_WITH_OLDLIB
        [assembly: AssemblyDelaySign (true)]
-#if NET_2_1
+#if MOBILE
        [assembly: AssemblyKeyFile ("../silverlight.pub")]
 #else
        [assembly: AssemblyKeyFile ("../ecma.pub")]
 #endif
 #endif
 
-#if NET_2_1 && !MOBILE
+#if MOBILE && !MOBILE
        [assembly: InternalsVisibleTo ("System.Net, PublicKey=00240000048000009400000006020000002400005253413100040000010001008D56C76F9E8649383049F383C44BE0EC204181822A6C31CF5EB7EF486944D032188EA1D3920763712CCB12D75FB77E9811149E6148E5D32FBAAB37611C1878DDC19E20EF135D0CB2CFF2BFEC3D115810C3D9069638FE4BE215DBF795861920E5AB6F7DB2E2CEEF136AC23D5DD2BF031700AEC232F6C6B1C785B4305C123B37AB")]
 #else
        [assembly: InternalsVisibleTo ("System.ComponentModel.DataAnnotations, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
index cf38a5e11252ecba08357e7b974b6f286c3dd668..e59d0a89fa07b595c48d7e460ca4e9166d33fc75 100644 (file)
@@ -144,7 +144,7 @@ namespace System.Diagnostics {
 
                public string FileName {
                        get {
-#if !NET_2_1
+#if !MOBILE
                                if (SecurityManager.SecurityEnabled) {
                                        new FileIOPermission (FileIOPermissionAccess.PathDiscovery, filename).Demand ();
                                }
@@ -278,7 +278,7 @@ namespace System.Diagnostics {
                
                public static FileVersionInfo GetVersionInfo (string fileName)
                {
-#if !NET_2_1
+#if !MOBILE
                        if (SecurityManager.SecurityEnabled) {
                                new FileIOPermission (FileIOPermissionAccess.Read, fileName).Demand ();
                        }
@@ -293,7 +293,7 @@ namespace System.Diagnostics {
                        return fvi;
                }
 
-               // use our own AppendFormat because NET_2_1 have only this overload
+               // use our own AppendFormat because MOBILE have only this overload
                static void AppendFormat (StringBuilder sb, string format, params object [] args)
                {
                        sb.AppendFormat (format, args);
index bd1ea619bada6196b745bb9d359dc64004217efb..c608bfee43377d10c8125df44dfd5b52b7334f4a 100644 (file)
@@ -33,7 +33,7 @@ using System.Collections;
 
 namespace System.Diagnostics 
 {
-#if NET_2_1
+#if MOBILE
        public class ProcessModuleCollectionBase : System.Collections.Generic.List<ProcessModule>
        {
                protected ProcessModuleCollectionBase InnerList {
@@ -48,7 +48,7 @@ namespace System.Diagnostics
 #endif
 
        public class ProcessModuleCollection :
-#if !NET_2_1   
+#if !MOBILE    
                ReadOnlyCollectionBase
 #else
                ProcessModuleCollectionBase
index b2fbdbfcb161a263a3cba0e256952ad084101b1d..141b18215685967c46091670552e4fe70f8138d1 100644 (file)
@@ -33,7 +33,7 @@ using System.Collections;
 
 namespace System.Diagnostics 
 {
-#if NET_2_1
+#if MOBILE
        public class ProcessThreadCollectionBase : System.Collections.Generic.List<ProcessThread>
        {
                protected ProcessThreadCollectionBase InnerList {
@@ -54,7 +54,7 @@ namespace System.Diagnostics
 #endif
 
        public class ProcessThreadCollection :
-#if !NET_2_1
+#if !MOBILE
                ReadOnlyCollectionBase
 #else
                ProcessThreadCollectionBase
index 3b978ac32fa813a2f5359fbcd6aab3ffd6d5a8c5..40ee139b7a02fd18e26d688b314cd231dcd51318 100644 (file)
@@ -255,7 +255,7 @@ namespace System.Net.Mail {
                        if (Encoding.ASCII.Equals (enc))
                                return TransferEncoding.SevenBit;
                        else if (Encoding.UTF8.CodePage == enc.CodePage ||
-#if !NET_2_1
+#if !MOBILE
                            Encoding.Unicode.CodePage == enc.CodePage || Encoding.UTF32.CodePage == enc.CodePage
 #else
                            Encoding.Unicode.CodePage == enc.CodePage
index f894f490612fc2b6ff9f185bd113be8941234c9b..1f265d200e574e9b8507f630dd9891fe7c5e0943 100644 (file)
@@ -123,7 +123,7 @@ namespace System.Net.Sockets
                                //
                                // Also note that catching ConfigurationErrorsException specifically would require library dependency
                                // System.Configuration, and wanted to avoid that.
-#if !NET_2_1
+#if !MOBILE
 #if CONFIGURATION_DEP
                                try {
                                        SettingsSection config;
@@ -170,7 +170,7 @@ namespace System.Net.Sockets
                
                public Socket(AddressFamily addressFamily, SocketType socketType, ProtocolType protocolType)
                {
-#if NET_2_1 && !MOBILE
+#if MOBILE && !MOBILE
                        switch (addressFamily) {
                        case AddressFamily.InterNetwork:    // ok
                        case AddressFamily.InterNetworkV6:  // ok
@@ -208,7 +208,7 @@ namespace System.Net.Sockets
                        if (error != 0)
                                throw new SocketException (error);
 
-#if !NET_2_1 || MOBILE
+#if !MOBILE || MOBILE
                        SocketDefaults ();
 #endif
                }
@@ -289,7 +289,7 @@ namespace System.Net.Sockets
                        get { return ipv6_supported == 1; }
                }
 
-#if NET_2_1
+#if MOBILE
                public static bool OSSupportsIPv4 {
                        get { return ipv4_supported == 1; }
                }
@@ -308,7 +308,7 @@ namespace System.Net.Sockets
                }
 #endif
 
-#if NET_2_1
+#if MOBILE
                public static bool OSSupportsIPv6 {
                        get { return ipv6_supported == 1; }
                }
@@ -3408,7 +3408,7 @@ namespace System.Net.Sockets
 
                void ThrowIfUdp ()
                {
-#if !NET_2_1 || MOBILE
+#if !MOBILE || MOBILE
                        if (protocol_type == ProtocolType.Udp)
                                throw new SocketException ((int)SocketError.ProtocolOption);
 #endif
index 98622cb981a30a8f29324b26b932fdb9c1cd3c40..361f55ec929b450e147b04dbfb7a07794b36f485 100644 (file)
@@ -111,7 +111,7 @@ namespace System.Net.Sockets
                        set;
                }
 
-#if !NET_2_1
+#if !MOBILE
                public TransmitFileOptions SendPacketsFlags {
                        get;
                        set;
index e987c5bd55f0c67461c3e0c6570d0b21efff6599..1ed7dfe075f6775de58a51649bb11d06c9bf9bc9 100644 (file)
@@ -51,7 +51,7 @@ namespace System.Net
                                        return;
                                
                                modules = new ArrayList ();
-#if NET_2_1
+#if MOBILE
                                modules.Add (new NtlmClient ());
                                modules.Add (new DigestClient ());
                                modules.Add (new BasicClient ());
index 1fbf80dc7ce4473a80518b3a7d07a146a956a538..9e2c655cb2dd9842e3afde14b817fe1b32b451e2 100644 (file)
@@ -185,7 +185,7 @@ namespace System.Net
                        }
                }
 
-#if !NET_2_1
+#if !MOBILE
                [MonoTODO]
                public static new RequestCachePolicy DefaultCachePolicy
                {
index 25ea0ad05775d865591e4dff30253b49a6e61439..25a5d2877fdc4e4d6409f3c4d8a14b26469593e6 100644 (file)
@@ -133,7 +133,7 @@ namespace System.Net
                static HttpWebRequest ()
                {
                        defaultMaxResponseHeadersLength = 64 * 1024;
-#if !NET_2_1
+#if !MOBILE
                        NetConfig config = ConfigurationSettings.GetConfig ("system.net/settings") as NetConfig;
                        if (config != null) {
                                int x = config.MaxResponseHeadersLength;
@@ -145,7 +145,7 @@ namespace System.Net
 #endif
                }
 
-#if NET_2_1
+#if MOBILE
                public
 #else
                internal
@@ -382,7 +382,7 @@ namespace System.Net
                                SetSpecialHeaders(headerName, HttpProtocolUtils.date2string(dateTime));
                }
 
-#if !NET_2_1
+#if !MOBILE
                [MonoTODO]
                public static new RequestCachePolicy DefaultCachePolicy
                {
index 32a0148b8ea749a5796ce9d2083ca021d73f9bbf..b3c996044ef3eb1fb7c24fa0e5040ffec577ef3b 100644 (file)
@@ -138,14 +138,14 @@ namespace System.Net
                public const int DefaultPersistentConnectionLimit = 2;
 #endif
 
-#if !NET_2_1
+#if !MOBILE
                const string configKey = "system.net/connectionManagement";
                static ConnectionManagementData manager;
 #endif
                
                static ServicePointManager ()
                {
-#if !NET_2_1
+#if !MOBILE
 #if CONFIGURATION_DEP
                        object cfg = ConfigurationManager.GetSection (configKey);
                        ConnectionManagementSection s = cfg as ConnectionManagementSection;
@@ -200,7 +200,7 @@ namespace System.Net
                                        throw new ArgumentOutOfRangeException ("value");
 
                                defaultConnectionLimit = value; 
-#if !NET_2_1
+#if !MOBILE
                 if (manager != null)
                                        manager.Add ("*", defaultConnectionLimit);
 #endif
@@ -356,7 +356,7 @@ namespace System.Net
                                        throw new InvalidOperationException ("maximum number of service points reached");
 
                                int limit;
-#if NET_2_1
+#if MOBILE
                                limit = defaultConnectionLimit;
 #else
                                string addr = address.ToString ();
index 2d7f9cf1415e0f2a7077ae75aa4e4ebd443a31ce..ea2fe62b6bfad1a2e875e4e96bb72a2d80cd471b 100644 (file)
@@ -27,7 +27,7 @@
 //
 
 using System.ComponentModel;
-#if !NET_2_1
+#if !MOBILE
 using System.ComponentModel.Design.Serialization;
 #endif
 using System.Globalization;
@@ -49,7 +49,7 @@ namespace System {
                                return true;
                        if (type == typeof (Uri))
                                return true;
-#if NET_2_1
+#if MOBILE
                        return false;
 #else
                        return (type == typeof (InstanceDescriptor));
@@ -75,7 +75,7 @@ namespace System {
                public override object ConvertFrom (ITypeDescriptorContext context, CultureInfo culture, object value)
                {
                        if (value == null) {
-#if NET_2_1
+#if MOBILE
                                throw new NotSupportedException (Locale.GetText ("Cannot convert from value."));
 #else
                                throw new ArgumentNullException ("value");
@@ -90,14 +90,14 @@ namespace System {
 
                        string s = (value as string);
                        if (s != null) {
-#if NET_2_1
+#if MOBILE
                                if (s == "")
                                        return null;
 #endif
                                return new Uri (s, UriKind.RelativeOrAbsolute);
                        }
 
-#if !NET_2_1
+#if !MOBILE
                        InstanceDescriptor id = (value as InstanceDescriptor);
                        if (id != null) {
                                return id.Invoke ();
@@ -117,7 +117,7 @@ namespace System {
                                        return uri.ToString ();
                                if (destinationType == typeof (Uri))
                                        return uri;
-#if !NET_2_1
+#if !MOBILE
                                if (destinationType == typeof (InstanceDescriptor)) {
                                        ConstructorInfo ci = typeof (Uri).GetConstructor (new Type [2] { typeof (string), typeof (UriKind) });
                                        return new InstanceDescriptor (ci , new object [] { uri.ToString (), uri.IsAbsoluteUri ? UriKind.Absolute : UriKind.Relative });
@@ -127,14 +127,14 @@ namespace System {
 #endif
                        }
 
-#if NET_2_1
+#if MOBILE
                        throw new NotSupportedException (Locale.GetText ("Cannot convert to destination type."));
 #else
                        return base.ConvertTo (context, culture, value, destinationType);
 #endif
                }
 
-#if !NET_2_1
+#if !MOBILE
                public override bool IsValid (ITypeDescriptorContext context, object value)
                {
                        if (value == null)
index 1d5e4e6dbdf62e370245a6e3cfbecacad5b41460..b9261cbe862d40e8baecf0b43b0c70094dd1be1e 100644 (file)
@@ -47,7 +47,7 @@ namespace MonoTests.System.ComponentModel {
                    Assert.AreEqual(CM.CategoryAttribute.Key.Category, "Key", "#9");
                    Assert.AreEqual(CM.CategoryAttribute.Layout.Category, "Layout", "#10");
                    Assert.AreEqual(CM.CategoryAttribute.Mouse.Category, "Mouse", "#11");
-#if NET_2_1
+#if MOBILE
                    Assert.AreEqual(CM.CategoryAttribute.Default.Category, "Default", "#12");
                    Assert.AreEqual(CM.CategoryAttribute.DragDrop.Category, "DragDrop", "#13");
                    Assert.AreEqual(CM.CategoryAttribute.WindowStyle.Category, "WindowStyle", "#14");
index 6f763923cbfd927440b42f597b707778c5809f0a..8922c14f00e65e1afe983af6cd8aa7b6d1a0685c 100644 (file)
@@ -87,7 +87,7 @@ public class ServicePointManagerTest
                ServicePointManager.MaxServicePoints = 0;\r
                ServicePoint sp = ServicePointManager.FindServicePoint (googleUri, new WebProxy (apacheUri));\r
                Assert.AreEqual (apacheUri, sp.Address, "#1");\r
-#if NET_2_1 && !MONODROID\r
+#if MOBILE && !MONODROID\r
                Assert.AreEqual (10, sp.ConnectionLimit, "#2");\r
 #else\r
                Assert.AreEqual (2, sp.ConnectionLimit, "#2");\r
index 3c68cceb82bd865d74cc309f0221d75921bfc667..75828e154eb12f2fc6f7c21db9258888f7cd3c33 100644 (file)
@@ -59,7 +59,7 @@ using System.Runtime.InteropServices;
 [assembly: CLSCompliant (true)]
 
 [assembly: AssemblyDelaySign (true)]
-#if NET_2_1
+#if MOBILE
        [assembly: AssemblyKeyFile ("../silverlight.pub")]
 #else
        [assembly: AssemblyKeyFile ("../ecma.pub")]
index 1cd1a7af0261df8aa8ad6fc4284617cadd8294a9..a0f17b0f19628aa6324538c6b019eb9e263223f7 100644 (file)
@@ -203,7 +203,7 @@ tzi.exe:System/AndroidPlatform.cs $(wildcard System/TimeZone*.cs) ../../build/co
        trap "rm -f $(TMP_FILE1) $(TMP_FILE2)" EXIT INT QUIT TERM && \
        sed 's/Environment\.GetResourceString/string.Format/g' ../referencesource/mscorlib/system/timezoneinfo.cs > $(TMP_FILE1) && \
        sed 's/StringBuilder\.DefaultCapacity/100/g' ../referencesource/mscorlib/system/text/stringbuildercache.cs > $(TMP_FILE2) && \
-       $(MCS) /debug+ /out:$@ -unsafe -nowarn:612,618 -d:INSIDE_CORLIB,MONO_CULTURE_DATA -d:LIBC $(REFERENCE_SOURCES_FLAGS) "/d:SELF_TEST;NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;MOBILE;MOBILE_DYNAMIC;MONODROID;ANDROID" $^ $(TMP_FILE1) $(TMP_FILE2)
+       $(MCS) /debug+ /out:$@ -unsafe -nowarn:612,618 -d:INSIDE_CORLIB,MONO_CULTURE_DATA -d:LIBC $(REFERENCE_SOURCES_FLAGS) "/d:SELF_TEST;NET_1_1;NET_2_0;MOBILE;NET_3_5;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;MOBILE;MOBILE_DYNAMIC;MONODROID;ANDROID" $^ $(TMP_FILE1) $(TMP_FILE2)
 
 android-pull-tzdb:
        mkdir -p android/tzdb/usr/share/zoneinfo
index b4ad9f294c3ea0f3f63c816d4339e96998fdec4a..b7eeefe229f9a9f7b76dfda14e5c97ab362e54be 100644 (file)
@@ -30,7 +30,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if !NET_2_1
+#if !MOBILE
 
 using System;
 using System.Text;
@@ -67,5 +67,5 @@ namespace Microsoft.Win32 {
        }
 }
 
-#endif // NET_2_1
+#endif // MOBILE
 
index 7994839edac8fde0f9224b6126003b1d4cd92bd1..a89a865de927950b2484432ef232d3b29034027c 100644 (file)
@@ -27,7 +27,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if !NET_2_1
+#if !MOBILE
 namespace Microsoft.Win32
 {
        public enum RegistryKeyPermissionCheck
index 757dc5eb2138566f88b5fcda188556348eee4fcd..30a035593a8b4f458c2e3a7adea3d6600ca873ce 100644 (file)
@@ -37,7 +37,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if !NET_2_1
+#if !MOBILE
 
 using System;
 using System.Collections;
@@ -1029,5 +1029,5 @@ namespace Microsoft.Win32 {
        }
 }
 
-#endif // NET_2_1
+#endif // MOBILE
 
index c5335ffd0e951c7110b139209055c0581dd99eb0..5b27b8aaf90cf7a371b61a6961e77b1f2d5d3a28 100644 (file)
@@ -33,7 +33,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if !NET_2_1
+#if !MOBILE
 
 using System;
 using System.Collections;
@@ -626,5 +626,5 @@ namespace Microsoft.Win32
        }
 }
 
-#endif // NET_2_1
+#endif // MOBILE
 
index 1d0cbdaa8598b3fc0113fa868725955a03d86d38..ba69eb7d5a453234476e8db68ff98145aa8be453 100644 (file)
@@ -30,7 +30,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if !NET_2_1
+#if !MOBILE
 
 using System;
 using System.Runtime.InteropServices;
@@ -61,5 +61,5 @@ namespace Microsoft.Win32
        }
 }
 
-#endif // NET_2_1
+#endif // MOBILE
 
index e51e9dbfc2833eecfc922a3e1f117753a5be742b..7de9ccce096a1f6fe2a526a743c5d9c777bfc9d7 100644 (file)
@@ -134,7 +134,7 @@ namespace System.Diagnostics {
                 
                 public virtual string GetFileName()
                 {
-#if !NET_2_1
+#if !MOBILE
                        if (SecurityManager.SecurityEnabled && (fileName != null) && (fileName.Length > 0)) {
                                string fn = Path.GetFullPath (fileName);
                                new FileIOPermission (FileIOPermissionAccess.PathDiscovery, fn).Demand ();
index 8b4a3504d3ad2c16973c0b1c33babe286981b7ba..7d043f2300c6d6a50f866eea25fd83b3c10084d9 100644 (file)
@@ -181,7 +181,7 @@ namespace System.Globalization
                        get { return territory; }
                }
 
-#if !NET_2_1
+#if !MOBILE
                // FIXME: It is implemented, but would be hell slow.
                [ComVisible (false)]
                public CultureTypes CultureTypes {
index ed773f6ca6a4505c369c790a608b55bcfb0617af..522f305e427fa8c6dfb7d64fa1fd8c747eaae44b 100644 (file)
@@ -86,7 +86,7 @@ namespace System.IO
 
                static DirectoryInfo CreateDirectoriesInternal (string path)
                {
-#if !NET_2_1
+#if !MOBILE
                        if (SecurityManager.SecurityEnabled) {
                                new FileIOPermission (FileIOPermissionAccess.Read | FileIOPermissionAccess.Write, path).Demand ();
                        }
@@ -232,7 +232,7 @@ namespace System.IO
                        SecurityManager.EnsureElevatedPermissions (); // this is a no-op outside moonlight
 
                        string result = InsecureGetCurrentDirectory();
-#if !NET_2_1
+#if !MOBILE
                        if ((result != null) && (result.Length > 0) && SecurityManager.SecurityEnabled) {
                                new FileIOPermission (FileIOPermissionAccess.PathDiscovery, result).Demand ();
                        }
index 92389257c5c788f84d7050c696d81075ff9109ee..de55602cdbe4437a6def908340a01e5156e25b94 100644 (file)
@@ -39,7 +39,7 @@ using System.Security;
 using System.Text;
 using System.Runtime.InteropServices;
 
-#if !NET_2_1
+#if !MOBILE
 using System.Security.AccessControl;
 #endif
 
@@ -147,7 +147,7 @@ namespace System.IO
                                FileShare.None, bufferSize, options);
                }
 
-#if !NET_2_1
+#if !MOBILE
                [MonoLimitation ("FileOptions and FileSecurity are ignored")]
                public static FileStream Create (string path, int bufferSize,
                                                 FileOptions options,
@@ -201,7 +201,7 @@ namespace System.IO
                        return MonoIO.ExistsFile (path, out error);
                }
 
-#if !NET_2_1
+#if !MOBILE
                public static FileSecurity GetAccessControl (string path)
                {
                        // AccessControlSections.Audit requires special permissions.
@@ -434,7 +434,7 @@ namespace System.IO
                        }
                }
 
-#if !NET_2_1
+#if !MOBILE
                public static void SetAccessControl (string path,
                                                     FileSecurity fileSecurity)
                {
index 0e20810547c0d9e635daa6c428388aed0d86b138..b2a15cd2b600fce61cdf1282ee7ce76695851966 100644 (file)
@@ -41,7 +41,7 @@ using System.Security.Permissions;
 using System.Threading;
 using Microsoft.Win32.SafeHandles;
 
-#if NET_2_1
+#if MOBILE
 using System.IO.IsolatedStorage;
 #else
 using System.Security.AccessControl;
@@ -176,7 +176,7 @@ namespace System.IO
                                throw new ArgumentOutOfRangeException ("bufferSize", "Positive number required.");
 
                        if (mode < FileMode.CreateNew || mode > FileMode.Append) {
-#if NET_2_1
+#if MOBILE
                                if (anonymous)
                                        throw new ArgumentException ("mode", "Enum value was out of legal range.");
                                else
@@ -942,7 +942,7 @@ namespace System.IO
                                throw exc;
                }
 
-#if !NET_2_1
+#if !MOBILE
                public FileSecurity GetAccessControl ()
                {
                        if (safeHandle.IsClosed)
index 994358c86bec2aff6ec7373da50dcd0ee17d515a..7297e18d7a2b308ba5b500b812e3a6ca1d79a2c3 100644 (file)
@@ -36,7 +36,7 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Threading;
 using Microsoft.Win32.SafeHandles;
-#if NET_2_1
+#if MOBILE
 using System.IO.IsolatedStorage;
 #endif
 
@@ -108,7 +108,7 @@ namespace System.IO
                                return new IOException (message, unchecked((int)0x80070000) | (int)error);
                        case MonoIOError.ERROR_INVALID_DRIVE:
                                message = String.Format ("Could not find the drive  '{0}'. The drive might not be ready or might not be mapped.", path);
-#if !NET_2_1
+#if !MOBILE
                                return new DriveNotFoundException (message);
 #else
                                return new IOException (message, unchecked((int)0x80070000) | (int)error);
index d0512f24695a2a5dbe3111080092742268f8da45..09ea4405953409657b36364b9a504f94e3487064 100644 (file)
@@ -281,7 +281,7 @@ namespace System.IO {
 
                        SecurityManager.EnsureElevatedPermissions (); // this is a no-op outside moonlight
 
-#if !NET_2_1
+#if !MOBILE
                        if (SecurityManager.SecurityEnabled) {
                                new FileIOPermission (FileIOPermissionAccess.PathDiscovery, fullpath).Demand ();
                        }
index 0a189e1faa7e70b7a2db00d32532f5ee80005c82..c098713ca97467dc23de1347023907bcf6062a09 100644 (file)
@@ -384,7 +384,7 @@ namespace System.Reflection.Emit
 
                internal void AddPermissionRequests (PermissionSet required, PermissionSet optional, PermissionSet refused)
                {
-#if !NET_2_1
+#if !MOBILE
                        if (created)
                                throw new InvalidOperationException ("Assembly was already saved.");
 
index d74a09a1cede25bf4933c69f466f1cdf9a1b2c97..681e7cf80585557cd629dbfc42388a7a5045cd8d 100644 (file)
@@ -201,7 +201,7 @@ namespace System.Reflection.Emit {
 
                public void AddDeclarativeSecurity (SecurityAction action, PermissionSet pset)
                {
-#if !NET_2_1
+#if !MOBILE
                        if (pset == null)
                                throw new ArgumentNullException ("pset");
                        if ((action == SecurityAction.RequestMinimum) ||
index 3772d98b82c90381dc2b8da1dba39a4308e8063e..84c01c97bb73907a6d40f8d93d6c7f0f2f31bfbf 100644 (file)
@@ -478,7 +478,7 @@ namespace System.Reflection.Emit
 
                public void AddDeclarativeSecurity (SecurityAction action, PermissionSet pset)
                {
-#if !NET_2_1
+#if !MOBILE
                        if (pset == null)
                                throw new ArgumentNullException ("pset");
                        if ((action == SecurityAction.RequestMinimum) ||
index 7216a169e468ac070f1c2a18e5090181bd3e3665..27553b18c7ea8bfcdab3acb52c447b299ed3c3ec 100644 (file)
@@ -259,7 +259,7 @@ namespace System.Reflection.Emit
 
                public void AddDeclarativeSecurity (SecurityAction action, PermissionSet pset)
                {
-#if !NET_2_1
+#if !MOBILE
                        if (pset == null)
                                throw new ArgumentNullException ("pset");
                        if ((action == SecurityAction.RequestMinimum) ||
index 174d5da5813c72bd9f6b960af06813128db67a7d..e9418c03393cd31d623a83f566b8f75ff06b945e 100644 (file)
@@ -145,7 +145,7 @@ namespace System.Reflection {
                private string GetCodeBase (bool escaped)
                {
                        string cb = get_code_base (escaped);
-#if !NET_2_1
+#if !MOBILE
                        if (SecurityManager.SecurityEnabled) {
                                // we cannot divulge local file informations
                                if (String.Compare ("FILE://", 0, cb, 0, 7, true, CultureInfo.InvariantCulture) == 0) {
@@ -215,7 +215,7 @@ namespace System.Reflection {
                                        return String.Empty;
 
                                string loc = get_location ();
-#if !NET_2_1
+#if !MOBILE
                                if ((loc != String.Empty) && SecurityManager.SecurityEnabled) {
                                        // we cannot divulge local file informations
                                        new FileIOPermission (FileIOPermissionAccess.PathDiscovery, loc).Demand ();
@@ -531,7 +531,7 @@ namespace System.Reflection {
                public static Assembly LoadFrom (String assemblyFile, Evidence securityEvidence)
                {
                        Assembly a = LoadFrom (assemblyFile, false);
-#if !NET_2_1
+#if !MOBILE
                        if ((a != null) && (securityEvidence != null)) {
                                // merge evidence (i.e. replace defaults with provided evidences)
                                a.Evidence.Merge (securityEvidence);
@@ -803,7 +803,7 @@ namespace System.Reflection {
                        return other._mono_assembly == _mono_assembly;
                }
 
-#if !NET_2_1
+#if !MOBILE
                // Code Access Security
 
                internal void Resolve () 
index 9668f1f56c2b85e6bd47899349e8a2b6323fdb79..28a727924cda0a7cd70aec8bc9310166dfc8fb8e 100644 (file)
@@ -253,7 +253,7 @@ namespace System.Reflection {
                        }
 
                        addHandlerType = addHandlerDelegateType.MakeGenericType (typeVector);
-#if NET_2_1
+#if MOBILE
                        // with Silverlight a coreclr failure (e.g. Transparent caller creating a delegate on a Critical method)
                        // would normally throw an ArgumentException, so we set throwOnBindFailure to false and check for a null
                        // delegate that we can transform into a MethodAccessException
index c93233dfffb57af19d0eaa9cc7092a2125e01739..9e5197df13c168d2f9ac1e5cdc407832e1d45766 100644 (file)
@@ -305,7 +305,7 @@ namespace System.Reflection {
                                o = InternalInvoke (obj, parameters, out exc);
                        } catch (ThreadAbortException) {
                                throw;
-#if NET_2_1
+#if MOBILE
                        } catch (MethodAccessException) {
                                throw;
 #endif
@@ -659,7 +659,7 @@ namespace System.Reflection {
 
                        try {
                                o = InternalInvoke (obj, parameters, out exc);
-#if NET_2_1
+#if MOBILE
                        } catch (MethodAccessException) {
                                throw;
 #endif
index 6edaf0de37ca8173818d8258f5c5cd4f6d95792d..25bde841e99c53deb4a93a7c51a9aa1713970930 100644 (file)
@@ -90,7 +90,7 @@ namespace System.Reflection {
                public override
                string FullyQualifiedName {
                        get {
-#if !NET_2_1
+#if !MOBILE
                                if (SecurityManager.SecurityEnabled) {
                                        new FileIOPermission (FileIOPermissionAccess.PathDiscovery, fqname).Demand ();
                                }
@@ -283,7 +283,7 @@ namespace System.Reflection {
                        UnitySerializationHolder.GetUnitySerializationInfo (info, UnitySerializationHolder.ModuleUnity, this.ScopeName, this.GetRuntimeAssembly ());
                }
 
-#if !NET_2_1
+#if !MOBILE
 
                public
                override
index 87310b19e2fa8d22835a84f4e05b3d75e0d9b932..16f44ec583b4ef4b0ac57ca9d9134b74e4f95ac4 100644 (file)
@@ -359,7 +359,7 @@ namespace System.Reflection {
                        }
 
                        getterType = getterDelegateType.MakeGenericType (typeVector);
-#if NET_2_1
+#if MOBILE
                        // with Silverlight a coreclr failure (e.g. Transparent caller creating a delegate on a Critical method)
                        // would normally throw an ArgumentException, so we set throwOnBindFailure to false and check for a null
                        // delegate that we can transform into a MethodAccessException
index aff2ae187e6e69546a111e67f70b70a279f0ced9..bfa10d8b9cfbd1b2baab220cfe315d219c3e67da 100644 (file)
@@ -121,7 +121,7 @@ public class StrongNameKeyPair : ISerializable, IDeserializationCallback
                                _keyPairArray = null;
                        }
                }
-#if !NET_2_1
+#if !MOBILE
                else if (_keyPairContainer != null) {
                        CspParameters csp = new CspParameters ();
                        csp.KeyContainerName = _keyPairContainer;
index bd5e9010c2e469b5a9aece63ad52eea5a505a199..5c5c69e4e9f3ab052416d9d0577dde2418a494c5 100644 (file)
@@ -37,7 +37,7 @@ namespace System.Reflection
 {
        [ComVisible (true)]
        [Serializable]
-#if NET_2_1
+#if MOBILE
        public class TargetException : Exception {
 #else
        public class TargetException : ApplicationException {
index 345368f79953249d76717ecb57b2fbb2fc8471c2..5f56432a85256603950e39aeee13812f97f6bc67 100644 (file)
@@ -36,7 +36,7 @@ namespace System.Reflection
 {
        [ComVisible (true)]
        [Serializable]
-#if NET_2_1
+#if MOBILE
        public sealed class TargetInvocationException : Exception {
 #else
        public sealed class TargetInvocationException : ApplicationException {
index deb5344e1576e5f078409a2f3633face0e2a0bd2..8b6c2b218e79c70b00611bc7f5bf2d20c575efcc 100644 (file)
@@ -37,7 +37,7 @@ namespace System.Reflection
 {
        [ComVisible (true)]
        [Serializable]
-#if NET_2_1
+#if MOBILE
        public sealed class TargetParameterCountException : Exception {
 #else
        public sealed class TargetParameterCountException : ApplicationException {
index a30e29ce22d696bd8a3b810212421137de6da3de..c8b640e10b5e5a8f046eb8d07de6358ad3c695d2 100644 (file)
@@ -87,7 +87,7 @@ namespace System.Runtime.InteropServices
 
                string Location { get; }
 
-#if !NET_2_1
+#if !MOBILE
                Evidence Evidence { get; }
 #endif
 
@@ -129,7 +129,7 @@ namespace System.Runtime.InteropServices
 
                AssemblyName[] GetReferencedAssemblies ();
 
-#if !NET_2_1
+#if !MOBILE
                bool GlobalAssemblyCache { get; }
 #endif
 
index 71f1269b285b728341cc1338cb8efbd054abfa67..57094710db84265a20122e2a1ca2e628833ce974 100644 (file)
@@ -213,7 +213,7 @@ namespace System.Runtime.Remoting.Activation
 
                        if (type.IsContextful)
                                return RemotingServices.CreateClientProxyForContextBound (type, null);
-#if !NET_2_1
+#if !MOBILE
                        if (type.IsCOMObject) {
                                return RemotingServices.CreateClientProxyForComInterop (type);
                        }
index 1b35fe1ee90b75337e05ce72f68a2e9017a9bc7f..d2b99281c3b4143b74566ab73fb8965b321b516f 100644 (file)
@@ -581,7 +581,7 @@ namespace System.Runtime.Remoting
                        RemotingProxy proxy = new RemotingProxy (type, ChannelServices.CrossContextUrl, activationAttributes);
                        return proxy.GetTransparentProxy();
                }
-#if !NET_2_1
+#if !MOBILE
                internal static object CreateClientProxyForComInterop (Type type)
                {
                        Mono.Interop.ComInteropProxy proxy = Mono.Interop.ComInteropProxy.CreateProxy (type);
index 135b270e508bb123f5f1226ee18710b2942347ca..46398d8561d24d2eac78765831a8b4189a1322df 100644 (file)
@@ -48,7 +48,7 @@ namespace System.Security.Cryptography.X509Certificates {
        // and/or Authenticode certs. However this class works with older
        // X509v1 certificates and non-authenticode (code signing) certs.
        [Serializable]
-#if NET_2_1
+#if MOBILE
        public partial class X509Certificate {
 #else
        public partial class X509Certificate : IDeserializationCallback, ISerializable {
index 42fca5acade25e2980a400e91e84ff259bcd6fd9..3467dc8038eb325fe643405daef226e1695b2cbb 100644 (file)
@@ -37,7 +37,7 @@ namespace System.Security.Cryptography.X509Certificates {
        enum X509ContentType {
                Unknown,
                Cert,
-               // not supported by Silverlight 2.0 (NET_2_1)
+               // not supported by Silverlight 2.0 (MOBILE)
                SerializedCert,
                Pfx,
                SerializedStore,
index c12fa6229cf4f8ffe84d07dc5e6d309aea9a676f..8bdd3db4daa29b51bf198b0379ff2b5df3b68e8d 100644 (file)
@@ -32,7 +32,7 @@ using System;
 using System.Text;
 using System.Threading;
 using System.Runtime.InteropServices;
-#if !NET_2_1
+#if !MOBILE
 using System.Security.Permissions;
 #endif
 using MX = Mono.Security.X509;
@@ -49,7 +49,7 @@ namespace System.Security.Cryptography.X509Certificates
                                Interlocked.CompareExchange (ref nativeHelper, helper, null);
                }
 
-#if !NET_2_1
+#if !MOBILE
                // typedef struct _CERT_CONTEXT {
                //      DWORD                   dwCertEncodingType;
                //      BYTE                    *pbCertEncoded;
index ce375c2aeacecde9a7cf1cb2878da7bb7a067072..9d4c28641500136922a4455dfc6cb1979c7cf0a7 100644 (file)
@@ -35,7 +35,7 @@ namespace System.Security.Cryptography.X509Certificates {
        [ComVisible (true)]
        public enum X509KeyStorageFlags {
                DefaultKeySet = 0,
-               // not supported by Silverlight 2.0 (NET_2_1)
+               // not supported by Silverlight 2.0 (MOBILE)
                UserKeySet = 1,
                MachineKeySet = 2,
                Exportable = 4,
index 29e40efbadfdddbc2247ca6b0c066162ea00881f..8a98c9d5ad849b43707eedfd77ec93b5de597c53 100644 (file)
@@ -40,7 +40,7 @@ using System.Text;
 
 namespace System.Security.Cryptography {
        
-#if !NET_2_1
+#if !MOBILE
        [ComVisible (true)]
 #endif
        public sealed class RNGCryptoServiceProvider : RandomNumberGenerator {
@@ -58,7 +58,7 @@ namespace System.Security.Cryptography {
                        _handle = RngInitialize (null);
                        Check ();
                }
-#if !NET_2_1
+#if !MOBILE
                public RNGCryptoServiceProvider (byte[] rgb)
                {
                        _handle = RngInitialize (rgb);
index 5714862cbde0d9bf3f13786374eed5cf4479fb8a..05f56decf4a2b7b088d9bbf561f87581ba0852e4 100644 (file)
@@ -31,7 +31,7 @@ using System.Runtime.InteropServices;
 
 namespace System.Security.Permissions {
 
-#if NET_2_1 && !MONOTOUCH
+#if MOBILE && !MONOTOUCH
        [Obsolete ("CAS support is not available with Silverlight applications.")]
 #endif
        [ComVisible (true)]
index 3e1c714e375329743cc18ee74609ca001eb415e2..d943508a991271a38b1e2f9c130ac3e724b1def9 100644 (file)
@@ -71,7 +71,7 @@ namespace System.Security.Permissions {
                // Methods
                public override IPermission CreatePermission ()
                {
-#if NET_2_1
+#if MOBILE
                        return null;
 #else
                        EnvironmentPermission perm = null;
index 5f7fbff2d8633920d2992246abc814cf2e67a99b..3a3250d47dda2ac67d4feece85abca97820b81ae 100644 (file)
@@ -120,7 +120,7 @@ namespace System.Security.Permissions {
                // Methods
                public override IPermission CreatePermission ()
                {
-#if NET_2_1
+#if MOBILE
                        return null;
 #else
                        FileIOPermission perm = null;
index dd7aa04d3d88e7ab9107582bd63762c3ece01a9e..3afcb62ede468df1c48b3f7999f35164aecb2e4d 100644 (file)
@@ -175,7 +175,7 @@ namespace System.Security.Permissions {
 
                public override IPermission CreatePermission ()
                {
-#if NET_2_1
+#if MOBILE
                        return null;
 #else
                        // looks like permission is internal
index 3e8381721bbd402d34e6a8be541733dbaa13473b..aa6999b8a22bf846f82f02587a9dad3748f64ee7 100644 (file)
@@ -90,7 +90,7 @@ namespace System.Security.Permissions {
 
                private PermissionSet CreateFromXml (string xml) 
                {
-#if !NET_2_1
+#if !MOBILE
                        SecurityParser sp = new SecurityParser ();
                        try {
                                sp.LoadXml (xml);
@@ -125,7 +125,7 @@ namespace System.Security.Permissions {
                public PermissionSet CreatePermissionSet ()
                {
                        PermissionSet pset = null;
-#if !NET_2_1
+#if !MOBILE
                        if (this.Unrestricted)
                                pset = new PermissionSet (PermissionState.Unrestricted);
                        else {
index 68d85e81064b0ee0abef7798e76020fef7442b58..8680139527940bf7daa4cf0c78c393e2d766946e 100644 (file)
@@ -113,7 +113,7 @@ namespace System.Security.Permissions {
                // Methods
                public override IPermission CreatePermission ()
                {
-#if NET_2_1
+#if MOBILE
                        return null;
 #else
                        ReflectionPermission perm = null;
index 94d14df749a69d1c3990f8234e6e341ed6be6e43..2af0d262aea3286c97cc624ef91fff9bc6e4618f 100644 (file)
@@ -35,7 +35,7 @@ using System.Runtime.InteropServices;
 
 namespace System.Security.Permissions {
 
-#if NET_2_1 && !MONOTOUCH
+#if MOBILE && !MONOTOUCH
        [Obsolete ("CAS support is not available with Silverlight applications.")]
 #endif
        [ComVisible (true)]
index f871175e42343fac9e03d12149d9de093440a049..276a9144396b86ff38158bf5f8ece168d019d0ee 100644 (file)
@@ -31,7 +31,7 @@ using System.Runtime.InteropServices;
 
 namespace System.Security.Permissions {
 
-#if NET_2_1 && !MONOTOUCH
+#if MOBILE && !MONOTOUCH
        [Obsolete ("CAS support is not available with Silverlight applications.")]
 #endif
        [ComVisible (true)]
index cf37722731b90a1ab9e544a9127439ba5ba5a9f5..3cdc150e8d958689be9c9718a16db687a98b43b0 100644 (file)
@@ -31,7 +31,7 @@ using System.Runtime.InteropServices;
 
 namespace System.Security.Permissions {
 
-#if NET_2_1 && !MONOTOUCH
+#if MOBILE && !MONOTOUCH
        [Obsolete ("CAS support is not available with Silverlight applications.")]
 #endif
        [ComVisible (true)]
@@ -251,7 +251,7 @@ namespace System.Security.Permissions {
 
                public override IPermission CreatePermission ()
                {
-#if NET_2_1
+#if MOBILE
                        return null;
 #else
                        SecurityPermission perm = null;
index 9e5517bd40662763d02a2f7f7de91cca26b98687..f5c246e6b0214b97cd40092938b0fc5cb1b9cff8 100644 (file)
@@ -34,7 +34,7 @@ using System.Runtime.InteropServices;
 
 namespace System.Security.Permissions {
 
-#if NET_2_1 && !MONOTOUCH
+#if MOBILE && !MONOTOUCH
        [Obsolete ("CAS support is not available with Silverlight applications.")]
 #endif
        [ComVisible (true)]
index c710c3d764b805782da7e24dddb91b68836c207b..52a120d4909c23905247a6c79b14a4199a599666 100644 (file)
@@ -70,7 +70,7 @@ namespace System.Security.Permissions {
                // Methods
                public override IPermission CreatePermission ()
                {
-#if NET_2_1
+#if MOBILE
                        return null;
 #else
                        if (this.Unrestricted)
index 307c9d788a3c33f9ca99e9c659bc89795bf4e314..66e6bec14e5e541dcb6e19990c29a57d1e2ae923 100644 (file)
@@ -225,7 +225,7 @@ namespace System.Security.Policy {
                // "possible" presence of an Authenticode signature
                [MethodImplAttribute (MethodImplOptions.InternalCall)]
                static extern bool IsAuthenticodePresent (Assembly a);
-#if NET_2_1
+#if MOBILE
                static internal Evidence GetDefaultHostEvidence (Assembly a)
                {
                        return new Evidence ();
@@ -287,7 +287,7 @@ namespace System.Security.Policy {
                        return e;
                }
 
-#endif // NET_2_1
+#endif // MOBILE
 
                private class EvidenceEnumerator : IEnumerator {
                        
index 470b408613938d28c198385407238e60c8460fb1..43ef36220211882427986118fd6d483177064364 100644 (file)
@@ -31,7 +31,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_1
+#if MOBILE
 
 namespace System.Security.Policy {
 
index 376e69998c984c4b1a6e297a1c70596066fd9d9c..c933e5e46b807b6f39a34618a1f85f230fb112f8 100644 (file)
@@ -29,7 +29,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if !NET_2_1
+#if !MOBILE
 
 using System.Collections;
 using System.Diagnostics;
index fba21dc3ce56b3a51a69c083fef85fc8fa16763c..0594eb1d8c559a2db09567fae040c28328df6380 100644 (file)
@@ -221,7 +221,7 @@ namespace System.Threading
                        disposed = true;
                }
 
-#if !NET_2_1
+#if !MOBILE
                public void SetAccessControl (EventWaitHandleSecurity eventSecurity)
                {
                        if (null == eventSecurity)
index 6216e3101370d363c805382bdd6d67a27cc84b42..9c88bce4d94c2f7bd4255047e6d6c21660f59e2a 100644 (file)
@@ -206,7 +206,7 @@ namespace System.Threading
                        }
                }
 
-#if !NET_2_1
+#if !MOBILE
                public void SetAccessControl (MutexSecurity mutexSecurity)
                {
                        if (null == mutexSecurity)
index 13cc078e575b0b757017347382bd9d393214a78d..76a637ea631fbd4b64cfaf30bdb37607954f8380 100644 (file)
@@ -116,7 +116,7 @@ namespace System {
                [MethodImplAttribute (MethodImplOptions.InternalCall)]
                private extern AppDomainSetup getSetup ();
 
-#if NET_2_1
+#if MOBILE
                internal
 #endif
                AppDomainSetup SetupInformationNoCopy {
@@ -130,7 +130,7 @@ namespace System {
                        }
                }
 
-#if !NET_2_1
+#if !MOBILE
                [MonoTODO]
                public ApplicationTrust ApplicationTrust {
                        get { throw new NotImplementedException (); }
@@ -139,7 +139,7 @@ namespace System {
                public string BaseDirectory {
                        get {
                                string path = SetupInformationNoCopy.ApplicationBase;
-#if !NET_2_1
+#if !MOBILE
                                if (SecurityManager.SecurityEnabled && (path != null) && (path.Length > 0)) {
                                        // we cannot divulge local file informations
                                        new FileIOPermission (FileIOPermissionAccess.PathDiscovery, path).Demand ();
@@ -152,7 +152,7 @@ namespace System {
                public string RelativeSearchPath {
                        get {
                                string path = SetupInformationNoCopy.PrivateBinPath;
-#if !NET_2_1
+#if !MOBILE
                                if (SecurityManager.SecurityEnabled && (path != null) && (path.Length > 0)) {
                                        // we cannot divulge local file informations
                                        new FileIOPermission (FileIOPermissionAccess.PathDiscovery, path).Demand ();
@@ -169,7 +169,7 @@ namespace System {
                                        return null;
 
                                string path = Path.Combine (setup.DynamicBase, setup.ApplicationName);
-#if !NET_2_1
+#if !MOBILE
                                if (SecurityManager.SecurityEnabled && (path != null) && (path.Length > 0)) {
                                        // we cannot divulge local file informations
                                        new FileIOPermission (FileIOPermissionAccess.PathDiscovery, path).Demand ();
@@ -311,7 +311,7 @@ namespace System {
                        SetupInformationNoCopy.ShadowCopyDirectories = String.Empty;
                }
 
-#if !NET_2_1
+#if !MOBILE
                public ObjectHandle CreateComInstanceFrom (string assemblyName, string typeName)
                {
                        return Activator.CreateComInstanceFrom (assemblyName, typeName);
@@ -1027,7 +1027,7 @@ namespace System {
                        } else if (info.ConfigurationFile == null)
                                info.ConfigurationFile = "[I don't have a config file]";
 
-#if !NET_2_1
+#if !MOBILE
                        if (info.AppDomainInitializer != null) {
                                if (!info.AppDomainInitializer.Method.IsStatic)
                                        throw new ArgumentException ("Non-static methods cannot be invoked as an appdomain initializer");
@@ -1047,7 +1047,7 @@ namespace System {
                        else
                                ad._evidence = new Evidence (securityInfo);     // copy
 
-#if !NET_2_1
+#if !MOBILE
                        if (info.AppDomainInitializer != null) {
                                Loader loader = new Loader (
                                        info.AppDomainInitializer.Method.DeclaringType.Assembly.Location);
@@ -1082,7 +1082,7 @@ namespace System {
                }
 #endif // MONO_FEATURE_MULTIPLE_APPDOMAINS
 
-#if !NET_2_1
+#if !MOBILE
                [Serializable]
                class Loader {
 
@@ -1133,7 +1133,7 @@ namespace System {
                }
 #endif // MONO_FEATURE_MULTIPLE_APPDOMAINS
                
-#if !NET_2_1
+#if !MOBILE
 #if MONO_FEATURE_MULTIPLE_APPDOMAINS
                public static AppDomain CreateDomain (string friendlyName, Evidence securityInfo, AppDomainSetup info,
                                                      PermissionSet grantSet, params StrongName [] fullTrustAssemblies)
@@ -1217,14 +1217,14 @@ namespace System {
                        SetData (name, data);
                }
 
-#if !NET_2_1
+#if !MOBILE
                [Obsolete ("Use AppDomainSetup.DynamicBase")]
                [SecurityPermission (SecurityAction.LinkDemand, ControlAppDomain = true)]
                public void SetDynamicBase (string path)
                {
                        SetupInformationNoCopy.DynamicBase = path;
                }
-#endif // !NET_2_1
+#endif // !MOBILE
 
                [Obsolete ("AppDomain.GetCurrentThreadId has been deprecated"
                        + " because it does not provide a stable Id when managed"
@@ -1286,7 +1286,7 @@ namespace System {
                private Assembly DoAssemblyResolve (string name, Assembly requestingAssembly, bool refonly)
                {
                        ResolveEventHandler del;
-#if !NET_2_1
+#if !MOBILE
                        if (refonly)
                                del = ReflectionOnlyAssemblyResolve;
                        else
index cc45ffd33dec20d26d79f32370a71229609cfe71..f71ed54da603271305ef4abd880cd06687a396b8 100644 (file)
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_1
+#if MOBILE
 
 using System.Runtime.InteropServices;
 using System.Security;
index b3e2d510138af5bcc9b4fafc390304de7cd1a159..c1865f34bd366939da81af189dc94ab10a203ce4 100644 (file)
@@ -47,7 +47,7 @@ namespace System
        [ClassInterface (ClassInterfaceType.None)]
        [ComVisible (true)]
        [StructLayout (LayoutKind.Sequential)]
-#if NET_2_1
+#if MOBILE
        public sealed class AppDomainSetup
 #else
        public sealed class AppDomainSetup : IAppDomainSetup
index 730b67a73f19a1ea1f2a8255611067cb0d114c6a..8e51aed83619d3337586e23874856c2d5120f3af 100644 (file)
@@ -29,7 +29,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if !NET_2_1
+#if !MOBILE
 using System.Text;
 using System.Runtime.InteropServices;
 
index 5eaa353dc6c71bdb1c1e06b5ee60e8b07a4046d8..ff6fc63a25acd9653c5e9e4873f574adc2fda50a 100644 (file)
@@ -31,7 +31,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if !NET_2_1
+#if !MOBILE
 using System;
 using System.Text;
 
index 2e7c4f4531cb5242216108d55f3cecb01860ffef..6a43f9cd8089fdb8cbb15eaf8569454e9877210c 100644 (file)
@@ -41,7 +41,7 @@ namespace System
 {
        public static partial class Console
        {
-#if !NET_2_1
+#if !MOBILE
                private class WindowsConsole
                {
                        public static bool ctrlHandlerAdded = false;
@@ -100,7 +100,7 @@ namespace System
                                //
                                // On Windows, follow the Windows tradition
                                //
-#if NET_2_1
+#if MOBILE
                                // should never happen since Moonlight does not run on windows
                                inputEncoding = outputEncoding = Encoding.Default;
 #else                  
@@ -134,7 +134,7 @@ namespace System
 
                static void SetupStreams (Encoding inputEncoding, Encoding outputEncoding)
                {
-#if !NET_2_1
+#if !MOBILE
                        if (!Environment.IsRunningOnWindows && ConsoleDriver.IsConsole) {
                                stdin = new CStreamReader (OpenStandardInput (0), inputEncoding);
                                stdout = TextWriter.Synchronized (new CStreamWriter (OpenStandardOutput (0), outputEncoding, true) { AutoFlush = true });
@@ -488,7 +488,7 @@ namespace System
                        stdout.WriteLine (String.Format (format, args));
                }
 
-#if !NET_2_1
+#if !MOBILE
                public static int Read ()
                {
                        if ((stdin is CStreamReader) && ConsoleDriver.IsConsole) {
@@ -539,7 +539,7 @@ namespace System
                        }
                }
 
-#if !NET_2_1
+#if !MOBILE
                public static ConsoleColor BackgroundColor {
                        get { return ConsoleDriver.BackgroundColor; }
                        set { ConsoleDriver.BackgroundColor = value; }
index cf1faa8da1028708951c04e175ad55a97b9343e2..07354a9aeb697ee3e92323a30b84434892f2f95e 100644 (file)
@@ -27,7 +27,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if !NET_2_1
+#if !MOBILE
 using System.IO;
 using System.Runtime.CompilerServices;
 
index b6a2d92eef7f8644942936af9c06aa92437233f3..4bd15db01a2c535a10bb7e634bca7c9d8ce52fd6 100644 (file)
@@ -322,7 +322,7 @@ namespace System {
                                return trace.ToString ();
                        }
                }
-#if !NET_2_1
+#if !MOBILE
                /// <summary>
                /// Get a fully qualified path to the system directory
                /// </summary>
@@ -480,7 +480,7 @@ namespace System {
                /// </summary>
                public static string GetEnvironmentVariable (string variable)
                {
-#if !NET_2_1
+#if !MOBILE
                        if (SecurityManager.SecurityEnabled) {
                                new EnvironmentPermission (EnvironmentPermissionAccess.Read, variable).Demand ();
                        }
@@ -503,7 +503,7 @@ namespace System {
                /// <summary>
                /// Return a set of all environment variables and their values
                /// </summary>
-#if !NET_2_1
+#if !MOBILE
                public static IDictionary GetEnvironmentVariables ()
                {
                        StringBuilder sb = null;
@@ -565,7 +565,7 @@ namespace System {
                        else
                                dir = UnixGetFolderPath (folder, option);
 
-#if !NET_2_1
+#if !MOBILE
                        if ((dir != null) && (dir.Length > 0) && SecurityManager.SecurityEnabled) {
                                new FileIOPermission (FileIOPermissionAccess.PathDiscovery, dir).Demand ();
                        }
@@ -927,7 +927,7 @@ namespace System {
                }
 #endif
 
-#if !NET_2_1
+#if !MOBILE
                //
                // Used by gacutil.exe
                //
index ecec3b508b2c32b309de3bfa33770b20c04d9d07..09cba85976a2f4357ac85b3ea1aef9c13e367e2f 100644 (file)
@@ -26,7 +26,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if !NET_2_1
+#if !MOBILE
 using System.Runtime.InteropServices;
 using System.Text;
 namespace System {
index 11f6c67dbd4e4d73c69b0a3b4a007025069ea7bd..32c4aa0885b2caa2676ba3e51639571992187c09 100644 (file)
@@ -41,7 +41,7 @@ namespace System
        [ComVisible (true)]
        public static class Nullable {
 
-#if NET_2_1
+#if MOBILE
                [ComVisible (false)]
 #endif
                public static int Compare<T> (T? n1, T? n2) where T: struct
@@ -56,7 +56,7 @@ namespace System
                        return n2.has_value ? -1 : 0;
                }
 
-#if NET_2_1
+#if MOBILE
                [ComVisible (false)]
 #endif
                public static bool Equals<T> (T? n1, T? n2) where T: struct
index 5ab662ab0618133752ae4d0f439c447c3e6df049..ff6cc88a8096815dc51967017dd6bd835d5a894e 100644 (file)
@@ -33,7 +33,7 @@
 // https://github.com/dotnet/corefx
 // src/System.Console/src/System/ConsolePal.Unix.cs
 //
-#if !NET_2_1
+#if !MOBILE
 
 //
 // Defining this writes the output to console.log
index fb547d4f58cbf65f9414805e79faae68a93221f3..b0b89f225c0292ece8e53139f5ca74ddfe440bc8 100644 (file)
@@ -27,7 +27,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if !NET_2_1
+#if !MOBILE
 
 // These values are taken from 'man 5 terminfo' and /usr/include/term.h.
 // They are the indexes for the numeric capabilities in a terminfo file.
index 6424d4fb79a74e81837f8e64d441f228384725a6..1a1ec6a94221672c8e17acfaa6be01890f7394df 100644 (file)
@@ -27,7 +27,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if !NET_2_1
+#if !MOBILE
 using System.IO;
 using System.Text;
 namespace System {
index 4baa2793d81fce6f1d92583ef50e4f054bf602f7..d795ef91adcdf1654a15229df81c8536f864e726 100644 (file)
@@ -27,7 +27,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if !NET_2_1
+#if !MOBILE
 
 // These values are taken from 'man 5 terminfo' and /usr/include/term.h.
 // They are the indexes for the string capabilities in a terminfo file.
index ff76486877cfb2427ccf2b5f9069985552b4c3d2..1b070928c5505a05a65c0f699c220964226a6bb2 100644 (file)
@@ -273,7 +273,7 @@ namespace System
 #endif
                private AdjustmentRule [] adjustmentRules;
 
-#if !NET_2_1 || MOBILE_STATIC
+#if !MOBILE || MOBILE_STATIC
                /// <summary>
                /// Determine whether windows of not (taken Stephane Delcroix's code)
                /// </summary>
@@ -531,7 +531,7 @@ namespace System
                        //FIXME: this method should check for cached values in systemTimeZones
                        if (id == null)
                                throw new ArgumentNullException ("id");
-#if !NET_2_1
+#if !MOBILE
                        if (TimeZoneKey != null)
                        {
                                if (id == "Coordinated Universal Time")
@@ -561,7 +561,7 @@ namespace System
                }
 #endif
 
-#if !NET_2_1
+#if !MOBILE
                private static TimeZoneInfo FromRegistryKey (string id, RegistryKey key)
                {
                        byte [] reg_tzi = (byte []) key.GetValue ("TZI");
index 7ba2a7abd4c24423c204ddc4c898fa2a7afeee7f..cfbb19afb347b281de4426a9e4fc3772eb0a4746 100644 (file)
@@ -54,7 +54,7 @@ namespace System
                }
 
                //Constructors
-#if NET_2_1
+#if MOBILE
                protected WeakReference ()
                {
                }
index 2e8b643e3341b2beff1ed608ac3de5e292f6ede4..10ba8db45e5afdda5b1afc90d3892f5a6e649e0b 100755 (executable)
@@ -26,7 +26,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if !NET_2_1
+#if !MOBILE
 using System.Runtime.InteropServices;
 using System.Text;
 namespace System {
index 37c71de14bf3ce011d94bf4a11eab28e13c212ac..8cadc0f33135cecaff2bd5fb550d34d4ea0ebdcd 100644 (file)
@@ -159,7 +159,7 @@ namespace System
                [method: SecurityPermission (SecurityAction.LinkDemand, ControlAppDomain = true)]
                event UnhandledExceptionEventHandler UnhandledException;
 
-#if !NET_2_1
+#if !MOBILE
                void GetIDsOfNames ([In] ref Guid riid, IntPtr rgszNames, uint cNames, uint lcid, IntPtr rgDispId);
 
                void GetTypeInfo (uint iTInfo, uint lcid, IntPtr ppTInfo);
index 66eb27ed32407833e14b69f9fc6cb357b4f3d7ab..474a3bba20c312e1d321d279cbce27bf2a997e15 100644 (file)
@@ -124,7 +124,7 @@ namespace MonoTests.System.IO.IsolatedStorageTest {
                        IsolatedStorageFile isf = IsolatedStorageFile.GetUserStoreForAssembly ();
                        Assert.AreEqual (Int64.MaxValue, isf.MaximumSize, "MaximumSize");
                        Assert.AreEqual (IsolatedStorageScope.User | IsolatedStorageScope.Assembly, isf.Scope, "Scope");
-#if !NET_2_1
+#if !MOBILE
                        Assert.IsTrue ((isf.AssemblyIdentity is Url), "AssemblyIdentity");
                        // note: mono transforms the CodeBase into uppercase
                        // for net 1.1 which uses file:// and not file:///
@@ -157,7 +157,7 @@ namespace MonoTests.System.IO.IsolatedStorageTest {
                        IsolatedStorageFile isf = IsolatedStorageFile.GetUserStoreForDomain ();
                        Assert.AreEqual (Int64.MaxValue, isf.MaximumSize, "MaximumSize");
                        Assert.AreEqual (IsolatedStorageScope.User | IsolatedStorageScope.Domain | IsolatedStorageScope.Assembly, isf.Scope, "Scope");
-#if !NET_2_1
+#if !MOBILE
                        Assert.IsTrue ((isf.AssemblyIdentity is Url), "AssemblyIdentity");
                        // note: mono transforms the CodeBase into uppercase
                        // for net 1.1 which uses file:// and not file:///
@@ -198,7 +198,7 @@ namespace MonoTests.System.IO.IsolatedStorageTest {
                {
                        IsolatedStorageFile isf = IsolatedStorageFile.GetUserStoreForApplication ();
                        Assert.AreEqual (Int64.MaxValue, isf.MaximumSize, "MaximumSize");
-#if !NET_2_1
+#if !MOBILE
                        Assert.AreEqual (IsolatedStorageScope.User | IsolatedStorageScope.Assembly, isf.Scope, "Scope");
                        Assert.IsTrue ((isf.AssemblyIdentity is Url), "AssemblyIdentity");
                        Assert.IsTrue ((isf.AssemblyIdentity.ToString ().IndexOf (Assembly.GetExecutingAssembly ().CodeBase) > 0), "Url");
@@ -206,7 +206,7 @@ namespace MonoTests.System.IO.IsolatedStorageTest {
                        Assert.IsTrue ((isf.CurrentSize >= 0), "CurrentSize");
                }
                
-#if !NET_2_1
+#if !MOBILE
                [Test]
                [ExpectedException (typeof (IsolatedStorageException))]
                public void GetUserStoreForApplication_AssemblyIdentity ()
@@ -238,7 +238,7 @@ namespace MonoTests.System.IO.IsolatedStorageTest {
                        IsolatedStorageScope scope = IsolatedStorageScope.User | IsolatedStorageScope.Domain | IsolatedStorageScope.Assembly;
                        IsolatedStorageFile isf = IsolatedStorageFile.GetStore (scope, typeof (Zone), typeof (Zone));
                        Assert.AreEqual (Int64.MaxValue, isf.MaximumSize, "MaximumSize");
-#if !NET_2_1
+#if !MOBILE
                        Assert.AreEqual (IsolatedStorageScope.User | IsolatedStorageScope.Domain | IsolatedStorageScope.Assembly, isf.Scope, "Scope");
                        Assert.IsTrue ((isf.AssemblyIdentity is Zone), "AssemblyIdentity");
                        Assert.IsTrue ((isf.AssemblyIdentity.ToString ().IndexOf ("MyComputer") > 0), "Zone - Assembly");
@@ -265,7 +265,7 @@ namespace MonoTests.System.IO.IsolatedStorageTest {
                        IsolatedStorageFile isf = IsolatedStorageFile.GetStore (scope, typeof (StrongName), typeof (Url));
                        Assert.AreEqual (Int64.MaxValue, isf.MaximumSize, "MaximumSize");
                        Assert.AreEqual (scope, isf.Scope, "Scope");
-#if !NET_2_1
+#if !MOBILE
                        Assert.IsTrue ((isf.AssemblyIdentity is Url), "AssemblyIdentity");
                        // note: mono transforms the CodeBase into uppercase
                        // for net 1.1 which uses file:// and not file:///
@@ -361,7 +361,7 @@ namespace MonoTests.System.IO.IsolatedStorageTest {
 
                        // Maximum size for Internet isn't (by default) Int64.MaxValue
                        Assert.AreEqual (scope, isf.Scope, "Scope");
-#if !NET_2_1
+#if !MOBILE
                        Assert.IsTrue ((isf.AssemblyIdentity is Zone), "AssemblyIdentity");
                        Assert.IsTrue ((isf.AssemblyIdentity.ToString ().IndexOf ("Intranet") > 0), "Zone - Assembly");
                        Assert.IsTrue ((isf.DomainIdentity is Zone), "DomainIdentity");
@@ -577,7 +577,7 @@ namespace MonoTests.System.IO.IsolatedStorageTest {
                {
                        IsolatedStorageScope scope = IsolatedStorageScope.User | IsolatedStorageScope.Roaming | IsolatedStorageScope.Assembly | IsolatedStorageScope.Domain;
                        IsolatedStorageFile isf = IsolatedStorageFile.GetStore (scope, null, null);
-#if !NET_2_1
+#if !MOBILE
                        Assert.AreEqual (typeof (Url), isf.AssemblyIdentity.GetType (), "AssemblyIdentity");
                        Assert.AreEqual (typeof (Url), isf.DomainIdentity.GetType (), "DomainIdentity");
 #endif
index bd114bb5fb49b2ab7ba6c7c5cbbe4a20a9792f58..3800701e3282ef5dba0429be9c8dbacce7d9932d 100644 (file)
@@ -17,7 +17,7 @@ namespace MonoTests.System.IO
        [TestFixture]
        public class FileStreamWithClosedSafeHandleTests
        {
-#if !NET_2_1
+#if !MOBILE
                private FileStream GetFileStreamWithClosedHandle ()
                {
                        var fs1 = new FileStream ("test2", FileMode.OpenOrCreate);
index c14a6c388f2d7ead77af118aa26a8f0c12cde2dd..e40d8ef72dcd064899c268727ee80461d2d0055f 100644 (file)
@@ -656,7 +656,7 @@ namespace MonoTests.System.Reflection.Emit
                                Assert.AreEqual ("FOO", ((ObsoleteAttribute) attrs [0]).Message, "#B3");
                        }
                }
-#if !NET_2_1
+#if !MOBILE
                [Test]
                [ExpectedException (typeof (InvalidOperationException))]
                public void TestAddDeclarativeSecurityAlreadyCreated ()
index d31b99fa495dd97b6ef27e31fc328755c75d8f14..c6451207442ccb028504d0bdd2655942b5f15b61 100644 (file)
@@ -71,7 +71,7 @@ namespace MonoTests.System.Reflection.Emit
 #if !MOBILE
                        Assert.AreEqual ("foo.type[[System.Double, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089],[System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]", inst.FullName, "#3");
                        Assert.AreEqual ("foo.type[[System.Double, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089],[System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]], MonoTests.System.Reflection.Emit.MonoGenericClassTest, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", inst.AssemblyQualifiedName, "#4");
-#elif NET_2_1 || MOBILE
+#elif MOBILE || MOBILE
                        Assert.AreEqual ("foo.type[[System.Double, mscorlib, Version=2.0.5.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[System.String, mscorlib, Version=2.0.5.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e]]", inst.FullName, "#3");
                        Assert.AreEqual ("foo.type[[System.Double, mscorlib, Version=2.0.5.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[System.String, mscorlib, Version=2.0.5.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e]], MonoTests.System.Reflection.Emit.MonoGenericClassTest, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", inst.AssemblyQualifiedName, "#4");
                        Assert.AreEqual ("foo.type[System.Double,System.String]", inst.ToString (), "#5");
index 8d5fc3a921211c34cea0968954eb6806540a495c..406b569c8d4245f3a43273294eab72e19425ecf5 100644 (file)
@@ -73,7 +73,7 @@ namespace MonoTests.System.Reflection
                        }
                }
 
-#if !NET_2_1
+#if !MOBILE
                public enum ParamEnum {
                        None = 0,
                        Foo = 1,
index 4c38e08ed56fe67b422dce6c7714467301f738c9..d0acc240428b4ada7b89cd9496e6b479b3dfabb7 100644 (file)
@@ -671,7 +671,7 @@ namespace MonoTests.System.Runtime.InteropServices
                        }
                }
 
-#if !NET_2_1
+#if !MOBILE
                [Test]
                public void TestGetComSlotForMethodInfo ()
                {
@@ -819,7 +819,7 @@ namespace MonoTests.System.Runtime.InteropServices
                );
 #endif
        }
-#if !NET_2_1
+#if !MOBILE
        [ComImport()]
        [Guid("AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAAAAAA")]
        interface ITestDefault
index 660a556c18483017f7403ba25ed57b4aa0ab7a5a..832ac6fc1cc4c09cc745fee989c1ec1af40e4a4a 100644 (file)
@@ -58,7 +58,7 @@ namespace MonoTests.System.Runtime.InteropServices {
 
                [Test]
 #if MOBILE
-               [Ignore ("There's no GAC for the NET_2_1 based profiles (Moonlight, MonoTouch and Mono for Android")]
+               [Ignore ("There's no GAC for the MOBILE based profiles (Moonlight, MonoTouch and Mono for Android")]
 #endif
                public void FromGlobalAccessCache ()
                {
index 328bbb54a50487b7c5d48879374476d27d145da3..efbc57018e6b942dc8260569805bb702abc1e0dd 100644 (file)
@@ -104,8 +104,8 @@ namespace MonoTests.System.Security.Cryptography.X509Certificates {
                }
 
                [Test]
-#if NET_2_1
-               [Ignore ("This constructor always throw a NotSupportedException under NET_2_1 and is useless without CryptoAPI (i.e. outside Windows)")]
+#if MOBILE
+               [Ignore ("This constructor always throw a NotSupportedException under MOBILE and is useless without CryptoAPI (i.e. outside Windows)")]
 #endif
                public void ConstructorIntPtr ()
                {
index e141fa9e90fb9b5788968347ff2f740d3c00cf85..2c3cf5d2227850655b7dbc947928c736301c446f 100644 (file)
@@ -137,7 +137,7 @@ public class CryptoConfigTest {
        // additional names (URL) used for XMLDSIG (System.Security.Cryptography.Xml)
        // URL taken from http://www.w3.org/TR/2002/REC-xmldsig-core-20020212/
        [Test]
-#if NET_2_1
+#if MOBILE
        [Ignore ("System.Security.dll is not part of Moonlight, MonoTouch and Mono for Android")]
 #endif
        public void CreateFromURL () 
index 7f3320e9c92023d5a019523ce8e54ae32deede79..7f3790421f6231ac5bab86dc652848c912fd4508 100644 (file)
@@ -324,7 +324,7 @@ namespace MonoTests.System.Security.Cryptography {
                        }
                }
                
-#if !NET_2_1
+#if !MOBILE
                [Test]
                [ExpectedException (typeof (NotSupportedException))]
                public void Read_Disposed_Break () 
index a609ce74e2d66c52a0e9328db266a4dc05877678..e56a20c75cd3ce2c0797c843aad267d91a7354f0 100644 (file)
@@ -857,7 +857,7 @@ public class DSACryptoServiceProviderTest {
                }
        }
                
-#if !NET_2_1
+#if !MOBILE
        [Test]
        [Category ("NotWorking")]
        public void CspKeyContainerInfo_NewKeypair ()
index cb689ea25edaf9eeffdd1f75d5ea31937fc2478b..f5ba3ecf91bdd2f8b1c972464f9692561e4e2e12 100644 (file)
@@ -345,7 +345,7 @@ public class HashAlgorithmTest {
        public virtual bool ManagedHashImplementation {
                get { return false; }
        }
-#if !NET_2_1
+#if !MOBILE
        [Test]
        [Category ("NotWorking")] // Mono nevers throws an exception (and we're all managed ;-)
        public void TransformFinalBlock_Twice ()
@@ -424,7 +424,7 @@ public class HashAlgorithmTest {
        {
                Assert.AreEqual (HashBuffer (false), HashBuffer (true), "Intersect");
        }
-#if !NET_2_1
+#if !MOBILE
        [Test]
        [ExpectedException (typeof (NullReferenceException))]
        [Category ("NotWorking")] // initialization problem ? fx2.0 only ?
index 31401da3fec0a4538a95676837cf7134ccd10d17..375512ecd526f1abbf737a692054e419b760031d 100644 (file)
@@ -79,7 +79,7 @@ public class PasswordDeriveBytesTest {
                PasswordDeriveBytes pdb = new PasswordDeriveBytes (pwd, salt, new CspParameters ());
        }
 
-#if !NET_2_1
+#if !MOBILE
        [Test]
        [Category ("NotWorking")] // CspParameters aren't supported by Mono (requires CryptoAPI)
        public void Ctor_PasswordSaltNullCspParameters ()
@@ -100,7 +100,7 @@ public class PasswordDeriveBytesTest {
                Assert.AreEqual (ssalt, BitConverter.ToString (pdb.Salt), "Salt");
        }
 
-#if !NET_2_1
+#if !MOBILE
        [Test]
        [Category ("NotWorking")] // CspParameters aren't supported by Mono (requires CryptoAPI)
        public void Ctor_PasswordSaltCspParameters ()
@@ -176,7 +176,7 @@ public class PasswordDeriveBytesTest {
                PasswordDeriveBytes pdb = new PasswordDeriveBytes (pwd, salt, "SHA1", 1, new CspParameters ());
        }
 
-#if !NET_2_1
+#if !MOBILE
        [Test]
        [Category ("NotWorking")] // CspParameters aren't supported by Mono (requires CryptoAPI)
        public void Ctor_PasswordSaltNullHashIterationCspParameters ()
@@ -209,7 +209,7 @@ public class PasswordDeriveBytesTest {
                PasswordDeriveBytes pdb = new PasswordDeriveBytes ("s3kr3t", salt, "SHA1", 0, new CspParameters ());
        }
                
-#if !NET_2_1
+#if !MOBILE
        [Test]
        [Category ("NotWorking")] // CspParameters aren't supported by Mono (requires CryptoAPI)
        public void Ctor_PasswordSaltHashIterationMaxValueCspParameters ()
@@ -230,7 +230,7 @@ public class PasswordDeriveBytesTest {
                Assert.AreEqual (ssalt, BitConverter.ToString (pdb.Salt), "Salt");
        }
 
-#if !NET_2_1
+#if !MOBILE
        [Test]
        [Category ("NotWorking")] // CspParameters aren't supported by Mono (requires CryptoAPI)
        public void Ctor_PasswordSaltHashIterationCspParameters ()
@@ -669,7 +669,7 @@ public class PasswordDeriveBytesTest {
                pd.CryptDeriveKey ("AlgName", "MD5", -256, new byte [8]);
        }
                
-#if !NET_2_1
+#if !MOBILE
        [Test]
        [Category ("NotWorking")] // bug #79499
        public void LongMultipleGetBytes ()
index 6f351c4edd0c804aaa675032c5e949a3ff8e04d8..2ebcad4a366e34c9cf6071ad40c321b9438589de 100644 (file)
@@ -25,7 +25,7 @@ namespace MonoTests.System.Security.Cryptography {
                {
                        _algo = new RNGCryptoServiceProvider ();
                }
-#if !NET_2_1
+#if !MOBILE
                [Test]
                public void ConstructorByteArray () 
                {
index 8a20b9add458b2d2ed9ff7c097f7a140479c7215..6e44e3235b24061c7626bc48311a4cacbf686184 100644 (file)
@@ -420,7 +420,7 @@ public class RSACryptoServiceProviderTest {
                rsa.VerifyHash (hash, "1.3.14.3.2.26", null);
        }
 
-#if !NET_2_1
+#if !MOBILE
        [Test]
        [Category ("NotWorking")]
        public void ImportDisposed ()
@@ -1161,7 +1161,7 @@ public class RSACryptoServiceProviderTest {
                Assert.IsNotNull (r.Decrypt (bytes, true));
        }
 
-#if !NET_2_1
+#if !MOBILE
        [Test]
        [Category ("NotWorking")]
        public void CspKeyContainerInfo_NewKeypair ()
index b7bf46057a067543d842d0f505357f19943b3ae7..5a200bbfa363da987c836c038333ef5c6aa8ed1a 100644 (file)
@@ -277,7 +277,7 @@ namespace MonoTests.System.Security.Cryptography {
                        CreateEncryptor_IV (size);
                }
 
-#if !NET_2_1
+#if !MOBILE
                [Test]
                [ExpectedException (typeof (CryptographicException))]
                // Rijndael is the only implementation that has
@@ -324,7 +324,7 @@ namespace MonoTests.System.Security.Cryptography {
                        int size = (aes.BlockSize >> 3);
                        CreateDecryptor_IV (size);
                }
-#if !NET_2_1
+#if !MOBILE
                [Test]
                [ExpectedException (typeof (CryptographicException))]
                // Rijndael is the only implementation that has
index 80336afc641eaa54b6ee8215900fae3cef9ce28d..a420ffb56003f56efb12101fbc053e660eb54427 100644 (file)
@@ -27,8 +27,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-// NET_2_1 profile lacks some (of the few) CAS features required to execute those tests
-#if !NET_2_1
+// MOBILE profile lacks some (of the few) CAS features required to execute those tests
+#if !MOBILE
 
 using NUnit.Framework;
 using System;
index fed370974e584b8d5c33dd49eca0a75dc87de8e6..fb547931b237c3b77677c76f7cfa0e0dfc0332b5 100644 (file)
@@ -138,7 +138,7 @@ namespace MonoTests.System
                        Assert.IsFalse (d.IsSynchronized, "IsSynchronized");
                }
 
-#if !NET_2_1
+#if !MOBILE
                [Test] // bug #333740
                public void GetEnvironmentVariables_NewlySet ()
                {
@@ -165,7 +165,7 @@ namespace MonoTests.System
 #endif
                }
 
-#if !NET_2_1
+#if !MOBILE
                [Test]
                [ExpectedException (typeof (ArgumentException))]
                public void GetEnvironmentVariable_Target_Invalid ()
index 37039f81ef460cb3d6cae1f631522ea664e5c1c8..3bcaf26e36f5aac24a8d3bdb39599aef25370dcb 100644 (file)
@@ -22,7 +22,7 @@ using System.Text;
 using System.Diagnostics;
 using Mono.CompilerServices.SymbolWriter;
 
-#if NET_2_1
+#if MOBILE
 using XmlElement = System.Object;
 #endif
 
index 3f88a5935c00d273a3ed3f2fc5995b4cc456f7d0..340eb488ab08c6a37f1d52cae579f9e7edb38643 100644 (file)
@@ -18,7 +18,7 @@ using System.Diagnostics;
 using System.Text;
 using Mono.CompilerServices.SymbolWriter;
 
-#if NET_2_1
+#if MOBILE
 using XmlElement = System.Object;
 #else
 using System.Xml;
index 848dfc47fa41c706dab80e91ab18b6056ac0b977..ae60ff4031b669964a8da0ac3ac3d503cec9bf55 100644 (file)
@@ -11,7 +11,7 @@
 //
 //
 
-#if BOOTSTRAP_WITH_OLDLIB || NET_2_1
+#if BOOTSTRAP_WITH_OLDLIB || MOBILE
 
 using XmlElement = System.Object;
 
index 62c02b1fd5602de8f4a01d5096f183472d3d2b9a..d4e83a506a0fcfbf1d1b00d8522173ca92f15462 100644 (file)
@@ -1134,7 +1134,7 @@ namespace Mono.CSharp
                        QuitRequested = true;
                }
 
-#if !NET_2_1
+#if !MOBILE
                /// <summary>
                ///   Describes an object or a type.
                /// </summary>
index e6213c7e43e3228c2bad5d7548640d2ecbd54599..3adb36f327ccf0fb5cec0338e347f2be68c23687 100644 (file)
@@ -21,7 +21,7 @@ using System.Linq;
 using Mono.CompilerServices.SymbolWriter;
 using System.Runtime.CompilerServices;
 
-#if NET_2_1
+#if MOBILE
 using XmlElement = System.Object;
 #else
 using System.Xml;
index 94e9b6baf043f36d20efd23bba912a6238f3b16f..8036f2c1126a56319198464e021386325110ca10 100644 (file)
@@ -17,7 +17,7 @@ using System.Collections.Generic;
 using System.Text;
 using Mono.CompilerServices.SymbolWriter;
 
-#if NET_2_1
+#if MOBILE
 using XmlElement = System.Object;
 #endif
 
index 1210ae4221a40a47fb53c67390239a86931dc280..c7bcb479dbc3b17931b12cf3a08d66220617d8ce 100644 (file)
@@ -418,7 +418,7 @@ namespace Mono.CSharp
 
                        default_references.Add ("System");
                        default_references.Add ("System.Xml");
-#if NET_2_1
+#if MOBILE
                        default_references.Add ("System.Net");
                        default_references.Add ("System.Windows");
                        default_references.Add ("System.Windows.Browser");
index ec7e9dfc25a13881ee7e8ae8e0dec25750fc879e..265f702ab654b6e0ec0041bc3d53a8a0de9c2096 100644 (file)
@@ -91,7 +91,7 @@ namespace TestRunner {
                }
        }
 
-#if !NET_2_1
+#if !MOBILE
        class ProcessTester: ITester
        {
                ProcessStartInfo pi;
@@ -734,7 +734,7 @@ namespace TestRunner {
                bool update_verif_file;
                Hashtable verif_data;
 
-#if !NET_2_1
+#if !MOBILE
                ProcessStartInfo pi;
 #endif
                readonly string mono;
@@ -756,7 +756,7 @@ namespace TestRunner {
                        files_folder = Directory.GetCurrentDirectory ();
                        this.verif_file = verif_file;
 
-#if !NET_2_1
+#if !MOBILE
                        pi = new ProcessStartInfo ();
                        pi.CreateNoWindow = true;
                        pi.WindowStyle = ProcessWindowStyle.Hidden;
@@ -965,7 +965,7 @@ namespace TestRunner {
                        string filename = test.FileName;
 
                        AppDomain domain = null;
-#if !NET_2_1
+#if !MOBILE
                        if (safe_execution) {
                                // Create a new AppDomain, with the current directory as the base.
                                AppDomainSetup setupInfo = new AppDomainSetup ();
@@ -977,7 +977,7 @@ namespace TestRunner {
                        try {
                                DomainTester tester;
                                try {
-#if !NET_2_1
+#if !MOBILE
                                        if (domain != null)
                                                tester = (DomainTester) domain.CreateInstanceAndUnwrap (typeof (PositiveChecker).Assembly.FullName, typeof (DomainTester).FullName);
                                        else
@@ -998,7 +998,7 @@ namespace TestRunner {
                                if (doc_output != null) {
                                        string ref_file = filename.Replace (".cs", "-ref.xml");
                                        try {
-#if !NET_2_1
+#if !MOBILE
                                                new XmlComparer ("doc").Compare (ref_file, doc_output);
 #endif
                                        } catch (Exception e) {
index bd9ade36038e4d8f92bcdab088cb89a7dea1599b..ddcb6a70c08ddec225a9e55e1317f4e2b47bafcd 100644 (file)
@@ -24,9 +24,9 @@
 // LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION\r
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION\r
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\r
-//
+//\r
 \r
-#if !NET_2_1\r
+#if !MOBILE\r
 \r
 using System;\r
 using System.Collections;\r
@@ -137,4 +137,4 @@ public class XmlComparer
        }\r
 }\r
 \r
-#endif
+#endif\r