Author: bodewig Date: Thu Aug 18 10:55:25 2011 New Revision: 1159160 URL: http://svn.apache.org/viewvc?rev=1159160&view=rev Log: obsolete warnings new in .NET 4.0
Modified: logging/log4net/trunk/src/Appender/SmtpAppender.cs logging/log4net/trunk/src/Config/XmlConfigurator.cs Modified: logging/log4net/trunk/src/Appender/SmtpAppender.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Appender/SmtpAppender.cs?rev=1159160&r1=1159159&r2=1159160&view=diff ============================================================================== --- logging/log4net/trunk/src/Appender/SmtpAppender.cs (original) +++ logging/log4net/trunk/src/Appender/SmtpAppender.cs Thu Aug 18 10:55:25 2011 @@ -460,7 +460,13 @@ namespace log4net.Appender } if (!String.IsNullOrEmpty(m_replyTo)) { + // .NET 4.0 warning CS0618: 'System.Net.Mail.MailMessage.ReplyTo' is obsolete: + // 'ReplyTo is obsoleted for this type. Please use ReplyToList instead which can accept multiple addresses. http://go.microsoft.com/fwlink/?linkid=14202' +#if !NET_4_0 mailMessage.ReplyTo = new MailAddress(m_replyTo); +#else + mailMessage.ReplyToList.Add(new MailAddress(m_replyTo)); +#endif } mailMessage.Subject = m_subject; mailMessage.Priority = m_mailPriority; Modified: logging/log4net/trunk/src/Config/XmlConfigurator.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Config/XmlConfigurator.cs?rev=1159160&r1=1159159&r2=1159160&view=diff ============================================================================== --- logging/log4net/trunk/src/Config/XmlConfigurator.cs (original) +++ logging/log4net/trunk/src/Config/XmlConfigurator.cs Thu Aug 18 10:55:25 2011 @@ -728,7 +728,13 @@ namespace log4net.Config #elif NET_2_0 // Allow the DTD to specify entity includes XmlReaderSettings settings = new XmlReaderSettings(); + // .NET 4.0 warning CS0618: 'System.Xml.XmlReaderSettings.ProhibitDtd' + // is obsolete: 'Use XmlReaderSettings.DtdProcessing property instead.' +#if !NET_4_0 settings.ProhibitDtd = false; +#else + settings.DtdProcessing = DtdProcessing.Parse; +#endif // Create a reader over the input stream XmlReader xmlReader = XmlReader.Create(configStream, settings);