mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 3.10.0

Browse Source 
Former-commit-id: 172c8e3c300b39d5785c7a3e8dfb08ebdbc1a99b
This commit is contained in:
Jo Shields
2014-10-04 11:27:48 +01:00
parent fe777c5c82
commit 8b9b85e7f5
970 changed files with 20242 additions and 31308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mcs/class/System/Microsoft.CSharp/CSharpCodeCompiler.cs
View File

@ -44,6 +44,7 @@ namespace Mono.CSharp
using System.Text.RegularExpressions;
using System.Threading;
using System.Collections.Generic;
using System.Globalization;
internal class CSharpCodeCompiler : CSharpCodeGenerator, ICodeCompiler
{
@ -194,7 +195,14 @@ namespace Mono.CSharp
if (Environment.GetEnvironmentVariable ("MONO_TESTS_IN_PROGRESS") != null) {
string monoPath = Environment.GetEnvironmentVariable ("MONO_PATH");
if (!String.IsNullOrEmpty (monoPath)) {
monoPath = monoPath.Replace ("/class/lib/net_2_0", "/class/lib/net_4_0");
const string basePath = "/class/lib/";
const string profile = "net_2_0";
var basePathIndex = monoPath.IndexOf (basePath, StringComparison.Ordinal);
if (basePathIndex > 0 && basePathIndex + basePath.Length + profile.Length <= monoPath.Length) {
var currentProfile = monoPath.Substring (basePathIndex + basePath.Length, profile.Length);
if (currentProfile.Equals (profile, StringComparison.OrdinalIgnoreCase))
monoPath = monoPath.Replace (basePath + currentProfile, basePath + "net_4_0");
}
mcs.StartInfo.EnvironmentVariables ["MONO_PATH"] = monoPath;
}
}

9
mcs/class/System/System.Collections.Generic/RBTree.cs
View File

@ -114,17 +114,8 @@ namespace System.Collections.Generic
uint version;
#if ONE_MEMBER_CACHE
#if TARGET_JVM
static readonly LocalDataStoreSlot _cachedPathStore = System.Threading.Thread.AllocateDataSlot ();
static List<Node> cached_path {
get { return (List<Node>) System.Threading.Thread.GetData (_cachedPathStore); }
set { System.Threading.Thread.SetData (_cachedPathStore, value); }
}
#else
[ThreadStatic]
static List<Node> cached_path;
#endif
static List<Node> alloc_path ()
{

7
mcs/class/System/System.ComponentModel/Component.cs
View File

@ -100,18 +100,11 @@ namespace System.ComponentModel {
Dispose (false);
}
#if TARGET_JVM
public virtual void Dispose ()
{
Dispose (true);
}
#else
public void Dispose ()
{
Dispose (true);
GC.SuppressFinalize (this);
}
#endif
// <summary>
// Controls disposal of resources used by this.

2
mcs/class/System/System.ComponentModel/MarshalByValueComponent.cs
View File

@ -70,12 +70,10 @@ namespace System.ComponentModel
// Set fields to null
}
#if !TARGET_JVM
~MarshalByValueComponent ()
{
Dispose (false);
}
#endif
public virtual object GetService (Type service)
{

24
mcs/class/System/System.ComponentModel/PropertyDescriptorCollection.cs
View File

@ -92,7 +92,6 @@ namespace System.ComponentModel
properties.Clear ();
}
#if !TARGET_JVM // DUAL_IFACE_CONFLICT
void IList.Clear ()
{
Clear ();
@ -102,19 +101,12 @@ namespace System.ComponentModel
{
Clear ();
}
#endif
public bool Contains (PropertyDescriptor value)
{
return properties.Contains (value);
}
#if TARGET_JVM // DUAL_IFACE_CONFLICT
public bool Contains (object value)
{
return Contains ((PropertyDescriptor) value);
}
#else
bool IList.Contains (object value)
{
@ -125,7 +117,6 @@ namespace System.ComponentModel
{
return Contains ((PropertyDescriptor) value);
}
#endif
public void CopyTo (Array array, int index)
{
@ -198,12 +189,6 @@ namespace System.ComponentModel
properties.Remove (value);
}
#if TARGET_JVM// DUAL_IFACE_CONFLICT
public void Remove (object value)
{
Remove ((PropertyDescriptor) value);
}
#else
void IDictionary.Remove (object value)
{
Remove ((PropertyDescriptor) value);
@ -213,7 +198,6 @@ namespace System.ComponentModel
{
Remove ((PropertyDescriptor) value);
}
#endif
public void RemoveAt (int index)
{
if (readOnly) {
@ -322,30 +306,22 @@ namespace System.ComponentModel
return new PropertyDescriptorCollection (descriptors, true);
}
#if TARGET_JVM //DUAL_IFACE_CONFLICT
public bool IsFixedSize
#else
bool IDictionary.IsFixedSize
{
get {return ((IList)this).IsFixedSize;}
}
bool IList.IsFixedSize
#endif
{
get
{
return readOnly;
}
}
#if TARGET_JVM //DUAL_IFACE_CONFLICT
public bool IsReadOnly
#else
bool IDictionary.IsReadOnly
{
get {return ((IList)this).IsReadOnly;}
}
bool IList.IsReadOnly
#endif
{
get
{

2
mcs/class/System/System.ComponentModel/TypeDescriptor.cs
View File

@ -600,12 +600,10 @@ public sealed class TypeDescriptor
editor = CreateEditor (editorType, componentType);
if (editorType == null || editor == null) {
#if !TARGET_JVM
// Make sure the editorBaseType's static constructor has been called,
// since that's where we're putting the initialization of its editor table.
System.Runtime.CompilerServices.RuntimeHelpers.RunClassConstructor (editorBaseType.TypeHandle);
#endif
if (editors != null)
editor = FindEditorInTable (componentType, editorBaseType, editors [editorBaseType] as Hashtable);
}

9
mcs/class/System/System.ComponentModel/Win32Exception.cs
View File

@ -43,9 +43,6 @@ namespace System.ComponentModel
private int native_error_code;
// [SecurityPermission (SecurityAction.LinkDemand, UnmanagedCode = true)]
#if TARGET_JVM
[MonoNotSupported("")]
#endif
public Win32Exception ()
: base (W32ErrorMessage (Marshal.GetLastWin32Error ()))
{
@ -66,18 +63,12 @@ namespace System.ComponentModel
native_error_code = error;
}
[SecurityPermission (SecurityAction.LinkDemand, UnmanagedCode = true)]
#if TARGET_JVM
[MonoNotSupported ("")]
#endif
public Win32Exception (string message)
: base (message)
{
native_error_code = Marshal.GetLastWin32Error ();
}
#if TARGET_JVM
[MonoNotSupported ("")]
#endif
[SecurityPermission (SecurityAction.LinkDemand, UnmanagedCode = true)]
public Win32Exception (string message, Exception innerException)
: base (message, innerException)

2
mcs/class/System/System.Configuration/AppSettingsReader.cs
View File

@ -28,7 +28,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if CONFIGURATION_DEP && !TARGET_JVM
#if CONFIGURATION_DEP
extern alias PrebuiltSystem;
using NameValueCollection = PrebuiltSystem.System.Collections.Specialized.NameValueCollection;
#endif

2
mcs/class/System/System.Configuration/ApplicationSettingsBase.cs
View File

@ -20,7 +20,7 @@
// Copyright (C) 2005, 2006 Novell, Inc (http://www.novell.com)
//
#if CONFIGURATION_DEP && !TARGET_JVM
#if CONFIGURATION_DEP
extern alias PrebuiltSystem;
using NameValueCollection = PrebuiltSystem.System.Collections.Specialized.NameValueCollection;
#endif

64
mcs/class/System/System.Configuration/ConfigurationSettings.cs
View File

@ -32,7 +32,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if CONFIGURATION_DEP && !TARGET_JVM
#if CONFIGURATION_DEP
extern alias PrebuiltSystem;
using NameValueCollection = PrebuiltSystem.System.Collections.Specialized.NameValueCollection;
#endif
@ -47,32 +47,12 @@ using System.Security.Permissions;
using System.Xml;
using System.Xml.XPath;
#endif
#if TARGET_JVM
using vmw.common;
using vmw.@internal.io;
#endif
namespace System.Configuration
{
public sealed class ConfigurationSettings
{
#if !TARGET_JVM
static IConfigurationSystem config = DefaultConfig.GetInstance ();
#else
static IConfigurationSystem config {
get {
IConfigurationSystem conf = (IConfigurationSystem) AppDomain.CurrentDomain.GetData ("ConfigurationSettings.Config");
if (conf == null) {
conf = DefaultConfig.GetInstance ();
AppDomain.CurrentDomain.SetData ("ConfigurationSettings.Config", conf);
}
return conf;
}
set {
AppDomain.CurrentDomain.SetData ("ConfigurationSettings.Config", value);
}
}
#endif
static object lockobj = new object ();
private ConfigurationSettings ()
{
@ -123,23 +103,7 @@ namespace System.Configuration
//
class DefaultConfig : IConfigurationSystem
{
#if !TARGET_JVM
static readonly DefaultConfig instance = new DefaultConfig ();
#else
static DefaultConfig instance {
get {
DefaultConfig conf = (DefaultConfig) AppDomain.CurrentDomain.GetData ("DefaultConfig.instance");
if (conf == null) {
conf = new DefaultConfig ();
AppDomain.CurrentDomain.SetData ("DefaultConfig.instance", conf);
}
return conf;
}
set {
AppDomain.CurrentDomain.SetData ("DefaultConfig.instance", value);
}
}
#endif
ConfigurationData config;
private DefaultConfig ()
@ -185,16 +149,6 @@ namespace System.Configuration
config = data;
}
}
#if TARGET_JVM
internal static string GetBundledMachineConfig ()
{
return null;
}
internal static string GetMachineConfigPath ()
{
return System.Runtime.InteropServices.RuntimeEnvironment.SystemConfigurationFile;
}
#else
[MethodImplAttribute(MethodImplOptions.InternalCall)]
extern private static string get_bundled_machine_config ();
internal static string GetBundledMachineConfig ()
@ -207,7 +161,6 @@ namespace System.Configuration
{
return get_machine_config_path ();
}
#endif
private static string GetAppConfigPath ()
{
AppDomainSetup currentInfo = AppDomain.CurrentDomain.SetupInformation;
@ -291,29 +244,14 @@ namespace System.Configuration
#if (XML_DEP)
this.fileName = fileName;
if (fileName == null
#if !TARGET_JVM
|| !File.Exists (fileName)
#endif
)
return false;
XmlTextReader reader = null;
try {
#if !TARGET_JVM
FileStream fs = new FileStream (fileName, FileMode.Open, FileAccess.Read);
#else
Stream fs = (Stream) vmw.common.IOUtils.getStream (fileName);
//patch for machine.config
if (fs == null && fileName.EndsWith ("machine.config")) {
fs = (Stream) IOUtils.getStreamForGHConfigs (fileName);
}
if (fs == null) {
return false;
}
#endif
reader = new XmlTextReader (fs);
if (InitRead (reader))
ReadConfigFile (reader);

25
mcs/class/System/System.Configuration/CustomizableFileSettingsProvider.cs
View File

@ -29,9 +29,7 @@
#if CONFIGURATION_DEP
#if !TARGET_JVM
extern alias PrebuiltSystem;
#endif
using System;
using System.Collections;
@ -44,11 +42,7 @@ using System.Security.Cryptography;
using System.Text;
using System.Xml;
#if TARGET_JVM
using NameValueCollection = System.Collections.Specialized.NameValueCollection;
#else
using NameValueCollection = PrebuiltSystem.System.Collections.Specialized.NameValueCollection;
#endif
namespace System.Configuration
{
@ -264,7 +258,6 @@ namespace System.Configuration
return attrs [0].Company;
}
#if !TARGET_JVM
MethodInfo entryPoint = assembly.EntryPoint;
Type entryType = entryPoint != null ? entryPoint.DeclaringType : null;
if (entryType != null && !String.IsNullOrEmpty (entryType.Namespace)) {
@ -272,9 +265,6 @@ namespace System.Configuration
return end < 0 ? entryType.Namespace : entryType.Namespace.Substring (0, end);
}
return "Program";
#else
return assembly.GetName ().Name;
#endif
}
private static string GetProductName ()
@ -283,20 +273,11 @@ namespace System.Configuration
if (assembly == null)
assembly = Assembly.GetCallingAssembly ();
#if !TARGET_JVM
byte [] pkt = assembly.GetName ().GetPublicKeyToken ();
return String.Format ("{0}_{1}_{2}",
AppDomain.CurrentDomain.FriendlyName,
pkt != null && pkt.Length > 0 ? "StrongName" : "Url",
GetEvidenceHash());
#else // AssemblyProductAttribute-based code
AssemblyProductAttribute [] attrs = (AssemblyProductAttribute[]) assembly.GetCustomAttributes (typeof (AssemblyProductAttribute), true);
if ((attrs != null) && attrs.Length > 0) {
return attrs [0].Product;
}
return assembly.GetName ().Name;
#endif
}
// Note: Changed from base64() to hex output to avoid unexpected chars like '\' or '/' with filesystem meaning.
@ -341,19 +322,15 @@ namespace System.Configuration
ProductVersion = GetProductVersion ().Split('.');
// C:\Documents and Settings\(user)\Application Data
#if !TARGET_JVM
if (userRoamingBasePath == "")
userRoamingPath = Environment.GetFolderPath (Environment.SpecialFolder.ApplicationData);
else
#endif
userRoamingPath = userRoamingBasePath;
// C:\Documents and Settings\(user)\Local Settings\Application Data (on Windows)
#if !TARGET_JVM
if (userLocalBasePath == "")
userLocalPath = Environment.GetFolderPath (Environment.SpecialFolder.LocalApplicationData);
else
#endif
userLocalPath = userLocalBasePath;
if (isCompany) {
@ -366,13 +343,11 @@ namespace System.Configuration
Assembly assembly = Assembly.GetEntryAssembly ();
if (assembly == null)
assembly = Assembly.GetCallingAssembly ();
#if !TARGET_JVM
byte [] pkt = assembly.GetName ().GetPublicKeyToken ();
ProductName = String.Format ("{0}_{1}_{2}",
ProductName,
pkt != null ? "StrongName" : "Url",
GetEvidenceHash());
#endif
}
userRoamingPath = Path.Combine (userRoamingPath, ProductName);
userLocalPath = Path.Combine (userLocalPath, ProductName);

9
mcs/class/System/System.Configuration/LocalFileSettingsProvider.cs
View File

@ -28,7 +28,7 @@
//
#if CONFIGURATION_DEP
#if CONFIGURATION_DEP && !TARGET_JVM
#if CONFIGURATION_DEP
extern alias PrebuiltSystem;
using NameValueCollection = PrebuiltSystem.System.Collections.Specialized.NameValueCollection;
#endif
@ -59,14 +59,7 @@ namespace System.Configuration
public override SettingsPropertyValueCollection GetPropertyValues (SettingsContext context,
SettingsPropertyCollection properties)
{
#if TARGET_JVM
SettingsPropertyValueCollection pv = new SettingsPropertyValueCollection ();
foreach (SettingsProperty prop in properties)
pv.Add (new SettingsPropertyValue (prop));
return pv;
#else
return impl.GetPropertyValues (context, properties);
#endif
}
#if CONFIGURATION_DEP

9
mcs/class/System/System.Diagnostics/DefaultTraceListener.cs
View File

@ -64,14 +64,10 @@ namespace System.Diagnostics {
OnWin32 = (Path.DirectorySeparatorChar == '\\');
if (!OnWin32) {
#if TARGET_JVM
string trace = java.lang.System.getProperty("MONO_TRACE");
#else
// If we're running on Unix, we don't have OutputDebugString.
// Instead, send output to...wherever the MONO_TRACE_LISTENER environment
// variables says to.
String trace = Environment.GetEnvironmentVariable("MONO_TRACE_LISTENER");
#endif
#if MOBILE
if (trace == null)
@ -215,10 +211,6 @@ namespace System.Diagnostics {
Abort
}
#if TARGET_JVM
private void WriteDebugString (string message)
{
#else
[MethodImplAttribute(MethodImplOptions.InternalCall)]
private extern static void WriteWindowsDebugString (string message);
@ -227,7 +219,6 @@ namespace System.Diagnostics {
if (OnWin32)
WriteWindowsDebugString (message);
else
#endif
WriteMonoTrace (message);
}

4
mcs/class/System/System.Diagnostics/DiagnosticsConfigurationHandler.cs
View File

@ -186,7 +186,6 @@ namespace System.Diagnostics
// them
private void AddSwitchesNode (IDictionary d, XmlNode node)
{
#if !TARGET_JVM
// There are no attributes on <switch/>
ValidateInvalidAttributes (node.Attributes, node);
@ -224,7 +223,6 @@ namespace System.Diagnostics
}
d [node.Name] = newNodes;
#endif
}
private static object GetSwitchValue (string name, string value)
@ -367,7 +365,6 @@ namespace System.Diagnostics
// for add, "name" is required; initializeData is optional; "type" is required in 1.x, optional in 2.0.
private void AddTraceListeners (IDictionary d, XmlNode listenersNode, TraceListenerCollection listeners)
{
#if !TARGET_JVM
// There are no attributes on <listeners/>
ValidateInvalidAttributes (listenersNode.Attributes, listenersNode);
@ -398,7 +395,6 @@ namespace System.Diagnostics
else
ThrowUnrecognizedNode (child);
}
#endif
}
private void AddTraceListener (IDictionary d, XmlNode child, XmlAttributeCollection attributes, TraceListenerCollection listeners)

50
mcs/class/System/System.Diagnostics/TraceListener.cs
View File

@ -43,55 +43,6 @@ namespace System.Diagnostics {
public abstract class TraceListener : MarshalByRefObject, IDisposable {
#if TARGET_JVM
readonly LocalDataStoreSlot _indentLevelStore = System.Threading.Thread.AllocateDataSlot ();
readonly LocalDataStoreSlot _indentSizeStore = System.Threading.Thread.AllocateDataSlot ();
readonly LocalDataStoreSlot _attributesStore = System.Threading.Thread.AllocateDataSlot ();
readonly LocalDataStoreSlot _filterStore = System.Threading.Thread.AllocateDataSlot ();
readonly LocalDataStoreSlot _optionsStore = System.Threading.Thread.AllocateDataSlot ();
private int indentLevel {
get {
object o = System.Threading.Thread.GetData (_indentLevelStore);
if (o == null)
return 0;
return (int) o;
}
set { System.Threading.Thread.SetData (_indentLevelStore, value); }
}
private int indentSize {
get {
object o = System.Threading.Thread.GetData (_indentSizeStore);
if (o == null)
return 4;
return (int) o;
}
set { System.Threading.Thread.SetData (_indentSizeStore, value); }
}
private StringDictionary attributes {
get { return (StringDictionary) System.Threading.Thread.GetData (_attributesStore); }
set { System.Threading.Thread.SetData (_attributesStore, value); }
}
#if !MOBILE
private TraceFilter filter {
get { return (TraceFilter) System.Threading.Thread.GetData (_filterStore); }
set { System.Threading.Thread.SetData (_filterStore, value); }
}
#endif
private TraceOptions options {
get {
object o = System.Threading.Thread.GetData (_optionsStore);
if (o == null)
return TraceOptions.None;
return (TraceOptions) o;
}
set { System.Threading.Thread.SetData (_optionsStore, value); }
}
#else
[ThreadStatic]
private int indentLevel = 0;
@ -106,7 +57,6 @@ namespace System.Diagnostics {
#endif
[ThreadStatic]
private TraceOptions options;
#endif
private string name;
private bool needIndent = true;

38
mcs/class/System/System.IO.Compression/DeflateStream.cs
View File

@ -81,19 +81,20 @@ namespace System.IO.Compression
}
#if NET_4_5
[MonoTODO]
public DeflateStream (Stream stream, CompressionLevel compressionLevel)
: this (stream, CompressionMode.Compress)
: this (stream, compressionLevel, false, false)
{
throw new NotImplementedException ();
}
[MonoTODO]
public DeflateStream (Stream stream, CompressionLevel compressionLevel, bool leaveOpen)
: this (stream, CompressionMode.Compress, leaveOpen)
: this (stream, compressionLevel, leaveOpen, false)
{
throw new NotImplementedException ();
}
internal DeflateStream (Stream stream, CompressionLevel compressionLevel, bool leaveOpen, bool gzip)
: this (stream, CompressionMode.Compress, leaveOpen, gzip)
{
}
#endif
protected override void Dispose (bool disposing)
@ -395,24 +396,15 @@ namespace System.IO.Compression
int UnmanagedRead (IntPtr buffer, int length)
{
int total = 0;
int n = 1;
while (length > 0 && n > 0) {
if (io_buffer == null)
io_buffer = new byte [BufferSize];
if (io_buffer == null)
io_buffer = new byte [BufferSize];
int count = Math.Min (length, io_buffer.Length);
n = base_stream.Read (io_buffer, 0, count);
if (n > 0) {
Marshal.Copy (io_buffer, 0, buffer, n);
unsafe {
buffer = new IntPtr ((byte *) buffer.ToPointer () + n);
}
length -= n;
total += n;
}
}
return total;
int count = Math.Min (length, io_buffer.Length);
int n = base_stream.Read (io_buffer, 0, count);
if (n > 0)
Marshal.Copy (io_buffer, 0, buffer, n);
return n;
}
#if MONOTOUCH

8
mcs/class/System/System.IO.Compression/GZipStream.cs
View File

@ -50,18 +50,14 @@ namespace System.IO.Compression {
#if NET_4_5
[MonoTODO]
public GZipStream (Stream stream, CompressionLevel compressionLevel)
: this (stream, CompressionMode.Compress)
: this (stream, compressionLevel, false)
{
throw new NotImplementedException ();
}
[MonoTODO]
public GZipStream (Stream stream, CompressionLevel compressionLevel, bool leaveOpen)
: this (stream, CompressionMode.Compress, leaveOpen)
{
throw new NotImplementedException ();
this.deflateStream = new DeflateStream (stream, compressionLevel, leaveOpen, true);
}
#endif

2
mcs/class/System/System.IO.Ports/SerialPort.cs
View File

@ -572,12 +572,10 @@ namespace System.IO.Ports
if (is_open)
throw new InvalidOperationException ("Port is already open");
#if !TARGET_JVM
if (IsWindows) // Use windows kernel32 backend
stream = new WinSerialStream (port_name, baud_rate, data_bits, parity, stop_bits, dtr_enable,
rts_enable, handshake, read_timeout, write_timeout, readBufferSize, writeBufferSize);
else // Use standard unix backend
#endif
stream = new SerialPortStream (port_name, baud_rate, data_bits, parity, stop_bits, dtr_enable,
rts_enable, handshake, read_timeout, write_timeout, readBufferSize, writeBufferSize);

4
mcs/class/System/System.IO.Ports/WinSerialStream.cs
View File

@ -238,7 +238,6 @@ namespace System.IO.Ports
throw new NotSupportedException();
}
#if !TARGET_JVM
[DllImport("kernel32", SetLastError = true)]
static extern unsafe bool ReadFile (int handle, byte* buffer, int bytes_to_read,
out int bytes_read, IntPtr overlapped);
@ -246,7 +245,6 @@ namespace System.IO.Ports
[DllImport("kernel32", SetLastError = true)]
static extern unsafe bool GetOverlappedResult (int handle, IntPtr overlapped,
ref int bytes_transfered, bool wait);
#endif
public override int Read ([In, Out] byte [] buffer, int offset, int count)
{
@ -283,11 +281,9 @@ namespace System.IO.Ports
return bytes_read;
}
#if !TARGET_JVM
[DllImport("kernel32", SetLastError = true)]
static extern unsafe bool WriteFile (int handle, byte* buffer, int bytes_to_write,
out int bytes_written, IntPtr overlapped);
#endif
public override void Write (byte [] buffer, int offset, int count)
{

24
mcs/class/System/System.Net.Mail/SmtpClient.cs
View File

@ -661,16 +661,8 @@ namespace System.Net.Mail {
sfre.Add (new SmtpFailedRecipientException (status.StatusCode, message.Bcc [i].Address));
}
#if TARGET_JVM // List<T>.ToArray () is not supported
if (sfre.Count > 0) {
SmtpFailedRecipientException[] xs = new SmtpFailedRecipientException[sfre.Count];
sfre.CopyTo (xs);
throw new SmtpFailedRecipientsException ("failed recipients", xs);
}
#else
if (sfre.Count >0)
throw new SmtpFailedRecipientsException ("failed recipients", sfre.ToArray ());
#endif
// DATA
status = SendCommand ("DATA");
@ -978,11 +970,7 @@ try {
case TransferEncoding.Base64:
byte [] content = new byte [av.ContentStream.Length];
av.ContentStream.Read (content, 0, content.Length);
#if TARGET_JVM
SendData (Convert.ToBase64String (content));
#else
SendData (Convert.ToBase64String (content, Base64FormattingOptions.InsertLineBreaks));
#endif
break;
case TransferEncoding.QuotedPrintable:
byte [] bytes = new byte [av.ContentStream.Length];
@ -1022,11 +1010,7 @@ try {
case TransferEncoding.Base64:
byte [] content = new byte [lr.ContentStream.Length];
lr.ContentStream.Read (content, 0, content.Length);
#if TARGET_JVM
SendData (Convert.ToBase64String (content));
#else
SendData (Convert.ToBase64String (content, Base64FormattingOptions.InsertLineBreaks));
#endif
break;
case TransferEncoding.QuotedPrintable:
byte [] bytes = new byte [lr.ContentStream.Length];
@ -1058,11 +1042,7 @@ try {
att.ContentStream.Read (content, 0, content.Length);
switch (att.TransferEncoding) {
case TransferEncoding.Base64:
#if TARGET_JVM
SendData (Convert.ToBase64String (content));
#else
SendData (Convert.ToBase64String (content, Base64FormattingOptions.InsertLineBreaks));
#endif
break;
case TransferEncoding.QuotedPrintable:
SendData (ToQuotedPrintable (content));
@ -1198,9 +1178,7 @@ try {
throw new SmtpException (SmtpStatusCode.GeneralFailure, "Server does not support secure connections.");
}
#if TARGET_JVM
((NetworkStream) stream).ChangeToSSLSocket ();
#elif SECURITY_DEP
#if SECURITY_DEP
SslStream sslStream = new SslStream (stream, false, callback, null);
CheckCancellation ();
sslStream.AuthenticateAsClient (Host, this.ClientCertificates, SslProtocols.Default, false);

Some files were not shown because too many files have changed in this diff Show More