logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r1538212 - in /logging/log4net/trunk: src/ src/Appender/ src/Config/ src/Core/ src/DateFormatter/ src/Layout/ src/Layout/Pattern/ src/Repository/Hierarchy/ src/Util/ src/Util/PatternStringConverters/ tests/src/Appender/ tests/src/Layout/
Date Sat, 02 Nov 2013 16:22:30 GMT
Author: bodewig
Date: Sat Nov  2 16:22:29 2013
New Revision: 1538212

URL: http://svn.apache.org/r1538212
Log:
remove conditional compilation sections for frameworks that ar no longer supported.  Also: bump version and adapt to Mono's improved compatibility (over Mono 1.x)

Modified:
    logging/log4net/trunk/src/Appender/AdoNetAppender.cs
    logging/log4net/trunk/src/Appender/AnsiColorTerminalAppender.cs
    logging/log4net/trunk/src/Appender/AppenderSkeleton.cs
    logging/log4net/trunk/src/Appender/AspNetTraceAppender.cs
    logging/log4net/trunk/src/Appender/ColoredConsoleAppender.cs
    logging/log4net/trunk/src/Appender/ConsoleAppender.cs
    logging/log4net/trunk/src/Appender/EventLogAppender.cs
    logging/log4net/trunk/src/Appender/LocalSyslogAppender.cs
    logging/log4net/trunk/src/Appender/ManagedColoredConsoleAppender.cs
    logging/log4net/trunk/src/Appender/NetSendAppender.cs
    logging/log4net/trunk/src/Appender/OutputDebugStringAppender.cs
    logging/log4net/trunk/src/Appender/RollingFileAppender.cs
    logging/log4net/trunk/src/Appender/SmtpAppender.cs
    logging/log4net/trunk/src/Appender/UdpAppender.cs
    logging/log4net/trunk/src/AssemblyInfo.cs
    logging/log4net/trunk/src/AssemblyVersionInfo.cpp
    logging/log4net/trunk/src/AssemblyVersionInfo.cs
    logging/log4net/trunk/src/AssemblyVersionInfo.js
    logging/log4net/trunk/src/AssemblyVersionInfo.vb
    logging/log4net/trunk/src/Config/DOMConfigurator.cs
    logging/log4net/trunk/src/Config/XmlConfigurator.cs
    logging/log4net/trunk/src/Config/XmlConfiguratorAttribute.cs
    logging/log4net/trunk/src/Core/DefaultRepositorySelector.cs
    logging/log4net/trunk/src/Core/LoggerManager.cs
    logging/log4net/trunk/src/Core/LoggingEvent.cs
    logging/log4net/trunk/src/DateFormatter/AbsoluteTimeDateFormatter.cs
    logging/log4net/trunk/src/Layout/Pattern/AspNetCachePatternConverter.cs
    logging/log4net/trunk/src/Layout/Pattern/AspNetContextPatternConverter.cs
    logging/log4net/trunk/src/Layout/Pattern/AspNetPatternConverter.cs
    logging/log4net/trunk/src/Layout/Pattern/AspNetRequestPatternConverter.cs
    logging/log4net/trunk/src/Layout/Pattern/AspNetSessionPatternConverter.cs
    logging/log4net/trunk/src/Layout/PatternLayout.cs
    logging/log4net/trunk/src/Layout/XMLLayout.cs
    logging/log4net/trunk/src/Log4netAssemblyInfo.cs
    logging/log4net/trunk/src/NDC.cs
    logging/log4net/trunk/src/Repository/Hierarchy/Logger.cs
    logging/log4net/trunk/src/Util/LogicalThreadContextProperties.cs
    logging/log4net/trunk/src/Util/NativeError.cs
    logging/log4net/trunk/src/Util/PatternStringConverters/IdentityPatternConverter.cs
    logging/log4net/trunk/src/Util/PatternStringConverters/ProcessIdPatternConverter.cs
    logging/log4net/trunk/src/Util/PatternStringConverters/UserNamePatternConverter.cs
    logging/log4net/trunk/src/Util/SystemInfo.cs
    logging/log4net/trunk/src/Util/SystemStringFormat.cs
    logging/log4net/trunk/src/Util/ThreadContextStack.cs
    logging/log4net/trunk/src/Util/WindowsSecurityContext.cs
    logging/log4net/trunk/src/log4net.vs2008.csproj
    logging/log4net/trunk/tests/src/Appender/RemotingAppenderTest.cs
    logging/log4net/trunk/tests/src/Layout/XmlLayoutTest.cs

Modified: logging/log4net/trunk/src/Appender/AdoNetAppender.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Appender/AdoNetAppender.cs?rev=1538212&r1=1538211&r2=1538212&view=diff
==============================================================================
--- logging/log4net/trunk/src/Appender/AdoNetAppender.cs (original)
+++ logging/log4net/trunk/src/Appender/AdoNetAppender.cs Sat Nov  2 16:22:29 2013
@@ -17,9 +17,6 @@
 //
 #endregion
 
-// SSCLI 1.0 has no support for ADO.NET
-#if !SSCLI
-
 using System;
 using System.Collections;
 using System.Configuration;
@@ -1253,5 +1250,3 @@ namespace log4net.Appender
 		#endregion // Private Instance Fields
 	}
 }
-
-#endif // !SSCLI
\ No newline at end of file

Modified: logging/log4net/trunk/src/Appender/AnsiColorTerminalAppender.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Appender/AnsiColorTerminalAppender.cs?rev=1538212&r1=1538211&r2=1538212&view=diff
==============================================================================
--- logging/log4net/trunk/src/Appender/AnsiColorTerminalAppender.cs (original)
+++ logging/log4net/trunk/src/Appender/AnsiColorTerminalAppender.cs Sat Nov  2 16:22:29 2013
@@ -339,10 +339,6 @@ namespace log4net.Appender
 				}
 			}
 
-#if NETCF_1_0
-			// Write to the output stream
-			Console.Write(loggingMessage);
-#else
 			if (m_writeToErrorStream)
 			{
 				// Write to the error stream
@@ -353,7 +349,6 @@ namespace log4net.Appender
 				// Write to the output stream
 				Console.Write(loggingMessage);
 			}
-#endif
 		
 		}
 

Modified: logging/log4net/trunk/src/Appender/AppenderSkeleton.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Appender/AppenderSkeleton.cs?rev=1538212&r1=1538211&r2=1538212&view=diff
==============================================================================
--- logging/log4net/trunk/src/Appender/AppenderSkeleton.cs (original)
+++ logging/log4net/trunk/src/Appender/AppenderSkeleton.cs Sat Nov  2 16:22:29 2013
@@ -321,7 +321,7 @@ namespace log4net.Appender
 				{
 					ErrorHandler.Error("Failed in DoAppend", ex);
 				}
-#if !MONO && !NET_2_0
+#if NETCF
 				// on .NET 2.0 (and higher) and Mono (all profiles), 
 				// exceptions that do not derive from System.Exception will be
 				// wrapped in a RuntimeWrappedException by the runtime, and as
@@ -428,7 +428,7 @@ namespace log4net.Appender
 				{
 					ErrorHandler.Error("Failed in Bulk DoAppend", ex);
 				}
-#if !MONO && !NET_2_0
+#if NETCF
 				// on .NET 2.0 (and higher) and Mono (all profiles), 
 				// exceptions that do not derive from System.Exception will be
 				// wrapped in a RuntimeWrappedException by the runtime, and as

Modified: logging/log4net/trunk/src/Appender/AspNetTraceAppender.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Appender/AspNetTraceAppender.cs?rev=1538212&r1=1538211&r2=1538212&view=diff
==============================================================================
--- logging/log4net/trunk/src/Appender/AspNetTraceAppender.cs (original)
+++ logging/log4net/trunk/src/Appender/AspNetTraceAppender.cs Sat Nov  2 16:22:29 2013
@@ -17,9 +17,7 @@
 //
 #endregion
 
-// .NET Compact Framework 1.0 has no support for ASP.NET
-// SSCLI 1.0 has no support for ASP.NET
-#if !NETCF && !SSCLI && !CLIENT_PROFILE
+#if !NETCF && !CLIENT_PROFILE
 
 using System.Web;
 
@@ -152,4 +150,4 @@ namespace log4net.Appender 
 	}
 }
 
-#endif // !NETCF && !SSCLI
+#endif // !NETCF

Modified: logging/log4net/trunk/src/Appender/ColoredConsoleAppender.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Appender/ColoredConsoleAppender.cs?rev=1538212&r1=1538211&r2=1538212&view=diff
==============================================================================
--- logging/log4net/trunk/src/Appender/ColoredConsoleAppender.cs (original)
+++ logging/log4net/trunk/src/Appender/ColoredConsoleAppender.cs Sat Nov  2 16:22:29 2013
@@ -17,16 +17,8 @@
 //
 #endregion
 
-// MONO 1.0 Beta mcs does not like #if !A && !B && !C syntax
-
-// .NET Compact Framework 1.0 has no support for Win32 Console API's
+// .NET Compact Framework has no support for Win32 Console API's
 #if !NETCF 
-// .Mono 1.0 has no support for Win32 Console API's
-#if !MONO 
-// SSCLI 1.0 has no support for Win32 Console API's
-#if !SSCLI
-// We don't want framework or platform specific code in the CLI version of log4net
-#if !CLI_1_0
 
 using System;
 using System.Globalization;
@@ -660,7 +652,4 @@ namespace log4net.Appender
 	}
 }
 
-#endif // !CLI_1_0
-#endif // !SSCLI
-#endif // !MONO
 #endif // !NETCF

Modified: logging/log4net/trunk/src/Appender/ConsoleAppender.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Appender/ConsoleAppender.cs?rev=1538212&r1=1538211&r2=1538212&view=diff
==============================================================================
--- logging/log4net/trunk/src/Appender/ConsoleAppender.cs (original)
+++ logging/log4net/trunk/src/Appender/ConsoleAppender.cs Sat Nov  2 16:22:29 2013
@@ -150,10 +150,6 @@ namespace log4net.Appender
 		/// </remarks>
 		override protected void Append(LoggingEvent loggingEvent) 
 		{
-#if NETCF_1_0
-			// Write to the output stream
-			Console.Write(RenderLoggingEvent(loggingEvent));
-#else
 			if (m_writeToErrorStream)
 			{
 				// Write to the error stream
@@ -164,7 +160,6 @@ namespace log4net.Appender
 				// Write to the output stream
 				Console.Write(RenderLoggingEvent(loggingEvent));
 			}
-#endif
 		}
 
 		/// <summary>

Modified: logging/log4net/trunk/src/Appender/EventLogAppender.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Appender/EventLogAppender.cs?rev=1538212&r1=1538211&r2=1538212&view=diff
==============================================================================
--- logging/log4net/trunk/src/Appender/EventLogAppender.cs (original)
+++ logging/log4net/trunk/src/Appender/EventLogAppender.cs Sat Nov  2 16:22:29 2013
@@ -17,12 +17,7 @@
 //
 #endregion
 
-// MONO 1.0 Beta mcs does not like #if !A && !B && !C syntax
-
-// .NET Compact Framework 1.0 has no support for EventLog
 #if !NETCF 
-// SSCLI 1.0 has no support for EventLog
-#if !SSCLI
 
 using System;
 using System.Diagnostics;
@@ -686,5 +681,4 @@ namespace log4net.Appender
 	}
 }
 
-#endif // !SSCLI
 #endif // !NETCF

Modified: logging/log4net/trunk/src/Appender/LocalSyslogAppender.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Appender/LocalSyslogAppender.cs?rev=1538212&r1=1538211&r2=1538212&view=diff
==============================================================================
--- logging/log4net/trunk/src/Appender/LocalSyslogAppender.cs (original)
+++ logging/log4net/trunk/src/Appender/LocalSyslogAppender.cs Sat Nov  2 16:22:29 2013
@@ -17,9 +17,8 @@
 //
 #endregion
 
-// .NET Compact Framework 1.0 has no support for Marshal.StringToHGlobalAnsi
-// SSCLI 1.0 has no support for Marshal.StringToHGlobalAnsi
-#if !NETCF && !SSCLI
+// .NET Compact Framework has no support for Marshal.StringToHGlobalAnsi
+#if !NETCF
 
 using System;
 using System.Runtime.InteropServices;

Modified: logging/log4net/trunk/src/Appender/ManagedColoredConsoleAppender.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Appender/ManagedColoredConsoleAppender.cs?rev=1538212&r1=1538211&r2=1538212&view=diff
==============================================================================
--- logging/log4net/trunk/src/Appender/ManagedColoredConsoleAppender.cs (original)
+++ logging/log4net/trunk/src/Appender/ManagedColoredConsoleAppender.cs Sat Nov  2 16:22:29 2013
@@ -21,11 +21,6 @@
 //	http://msdn.microsoft.com/en-us/library/system.console.foregroundcolor.aspx
 // Disable for unsupported targets
 #if !NETCF 
-#if !SSCLI
-#if !CLI_1_0
-#if !MONO_1_0
-#if !NET_1_0
-#if !NET_1_1
 
 // The original ColoredConsoleAppender was written before the .NET framework
 // (and Mono) had built-in support for console colors so it was written using
@@ -340,9 +335,4 @@ namespace log4net.Appender
 	}
 }
 
-#endif
-#endif
-#endif // !MONO_1_0
-#endif // !CLI_1_0
-#endif // !SSCLI
 #endif // !NETCF

Modified: logging/log4net/trunk/src/Appender/NetSendAppender.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Appender/NetSendAppender.cs?rev=1538212&r1=1538211&r2=1538212&view=diff
==============================================================================
--- logging/log4net/trunk/src/Appender/NetSendAppender.cs (original)
+++ logging/log4net/trunk/src/Appender/NetSendAppender.cs Sat Nov  2 16:22:29 2013
@@ -17,16 +17,8 @@
 //
 #endregion
 
-// MONO 1.0 Beta mcs does not like #if !A && !B && !C syntax
-
-// .NET Compact Framework 1.0 has no support for Win32 NetMessageBufferSend API
+// .NET Compact Framework has no support for Win32 NetMessageBufferSend API
 #if !NETCF 
-// MONO 1.0 has no support for Win32 NetMessageBufferSend API
-#if !MONO 
-// SSCLI 1.0 has no support for Win32 NetMessageBufferSend API
-#if !SSCLI
-// We don't want framework or platform specific code in the CLI version of log4net
-#if !CLI_1_0
 
 using System;
 using System.Globalization;
@@ -419,7 +411,4 @@ namespace log4net.Appender 
 	}
 }
 
-#endif // !CLI_1_0
-#endif // !SSCLI
-#endif // !MONO
 #endif // !NETCF
\ No newline at end of file

Modified: logging/log4net/trunk/src/Appender/OutputDebugStringAppender.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Appender/OutputDebugStringAppender.cs?rev=1538212&r1=1538211&r2=1538212&view=diff
==============================================================================
--- logging/log4net/trunk/src/Appender/OutputDebugStringAppender.cs (original)
+++ logging/log4net/trunk/src/Appender/OutputDebugStringAppender.cs Sat Nov  2 16:22:29 2013
@@ -17,13 +17,6 @@
 //
 #endregion
 
-// MONO 1.0 has no support for Win32 OutputDebugString API
-#if !MONO
-// SSCLI 1.0 has no support for Win32 OutputDebugString API
-#if !SSCLI
-// We don't want framework or platform specific code in the CLI version of log4net
-#if !CLI_1_0
-
 using System.Runtime.InteropServices;
 
 using log4net.Layout;
@@ -122,7 +115,3 @@ namespace log4net.Appender
 		#endregion // Protected Static Methods
 	}
 }
-
-#endif // !CLI_1_0
-#endif // !SSCLI
-#endif // !MONO

Modified: logging/log4net/trunk/src/Appender/RollingFileAppender.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Appender/RollingFileAppender.cs?rev=1538212&r1=1538211&r2=1538212&view=diff
==============================================================================
--- logging/log4net/trunk/src/Appender/RollingFileAppender.cs (original)
+++ logging/log4net/trunk/src/Appender/RollingFileAppender.cs Sat Nov  2 16:22:29 2013
@@ -239,7 +239,7 @@ namespace log4net.Appender
 
 		#region Public Instance Properties
 
-#if !NET_1_0 && !CLI_1_0 && !NETCF
+#if !NETCF
         /// <summary>
 		/// Gets or sets the strategy for determining the current date and time. The default
 		/// implementation is to use LocalDateTime which internally calls through to DateTime.Now. 
@@ -796,7 +796,7 @@ namespace log4net.Appender
 				{
 					DateTime last;
 					using(SecurityContext.Impersonate(this)) {
-#if !NET_1_0 && !CLI_1_0 && !NETCF
+#if !NETCF
                         if (DateTimeStrategy is UniversalDateTime)
 						{
 							last = System.IO.File.GetLastWriteTimeUtc(m_baseFileName);
@@ -805,7 +805,7 @@ namespace log4net.Appender
 						{
 #endif
 							last = System.IO.File.GetLastWriteTime(m_baseFileName);
-#if !NET_1_0 && !CLI_1_0 && !NETCF
+#if !NETCF
                         }
 #endif
                     }
@@ -1699,7 +1699,7 @@ namespace log4net.Appender
 			}
 		}
 
-#if !NET_1_0 && !CLI_1_0 && !NETCF
+#if !NETCF
         /// <summary>
 		/// Implementation of <see cref="IDateTime"/> that returns the current time as the coordinated universal time (UTC).
 		/// </summary>

Modified: logging/log4net/trunk/src/Appender/SmtpAppender.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Appender/SmtpAppender.cs?rev=1538212&r1=1538211&r2=1538212&view=diff
==============================================================================
--- logging/log4net/trunk/src/Appender/SmtpAppender.cs (original)
+++ logging/log4net/trunk/src/Appender/SmtpAppender.cs Sat Nov  2 16:22:29 2013
@@ -17,19 +17,14 @@
 //
 #endregion
 
-// .NET Compact Framework 1.0 has no support for System.Web.Mail
-// SSCLI 1.0 has no support for System.Web.Mail
-#if !NETCF && !SSCLI
+// .NET Compact Framework has no support for System.Web.Mail
+#if !NETCF
 
 using System;
 using System.IO;
 using System.Text;
 
-#if NET_2_0
 using System.Net.Mail;
-#else
-using System.Web.Mail;
-#endif
 
 using log4net.Layout;
 using log4net.Core;
@@ -324,7 +319,6 @@ namespace log4net.Appender
 			set { m_mailPriority = value; }
 		}
 
-#if NET_2_0
         /// <summary>
         /// Enable or disable use of SSL when sending e-mail message
         /// </summary>
@@ -348,7 +342,6 @@ namespace log4net.Appender
             get { return m_replyTo; }
             set { m_replyTo = value; }
         }
-#endif
 
 		/// <summary>
 		/// Gets or sets the subject encoding to be used.
@@ -444,7 +437,6 @@ namespace log4net.Appender
 		/// <param name="messageBody">the body text to include in the mail</param>
 		virtual protected void SendEmail(string messageBody)
 		{
-#if NET_2_0
 			// .NET 2.0 has a new API for SMTP email System.Net.Mail
 			// This API supports credentials and multiple hosts correctly.
 			// The old API is deprecated.
@@ -502,83 +494,6 @@ namespace log4net.Appender
                 // behaviour compared to .NET 1.x. We would need a SendCompletedCallback to log errors.
                 smtpClient.Send(mailMessage);
             }
-#else
-				// .NET 1.x uses the System.Web.Mail API for sending Mail
-
-				MailMessage mailMessage = new MailMessage();
-				mailMessage.Body = messageBody;
-				mailMessage.BodyEncoding = m_bodyEncoding;
-				mailMessage.From = m_from;
-				mailMessage.To = m_to;
-                if (m_cc != null && m_cc.Length > 0)
-                {
-                    mailMessage.Cc = m_cc;
-                }
-                if (m_bcc != null && m_bcc.Length > 0)
-                {
-                    mailMessage.Bcc = m_bcc;
-                }
-				mailMessage.Subject = m_subject;
-#if !MONO && !NET_1_0 && !NET_1_1 && !CLI_1_0
-				mailMessage.SubjectEncoding = m_subjectEncoding;
-#endif
-				mailMessage.Priority = m_mailPriority;
-
-#if NET_1_1
-				// The Fields property on the MailMessage allows the CDO properties to be set directly.
-				// This property is only available on .NET Framework 1.1 and the implementation must understand
-				// the CDO properties. For details of the fields available in CDO see:
-				//
-				// http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cdosys/html/_cdosys_configuration_coclass.asp
-				// 
-
-				try
-				{
-					if (m_authentication == SmtpAuthentication.Basic)
-					{
-						// Perform basic authentication
-						mailMessage.Fields.Add("http://schemas.microsoft.com/cdo/configuration/smtpauthenticate", 1);
-						mailMessage.Fields.Add("http://schemas.microsoft.com/cdo/configuration/sendusername", m_username);
-						mailMessage.Fields.Add("http://schemas.microsoft.com/cdo/configuration/sendpassword", m_password);
-					}
-					else if (m_authentication == SmtpAuthentication.Ntlm)
-					{
-						// Perform integrated authentication (NTLM)
-						mailMessage.Fields.Add("http://schemas.microsoft.com/cdo/configuration/smtpauthenticate", 2);
-					}
-
-					// Set the port if not the default value
-					if (m_port != 25) 
-					{
-						mailMessage.Fields.Add("http://schemas.microsoft.com/cdo/configuration/smtpserverport", m_port);
-					}
-				}
-				catch(MissingMethodException missingMethodException)
-				{
-					// If we were compiled against .NET 1.1 but are running against .NET 1.0 then
-					// we will get a MissingMethodException when accessing the MailMessage.Fields property.
-
-					ErrorHandler.Error("SmtpAppender: Authentication and server Port are only supported when running on the MS .NET 1.1 framework", missingMethodException);
-				}
-#else
-				if (m_authentication != SmtpAuthentication.None)
-				{
-					ErrorHandler.Error("SmtpAppender: Authentication is only supported on the MS .NET 1.1 or MS .NET 2.0 builds of log4net");
-				}
-
-				if (m_port != 25)
-				{
-					ErrorHandler.Error("SmtpAppender: Server Port is only supported on the MS .NET 1.1 or MS .NET 2.0 builds of log4net");
-				}
-#endif // if NET_1_1
-
-				if (m_smtpHost != null && m_smtpHost.Length > 0)
-				{
-					SmtpMail.SmtpServer = m_smtpHost;
-				}
-
-				SmtpMail.Send(mailMessage);
-#endif // if NET_2_0
 		}
 
 		#endregion // Protected Methods
@@ -604,10 +519,8 @@ namespace log4net.Appender
 
 		private MailPriority m_mailPriority = MailPriority.Normal;
 
-#if NET_2_0
         private bool m_enableSsl = false;
         private string m_replyTo;
-#endif
 
 		#endregion // Private Instance Fields
 
@@ -649,4 +562,4 @@ namespace log4net.Appender
 	}
 }
 
-#endif // !NETCF && !SSCLI
+#endif // !NETCF

Modified: logging/log4net/trunk/src/Appender/UdpAppender.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Appender/UdpAppender.cs?rev=1538212&r1=1538211&r2=1538212&view=diff
==============================================================================
--- logging/log4net/trunk/src/Appender/UdpAppender.cs (original)
+++ logging/log4net/trunk/src/Appender/UdpAppender.cs Sat Nov  2 16:22:29 2013
@@ -474,7 +474,7 @@ namespace log4net.Appender 
 			{
 				if (this.LocalPort == 0)
 				{
-#if NETCF || NET_1_0 || SSCLI_1_0 || CLI_1_0
+#if NETCF
 					this.Client = new UdpClient();
 #else
 					this.Client = new UdpClient(RemoteAddress.AddressFamily);
@@ -482,7 +482,7 @@ namespace log4net.Appender 
 				}
 				else
 				{
-#if NETCF || NET_1_0 || SSCLI_1_0 || CLI_1_0
+#if NETCF
 					this.Client = new UdpClient(this.LocalPort);
 #else
 					this.Client = new UdpClient(this.LocalPort, RemoteAddress.AddressFamily);

Modified: logging/log4net/trunk/src/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/AssemblyInfo.cs?rev=1538212&r1=1538211&r2=1538212&view=diff
==============================================================================
--- logging/log4net/trunk/src/AssemblyInfo.cs (original)
+++ logging/log4net/trunk/src/AssemblyInfo.cs Sat Nov  2 16:22:29 2013
@@ -20,12 +20,7 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 
-#if (!SSCLI)
-//
-// log4net makes use of static methods which cannot be made com visible
-//
 [assembly: System.Runtime.InteropServices.ComVisible(false)]
-#endif
 
 //
 // log4net is CLS compliant
@@ -53,13 +48,7 @@ using System.Runtime.CompilerServices;
 // associated with an assembly.
 //
 
-#if (CLI_1_0)
-[assembly: AssemblyTitle("Apache log4net for CLI 1.0 Compatible Frameworks")]
-#elif (NET_1_0)
-[assembly: AssemblyTitle("Apache log4net for .NET Framework 1.0")]
-#elif (NET_1_1)
-[assembly: AssemblyTitle("Apache log4net for .NET Framework 1.1")]
-#elif (NET_4_0)
+#if (NET_4_0)
 #if CLIENT_PROFILE
 [assembly: AssemblyTitle("Apache log4net for .NET Framework 4.0 Client Profile")]
 #else
@@ -71,26 +60,10 @@ using System.Runtime.CompilerServices;
 #else
 [assembly: AssemblyTitle("Apache log4net for .NET Framework 2.0")]
 #endif // Client Profile
-#elif (NETCF_1_0)
-[assembly: AssemblyTitle("Apache log4net for .NET Compact Framework 1.0")]
 #elif (NETCF_2_0)
 [assembly: AssemblyTitle("Apache log4net for .NET Compact Framework 2.0")]
-#elif (MONO_1_0)
-[assembly: AssemblyTitle("Apache log4net for Mono 1.0")]
 #elif (MONO_2_0)
 [assembly: AssemblyTitle("Apache log4net for Mono 2.0")]
-#elif (SSCLI_1_0)
-[assembly: AssemblyTitle("Apache log4net for Shared Source CLI 1.0")]
-#elif (CLI_1_0)
-[assembly: AssemblyTitle("Apache log4net for CLI Compatible Frameworks")]
-#elif (NET)
-[assembly: AssemblyTitle("Apache log4net for .NET Framework")]
-#elif (NETCF)
-[assembly: AssemblyTitle("Apache log4net for .NET Compact Framework")]
-#elif (MONO)
-[assembly: AssemblyTitle("Apache log4net for Mono")]
-#elif (SSCLI)
-[assembly: AssemblyTitle("Apache log4net for Shared Source CLI")]
 #else
 [assembly: AssemblyTitle("Apache log4net")]
 #endif
@@ -105,35 +78,3 @@ using System.Runtime.CompilerServices;
 [assembly: AssemblyDefaultAlias("log4net")]
 [assembly: AssemblyCulture("")]		
 		
-//
-// In order to sign your assembly you must specify a key to use. Refer to the 
-// Microsoft .NET Framework documentation for more information on assembly signing.
-//
-// Use the attributes below to control which key is used for signing. 
-//
-// Notes: 
-//   (*) If no key is specified, the assembly is not signed.
-//   (*) KeyName refers to a key that has been installed in the Crypto Service
-//       Provider (CSP) on your machine. KeyFile refers to a file which contains
-//       a key.
-//   (*) If the KeyFile and the KeyName values are both specified, the 
-//       following processing occurs:
-//       (1) If the KeyName can be found in the CSP, that key is used.
-//       (2) If the KeyName does not exist and the KeyFile does exist, the key 
-//           in the KeyFile is installed into the CSP and used.
-//   (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility.
-//       When specifying the KeyFile, the location of the KeyFile should be
-//       relative to the project output directory which is
-//       %Project Directory%\obj\<configuration>. For example, if your KeyFile is
-//       located in the project directory, you would specify the AssemblyKeyFile 
-//       attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]
-//   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
-//       documentation for more information on this.
-//
-#if STRONG && (CLI_1_0 || NET_1_0 || NET_1_1 || NETCF_1_0 || SSCLI)
-[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile(@"..\..\..\log4net.snk")]
-#endif
-// We do not use a CSP key for strong naming
-// [assembly: AssemblyKeyName("")]
-

Modified: logging/log4net/trunk/src/AssemblyVersionInfo.cpp
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/AssemblyVersionInfo.cpp?rev=1538212&r1=1538211&r2=1538212&view=diff
==============================================================================
--- logging/log4net/trunk/src/AssemblyVersionInfo.cpp (original)
+++ logging/log4net/trunk/src/AssemblyVersionInfo.cpp Sat Nov  2 16:22:29 2013
@@ -31,13 +31,11 @@ using namespace System::Runtime::Compile
 // You can specify all the value or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersionAttribute("1.2.12.0")];
-[assembly: AssemblyInformationalVersionAttribute("1.2")];
+[assembly: AssemblyVersionAttribute("1.3.0.0")];
+[assembly: AssemblyInformationalVersionAttribute("1.3")];
 
 #if !NETCF
-#if !SSCLI
-[assembly: AssemblyFileVersionAttribute("1.2.12.0")]
-#endif
+[assembly: AssemblyFileVersionAttribute("1.3.0.0")]
 #endif
 
 //

Modified: logging/log4net/trunk/src/AssemblyVersionInfo.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/AssemblyVersionInfo.cs?rev=1538212&r1=1538211&r2=1538212&view=diff
==============================================================================
--- logging/log4net/trunk/src/AssemblyVersionInfo.cs (original)
+++ logging/log4net/trunk/src/AssemblyVersionInfo.cs Sat Nov  2 16:22:29 2013
@@ -28,13 +28,11 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: System.Reflection.AssemblyVersion("1.2.13.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.2")]
+[assembly: System.Reflection.AssemblyVersion("1.3.0.0")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.3")]
 
 #if !NETCF
-#if !SSCLI
-[assembly: System.Reflection.AssemblyFileVersion("1.2.13.0")]
-#endif
+[assembly: System.Reflection.AssemblyFileVersion("1.3.0.0")]
 #endif
 
 //

Modified: logging/log4net/trunk/src/AssemblyVersionInfo.js
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/AssemblyVersionInfo.js?rev=1538212&r1=1538211&r2=1538212&view=diff
==============================================================================
--- logging/log4net/trunk/src/AssemblyVersionInfo.js (original)
+++ logging/log4net/trunk/src/AssemblyVersionInfo.js Sat Nov  2 16:22:29 2013
@@ -31,13 +31,11 @@
 // an import functions as a workaround for this issue.
 import System.Reflection;
 
-[assembly: AssemblyVersion("1.2.12.0")]
-[assembly: AssemblyInformationalVersionAttribute("1.2")]
+[assembly: AssemblyVersion("1.3.0.0")]
+[assembly: AssemblyInformationalVersionAttribute("1.3")]
 
 @if (!@NETCF)
-@if (!@SSCLI)
-[assembly: AssemblyFileVersion("1.2.12.0")]
-@end
+[assembly: AssemblyFileVersion("1.3.0.0")]
 @end
 
 //

Modified: logging/log4net/trunk/src/AssemblyVersionInfo.vb
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/AssemblyVersionInfo.vb?rev=1538212&r1=1538211&r2=1538212&view=diff
==============================================================================
--- logging/log4net/trunk/src/AssemblyVersionInfo.vb (original)
+++ logging/log4net/trunk/src/AssemblyVersionInfo.vb Sat Nov  2 16:22:29 2013
@@ -28,13 +28,11 @@
 ' You can specify all the values or you can default the Revision and Build Numbers 
 ' by using the '*' as shown below:
 
-<Assembly: System.Reflection.AssemblyVersion("1.2.12.0")>
-<Assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.2")>
+<Assembly: System.Reflection.AssemblyVersion("1.3.0.0")>
+<Assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.3")>
 
 #If NOT NETCF Then
-#If NOT SSCLI Then
-<Assembly: System.Reflection.AssemblyFileVersion("1.2.12.0")>
-#End If
+<Assembly: System.Reflection.AssemblyFileVersion("1.3.0.0")>
 #End If
 
 '

Modified: logging/log4net/trunk/src/Config/DOMConfigurator.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Config/DOMConfigurator.cs?rev=1538212&r1=1538211&r2=1538212&view=diff
==============================================================================
--- logging/log4net/trunk/src/Config/DOMConfigurator.cs (original)
+++ logging/log4net/trunk/src/Config/DOMConfigurator.cs Sat Nov  2 16:22:29 2013
@@ -287,7 +287,7 @@ namespace log4net.Config
 
 		#region ConfigureAndWatch static methods
 
-#if (!NETCF && !SSCLI)
+#if !NETCF
 
 		/// <summary>
 		/// Configures log4net using the file specified, monitors the file for changes 

Modified: logging/log4net/trunk/src/Config/XmlConfigurator.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Config/XmlConfigurator.cs?rev=1538212&r1=1538211&r2=1538212&view=diff
==============================================================================
--- logging/log4net/trunk/src/Config/XmlConfigurator.cs (original)
+++ logging/log4net/trunk/src/Config/XmlConfigurator.cs Sat Nov  2 16:22:29 2013
@@ -639,7 +639,6 @@ namespace log4net.Config
 
 					if (configRequest != null)
 					{
-#if !NETCF_1_0
 						// authentication may be required, set client to use default credentials
 						try
 						{
@@ -649,7 +648,7 @@ namespace log4net.Config
 						{
 							// ignore security exception
 						}
-#endif
+
 						try
 						{
 							WebResponse response = configRequest.GetResponse();
@@ -785,7 +784,7 @@ namespace log4net.Config
 
 		#region ConfigureAndWatch static methods
 
-#if (!NETCF && !SSCLI)
+#if !NETCF
 
 		/// <summary>
 		/// Configures log4net using the file specified, monitors the file for changes 
@@ -906,7 +905,7 @@ namespace log4net.Config
 
 		#region ConfigureAndWatchHandler
 
-#if (!NETCF && !SSCLI)
+#if !NETCF
 		/// <summary>
 		/// Class used to watch config files.
 		/// </summary>

Modified: logging/log4net/trunk/src/Config/XmlConfiguratorAttribute.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Config/XmlConfiguratorAttribute.cs?rev=1538212&r1=1538211&r2=1538212&view=diff
==============================================================================
--- logging/log4net/trunk/src/Config/XmlConfiguratorAttribute.cs (original)
+++ logging/log4net/trunk/src/Config/XmlConfiguratorAttribute.cs Sat Nov  2 16:22:29 2013
@@ -168,9 +168,6 @@ namespace log4net.Config
 		/// from a web server the config file may not reside on the local disk
 		/// and therefore it may not be able to watch it.
 		/// </para>
-		/// <note>
-		/// Watching configuration is not supported on the SSCLI.
-		/// </note>
 		/// </remarks>
 		public bool Watch
 		{
@@ -313,13 +310,6 @@ namespace log4net.Config
 		/// <param name="configFile">the FileInfo pointing to the config file</param>
 		private void ConfigureFromFile(ILoggerRepository targetRepository, FileInfo configFile)
 		{
-#if (SSCLI)
-			if (m_configureAndWatch)
-			{
-				LogLog.Warn(declaringType, "XmlConfiguratorAttribute: Unable to watch config file not supported on SSCLI");
-			}
-			XmlConfigurator.Configure(targetRepository, configFile);
-#else
 			// Do we configure just once or do we configure and then watch?
 			if (m_configureAndWatch)
 			{
@@ -329,7 +319,6 @@ namespace log4net.Config
 			{
 				XmlConfigurator.Configure(targetRepository, configFile);
 			}
-#endif
 		}
 
 		/// <summary>

Modified: logging/log4net/trunk/src/Core/DefaultRepositorySelector.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Core/DefaultRepositorySelector.cs?rev=1538212&r1=1538211&r2=1538212&view=diff
==============================================================================
--- logging/log4net/trunk/src/Core/DefaultRepositorySelector.cs (original)
+++ logging/log4net/trunk/src/Core/DefaultRepositorySelector.cs Sat Nov  2 16:22:29 2013
@@ -705,7 +705,7 @@ namespace log4net.Core
 
                     // Determine whether to watch the file or not based on an app setting value:
 				    bool watchRepositoryConfigFile = false;
-#if NET_2_0 || MONO_2_0
+#if !NETCF
 				    Boolean.TryParse(SystemInfo.GetAppSetting("log4net.Config.Watch"), out watchRepositoryConfigFile);
 #else
                                     {

Modified: logging/log4net/trunk/src/Core/LoggerManager.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Core/LoggerManager.cs?rev=1538212&r1=1538211&r2=1538212&view=diff
==============================================================================
--- logging/log4net/trunk/src/Core/LoggerManager.cs (original)
+++ logging/log4net/trunk/src/Core/LoggerManager.cs Sat Nov  2 16:22:29 2013
@@ -805,9 +805,7 @@ namespace log4net.Core
 			sb.Append("log4net assembly [").Append(myAssembly.FullName).Append("]. ");
 			sb.Append("Loaded from [").Append(SystemInfo.AssemblyLocationInfo(myAssembly)).Append("]. ");
 			sb.Append("(.NET Runtime [").Append(Environment.Version.ToString()).Append("]");
-#if (!SSCLI)
             sb.Append(" on ").Append(Environment.OSVersion.ToString());
-#endif
             sb.Append(")");
 			return sb.ToString();
 		}

Modified: logging/log4net/trunk/src/Core/LoggingEvent.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Core/LoggingEvent.cs?rev=1538212&r1=1538211&r2=1538212&view=diff
==============================================================================
--- logging/log4net/trunk/src/Core/LoggingEvent.cs (original)
+++ logging/log4net/trunk/src/Core/LoggingEvent.cs Sat Nov  2 16:22:29 2013
@@ -828,7 +828,7 @@ namespace log4net.Core
 			{
 				if (m_data.UserName == null  && this.m_cacheUpdatable) 
 				{
-#if (NETCF || SSCLI)
+#if NETCF
 					// On compact framework there's no notion of current Windows user
 					m_data.UserName = SystemInfo.NotAvailableText;
 #else
@@ -876,7 +876,7 @@ namespace log4net.Core
 			{
 				if (m_data.Identity == null  && this.m_cacheUpdatable)
 				{
-#if (NETCF || SSCLI)
+#if NETCF
 					// On compact framework there's no notion of current thread principals
 					m_data.Identity = SystemInfo.NotAvailableText;
 #else

Modified: logging/log4net/trunk/src/DateFormatter/AbsoluteTimeDateFormatter.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/DateFormatter/AbsoluteTimeDateFormatter.cs?rev=1538212&r1=1538211&r2=1538212&view=diff
==============================================================================
--- logging/log4net/trunk/src/DateFormatter/AbsoluteTimeDateFormatter.cs (original)
+++ logging/log4net/trunk/src/DateFormatter/AbsoluteTimeDateFormatter.cs Sat Nov  2 16:22:29 2013
@@ -138,11 +138,6 @@ namespace log4net.DateFormatter
 						// Render the string buffer to a string
                                                 timeString = s_lastTimeBuf.ToString();
 
-#if NET_1_1
-						// Ensure that the above string is written into the variable NOW on all threads.
-						// This is only required on multiprocessor machines with weak memeory models
-						System.Threading.Thread.MemoryBarrier();
-#endif
 						// Store the time as a string (we only have to do this once per second)
                                                 s_lastTimeStrings[GetType()] = timeString;
 						s_lastTimeToTheSecond = currentTimeToTheSecond;

Modified: logging/log4net/trunk/src/Layout/Pattern/AspNetCachePatternConverter.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Layout/Pattern/AspNetCachePatternConverter.cs?rev=1538212&r1=1538211&r2=1538212&view=diff
==============================================================================
--- logging/log4net/trunk/src/Layout/Pattern/AspNetCachePatternConverter.cs (original)
+++ logging/log4net/trunk/src/Layout/Pattern/AspNetCachePatternConverter.cs Sat Nov  2 16:22:29 2013
@@ -17,9 +17,8 @@
 //
 #endregion
 
-// .NET Compact Framework 1.0 has no support for ASP.NET
-// SSCLI 1.0 has no support for ASP.NET
-#if !NETCF && !SSCLI && !CLIENT_PROFILE
+// .NET Compact Framework has no support for ASP.NET
+#if !NETCF && !CLIENT_PROFILE
 
 using System.IO;
 using System.Web;

Modified: logging/log4net/trunk/src/Layout/Pattern/AspNetContextPatternConverter.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Layout/Pattern/AspNetContextPatternConverter.cs?rev=1538212&r1=1538211&r2=1538212&view=diff
==============================================================================
--- logging/log4net/trunk/src/Layout/Pattern/AspNetContextPatternConverter.cs (original)
+++ logging/log4net/trunk/src/Layout/Pattern/AspNetContextPatternConverter.cs Sat Nov  2 16:22:29 2013
@@ -17,9 +17,8 @@
 //
 #endregion
 
-// .NET Compact Framework 1.0 has no support for ASP.NET
-// SSCLI 1.0 has no support for ASP.NET
-#if !NETCF && !SSCLI && !CLIENT_PROFILE
+// .NET Compact Framework has no support for ASP.NET
+#if !NETCF && !CLIENT_PROFILE
 
 using System.IO;
 using System.Web;

Modified: logging/log4net/trunk/src/Layout/Pattern/AspNetPatternConverter.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Layout/Pattern/AspNetPatternConverter.cs?rev=1538212&r1=1538211&r2=1538212&view=diff
==============================================================================
--- logging/log4net/trunk/src/Layout/Pattern/AspNetPatternConverter.cs (original)
+++ logging/log4net/trunk/src/Layout/Pattern/AspNetPatternConverter.cs Sat Nov  2 16:22:29 2013
@@ -17,9 +17,8 @@
 //
 #endregion
 
-// .NET Compact Framework 1.0 has no support for ASP.NET
-// SSCLI 1.0 has no support for ASP.NET
-#if !NETCF && !SSCLI && !CLIENT_PROFILE
+// .NET Compact Framework has no support for ASP.NET
+#if !NETCF && !CLIENT_PROFILE
 
 using System.IO;
 using System.Web;

Modified: logging/log4net/trunk/src/Layout/Pattern/AspNetRequestPatternConverter.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Layout/Pattern/AspNetRequestPatternConverter.cs?rev=1538212&r1=1538211&r2=1538212&view=diff
==============================================================================
--- logging/log4net/trunk/src/Layout/Pattern/AspNetRequestPatternConverter.cs (original)
+++ logging/log4net/trunk/src/Layout/Pattern/AspNetRequestPatternConverter.cs Sat Nov  2 16:22:29 2013
@@ -17,9 +17,8 @@
 //
 #endregion
 
-// .NET Compact Framework 1.0 has no support for ASP.NET
-// SSCLI 1.0 has no support for ASP.NET
-#if !NETCF && !SSCLI && !CLIENT_PROFILE
+// .NET Compact Framework has no support for ASP.NET
+#if !NETCF && !CLIENT_PROFILE
 
 using System.IO;
 using System.Web;

Modified: logging/log4net/trunk/src/Layout/Pattern/AspNetSessionPatternConverter.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Layout/Pattern/AspNetSessionPatternConverter.cs?rev=1538212&r1=1538211&r2=1538212&view=diff
==============================================================================
--- logging/log4net/trunk/src/Layout/Pattern/AspNetSessionPatternConverter.cs (original)
+++ logging/log4net/trunk/src/Layout/Pattern/AspNetSessionPatternConverter.cs Sat Nov  2 16:22:29 2013
@@ -17,9 +17,8 @@
 //
 #endregion
 
-// .NET Compact Framework 1.0 has no support for ASP.NET
-// SSCLI 1.0 has no support for ASP.NET
-#if !NETCF && !SSCLI && !CLIENT_PROFILE
+// .NET Compact Framework has no support for ASP.NET
+#if !NETCF && !CLIENT_PROFILE
 
 using System.IO;
 using System.Web;

Modified: logging/log4net/trunk/src/Layout/PatternLayout.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Layout/PatternLayout.cs?rev=1538212&r1=1538211&r2=1538212&view=diff
==============================================================================
--- logging/log4net/trunk/src/Layout/PatternLayout.cs (original)
+++ logging/log4net/trunk/src/Layout/PatternLayout.cs Sat Nov  2 16:22:29 2013
@@ -859,9 +859,8 @@ namespace log4net.Layout
 			s_globalRulesRegistry.Add("newline", typeof(NewLinePatternConverter));
 			s_globalRulesRegistry.Add("n", typeof(NewLinePatternConverter));
 
-// .NET Compact Framework 1.0 has no support for ASP.NET
-// SSCLI 1.0 has no support for ASP.NET
-#if !NETCF && !SSCLI && !CLIENT_PROFILE
+// .NET Compact Framework has no support for ASP.NET
+#if !NETCF && !CLIENT_PROFILE
 			s_globalRulesRegistry.Add("aspnet-cache", typeof(AspNetCachePatternConverter));
 			s_globalRulesRegistry.Add("aspnet-context", typeof(AspNetContextPatternConverter));
 			s_globalRulesRegistry.Add("aspnet-request", typeof(AspNetRequestPatternConverter));

Modified: logging/log4net/trunk/src/Layout/XMLLayout.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Layout/XMLLayout.cs?rev=1538212&r1=1538211&r2=1538212&view=diff
==============================================================================
--- logging/log4net/trunk/src/Layout/XMLLayout.cs (original)
+++ logging/log4net/trunk/src/Layout/XMLLayout.cs Sat Nov  2 16:22:29 2013
@@ -220,11 +220,7 @@ namespace log4net.Layout
 			writer.WriteStartElement(m_elmEvent);
 			writer.WriteAttributeString(ATTR_LOGGER, loggingEvent.LoggerName);
 
-#if NET_2_0 || NETCF_2_0 || MONO_2_0
 			writer.WriteAttributeString(ATTR_TIMESTAMP, XmlConvert.ToString(loggingEvent.TimeStamp, XmlDateTimeSerializationMode.Local));
-#else
-			writer.WriteAttributeString(ATTR_TIMESTAMP, XmlConvert.ToString(loggingEvent.TimeStamp));
-#endif
 
 			writer.WriteAttributeString(ATTR_LEVEL, loggingEvent.Level.DisplayName);
 			writer.WriteAttributeString(ATTR_THREAD, loggingEvent.ThreadName);

Modified: logging/log4net/trunk/src/Log4netAssemblyInfo.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Log4netAssemblyInfo.cs?rev=1538212&r1=1538211&r2=1538212&view=diff
==============================================================================
--- logging/log4net/trunk/src/Log4netAssemblyInfo.cs (original)
+++ logging/log4net/trunk/src/Log4netAssemblyInfo.cs Sat Nov  2 16:22:29 2013
@@ -25,34 +25,24 @@ namespace log4net {
     /// </summary>
     public sealed class AssemblyInfo {
         /// <summary>Version of the assembly</summary>
-        public const string Version = "1.2.12";
+        public const string Version = "1.3.0";
 
         /// <summary>Version of the framework targeted</summary>
-#if NET_1_1
-        public const decimal TargetFrameworkVersion = 1.1M;
-#elif NET_4_0
+#if NET_4_0
         public const decimal TargetFrameworkVersion = 4.0M;
-#elif NET_2_0 || NETCF_2_0 || MONO_2_0
-#if !CLIENT_PROFILE
+#elif !CLIENT_PROFILE
         public const decimal TargetFrameworkVersion = 2.0M;
 #else
         public const decimal TargetFrameworkVersion = 3.5M;
-#endif  // Client Profile
-#else
-        public const decimal TargetFrameworkVersion = 1.0M;
 #endif
 
         /// <summary>Type of framework targeted</summary>
-#if CLI
-        public const string TargetFramework = "CLI Compatible Frameworks";
-#elif NET
+#if NET
         public const string TargetFramework = ".NET Framework";
 #elif NETCF
         public const string TargetFramework = ".NET Compact Framework";
 #elif MONO
         public const string TargetFramework = "Mono";
-#elif SSCLI
-        public const string TargetFramework = "Shared Source CLI";
 #else
         public const string TargetFramework = "Unknown";
 #endif

Modified: logging/log4net/trunk/src/NDC.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/NDC.cs?rev=1538212&r1=1538211&r2=1538212&view=diff
==============================================================================
--- logging/log4net/trunk/src/NDC.cs (original)
+++ logging/log4net/trunk/src/NDC.cs Sat Nov  2 16:22:29 2013
@@ -20,10 +20,6 @@
 using System;
 using System.Collections;
 
-#if NETCF_1_0
-using Stack = log4net.Util.ThreadContextStack.Stack;
-#endif
-
 namespace log4net
 {
 	/// <summary>

Modified: logging/log4net/trunk/src/Repository/Hierarchy/Logger.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Repository/Hierarchy/Logger.cs?rev=1538212&r1=1538211&r2=1538212&view=diff
==============================================================================
--- logging/log4net/trunk/src/Repository/Hierarchy/Logger.cs (original)
+++ logging/log4net/trunk/src/Repository/Hierarchy/Logger.cs Sat Nov  2 16:22:29 2013
@@ -432,7 +432,7 @@ namespace log4net.Repository.Hierarchy
 			{
 				log4net.Util.LogLog.Error(declaringType, "Exception while logging", ex);
 			}
-#if !NET_2_0 && !MONO_2_0
+#if NETCF
 			catch
 			{
 				log4net.Util.LogLog.Error(declaringType, "Exception while logging");
@@ -469,7 +469,7 @@ namespace log4net.Repository.Hierarchy
 			{
 				log4net.Util.LogLog.Error(declaringType, "Exception while logging", ex);
 			}
-#if !NET_2_0 && !MONO_2_0
+#if NETCF
 			catch
 			{
 				log4net.Util.LogLog.Error(declaringType, "Exception while logging");
@@ -509,7 +509,7 @@ namespace log4net.Repository.Hierarchy
 			{
 				log4net.Util.LogLog.Error(declaringType, "Exception while logging", ex);
 			}
-#if !NET_2_0 && !MONO_2_0
+#if NETCF
 			catch
 			{
 				log4net.Util.LogLog.Error(declaringType, "Exception while logging");

Modified: logging/log4net/trunk/src/Util/LogicalThreadContextProperties.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Util/LogicalThreadContextProperties.cs?rev=1538212&r1=1538211&r2=1538212&view=diff
==============================================================================
--- logging/log4net/trunk/src/Util/LogicalThreadContextProperties.cs (original)
+++ logging/log4net/trunk/src/Util/LogicalThreadContextProperties.cs Sat Nov  2 16:22:29 2013
@@ -208,7 +208,7 @@ namespace log4net.Util
 #endif
         private static PropertiesDictionary GetCallContextData()
 		{
-#if NET_2_0 || MONO_2_0
+#if !NETCF
             return CallContext.LogicalGetData(c_SlotName) as PropertiesDictionary;
 #else
 			return CallContext.GetData(c_SlotName) as PropertiesDictionary;
@@ -229,7 +229,7 @@ namespace log4net.Util
 #endif
         private static void SetCallContextData(PropertiesDictionary properties)
 		{
-#if NET_2_0 || MONO_2_0
+#if !NETCF
 			CallContext.LogicalSetData(c_SlotName, properties);
 #else
 			CallContext.SetData(c_SlotName, properties);

Modified: logging/log4net/trunk/src/Util/NativeError.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Util/NativeError.cs?rev=1538212&r1=1538211&r2=1538212&view=diff
==============================================================================
--- logging/log4net/trunk/src/Util/NativeError.cs (original)
+++ logging/log4net/trunk/src/Util/NativeError.cs Sat Nov  2 16:22:29 2013
@@ -17,13 +17,6 @@
 //
 #endregion
 
-// MONO 1.0 has no support for Win32 Error APIs
-#if !MONO
-// SSCLI 1.0 has no support for Win32 Error APIs
-#if !SSCLI
-// We don't want framework or platform specific code in the CLI version of log4net
-#if !CLI_1_0
-
 using System;
 using System.Globalization;
 using System.Runtime.InteropServices;
@@ -284,7 +277,3 @@ namespace log4net.Util 
 		#endregion
 	}
 }
-
-#endif // !CLI_1_0
-#endif // !SSCLI
-#endif // !MONO

Modified: logging/log4net/trunk/src/Util/PatternStringConverters/IdentityPatternConverter.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Util/PatternStringConverters/IdentityPatternConverter.cs?rev=1538212&r1=1538211&r2=1538212&view=diff
==============================================================================
--- logging/log4net/trunk/src/Util/PatternStringConverters/IdentityPatternConverter.cs (original)
+++ logging/log4net/trunk/src/Util/PatternStringConverters/IdentityPatternConverter.cs Sat Nov  2 16:22:29 2013
@@ -48,7 +48,7 @@ namespace log4net.Util.PatternStringConv
 		/// </remarks>
 		override protected void Convert(TextWriter writer, object state) 
 		{
-#if (NETCF || SSCLI)
+#if NETCF
 			// On compact framework there's no notion of current thread principals
 			writer.Write( SystemInfo.NotAvailableText );
 #else

Modified: logging/log4net/trunk/src/Util/PatternStringConverters/ProcessIdPatternConverter.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Util/PatternStringConverters/ProcessIdPatternConverter.cs?rev=1538212&r1=1538211&r2=1538212&view=diff
==============================================================================
--- logging/log4net/trunk/src/Util/PatternStringConverters/ProcessIdPatternConverter.cs (original)
+++ logging/log4net/trunk/src/Util/PatternStringConverters/ProcessIdPatternConverter.cs Sat Nov  2 16:22:29 2013
@@ -51,7 +51,7 @@ namespace log4net.Util.PatternStringConv
 #endif
         override protected void Convert(TextWriter writer, object state) 
 		{
-#if (NETCF || SSCLI)
+#if NETCF
 			// On compact framework there is no System.Diagnostics.Process class
 			writer.Write( SystemInfo.NotAvailableText );
 #else

Modified: logging/log4net/trunk/src/Util/PatternStringConverters/UserNamePatternConverter.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Util/PatternStringConverters/UserNamePatternConverter.cs?rev=1538212&r1=1538211&r2=1538212&view=diff
==============================================================================
--- logging/log4net/trunk/src/Util/PatternStringConverters/UserNamePatternConverter.cs (original)
+++ logging/log4net/trunk/src/Util/PatternStringConverters/UserNamePatternConverter.cs Sat Nov  2 16:22:29 2013
@@ -48,7 +48,7 @@ namespace log4net.Util.PatternStringConv
 		/// </remarks>
 		override protected void Convert(TextWriter writer, object state) 
 		{
-#if (NETCF || SSCLI)
+#if NETCF
 			// On compact framework there's no notion of current Windows user
 			writer.Write( SystemInfo.NotAvailableText );
 #else

Modified: logging/log4net/trunk/src/Util/SystemInfo.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Util/SystemInfo.cs?rev=1538212&r1=1538211&r2=1538212&view=diff
==============================================================================
--- logging/log4net/trunk/src/Util/SystemInfo.cs (original)
+++ logging/log4net/trunk/src/Util/SystemInfo.cs Sat Nov  2 16:22:29 2013
@@ -223,13 +223,7 @@ namespace log4net.Util
 		{
 			get 
 			{
-#if NETCF_1_0
-				return System.Threading.Thread.CurrentThread.GetHashCode();
-#elif NET_2_0 || NETCF_2_0 || MONO_2_0
 				return System.Threading.Thread.CurrentThread.ManagedThreadId;
-#else
-				return AppDomain.GetCurrentThreadId();
-#endif
 			}
 		}
 
@@ -283,7 +277,7 @@ namespace log4net.Util
 					{
 						try
 						{
-#if (!SSCLI && !NETCF)
+#if !NETCF
 							s_hostName = Environment.MachineName;
 #endif
 						}
@@ -740,11 +734,7 @@ namespace log4net.Util
 		/// </remarks>
 		public static Guid NewGuid()
 		{
-#if NETCF_1_0
-			return PocketGuid.NewGuid();
-#else
 			return Guid.NewGuid();
-#endif
 		}
 
 		/// <summary>
@@ -768,9 +758,7 @@ namespace log4net.Util
 		/// </remarks>
 		public static ArgumentOutOfRangeException CreateArgumentOutOfRangeException(string parameterName, object actualValue, string message)
 		{
-#if NETCF_1_0
-			return new ArgumentOutOfRangeException(message + " [param=" + parameterName + "] [value=" + actualValue + "]");
-#elif NETCF_2_0
+#if NETCF_2_0
 			return new ArgumentOutOfRangeException(parameterName, message + " [value=" + actualValue + "]");
 #else
 			return new ArgumentOutOfRangeException(parameterName, actualValue, message);
@@ -1013,13 +1001,7 @@ namespace log4net.Util
 		/// </remarks>
 		public static Hashtable CreateCaseInsensitiveHashtable()
 		{
-#if NETCF_1_0
-			return new Hashtable(CaseInsensitiveHashCodeProvider.Default, CaseInsensitiveComparer.Default);
-#elif NETCF_2_0 || NET_2_0 || MONO_2_0
 			return new Hashtable(StringComparer.OrdinalIgnoreCase);
-#else
-			return System.Collections.Specialized.CollectionsUtil.CreateCaseInsensitiveHashtable();
-#endif
 		}
 
 		#endregion Public Static Methods
@@ -1117,126 +1099,5 @@ namespace log4net.Util
 		private static DateTime s_processStartTime = DateTime.Now;
 
 		#endregion
-
-		#region Compact Framework Helper Classes
-#if NETCF_1_0
-		/// <summary>
-		/// Generate GUIDs on the .NET Compact Framework.
-		/// </summary>
-		public class PocketGuid
-		{
-			// guid variant types
-			private enum GuidVariant
-			{
-				ReservedNCS = 0x00,
-				Standard = 0x02,
-				ReservedMicrosoft = 0x06,
-				ReservedFuture = 0x07
-			}
-
-			// guid version types
-			private enum GuidVersion
-			{
-				TimeBased = 0x01,
-				Reserved = 0x02,
-				NameBased = 0x03,
-				Random = 0x04
-			}
-
-			// constants that are used in the class
-			private class Const
-			{
-				// number of bytes in guid
-				public const int ByteArraySize = 16;
-
-				// multiplex variant info
-				public const int VariantByte = 8;
-				public const int VariantByteMask = 0x3f;
-				public const int VariantByteShift = 6;
-
-				// multiplex version info
-				public const int VersionByte = 7;
-				public const int VersionByteMask = 0x0f;
-				public const int VersionByteShift = 4;
-			}
-
-			// imports for the crypto api functions
-			private class WinApi
-			{
-				public const uint PROV_RSA_FULL = 1;
-				public const uint CRYPT_VERIFYCONTEXT = 0xf0000000;
-
-				[DllImport("CoreDll.dll")] 
-				public static extern bool CryptAcquireContext(
-					ref IntPtr phProv, string pszContainer, string pszProvider,
-					uint dwProvType, uint dwFlags);
-
-				[DllImport("CoreDll.dll")] 
-				public static extern bool CryptReleaseContext( 
-					IntPtr hProv, uint dwFlags);
-
-				[DllImport("CoreDll.dll")] 
-				public static extern bool CryptGenRandom(
-					IntPtr hProv, int dwLen, byte[] pbBuffer);
-			}
-
-			// all static methods
-			private PocketGuid()
-			{
-			}
-
-			/// <summary>
-			/// Return a new System.Guid object.
-			/// </summary>
-			public static Guid NewGuid()
-			{
-				IntPtr hCryptProv = IntPtr.Zero;
-				Guid guid = Guid.Empty;
-
-				try
-				{
-					// holds random bits for guid
-					byte[] bits = new byte[Const.ByteArraySize];
-
-					// get crypto provider handle
-					if (!WinApi.CryptAcquireContext(ref hCryptProv, null, null, 
-						WinApi.PROV_RSA_FULL, WinApi.CRYPT_VERIFYCONTEXT))
-					{
-						throw new SystemException(
-							"Failed to acquire cryptography handle.");
-					}
-
-					// generate a 128 bit (16 byte) cryptographically random number
-					if (!WinApi.CryptGenRandom(hCryptProv, bits.Length, bits))
-					{
-						throw new SystemException(
-							"Failed to generate cryptography random bytes.");
-					}
-
-					// set the variant
-					bits[Const.VariantByte] &= Const.VariantByteMask;
-					bits[Const.VariantByte] |= 
-						((int)GuidVariant.Standard << Const.VariantByteShift);
-
-					// set the version
-					bits[Const.VersionByte] &= Const.VersionByteMask;
-					bits[Const.VersionByte] |= 
-						((int)GuidVersion.Random << Const.VersionByteShift);
-
-					// create the new System.Guid object
-					guid = new Guid(bits);
-				}
-				finally
-				{
-					// release the crypto provider handle
-					if (hCryptProv != IntPtr.Zero)
-						WinApi.CryptReleaseContext(hCryptProv, 0);
-				}
-
-				return guid;
-			}
-		}
-#endif
-		#endregion Compact Framework Helper Classes
 	}
 }

Modified: logging/log4net/trunk/src/Util/SystemStringFormat.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Util/SystemStringFormat.cs?rev=1538212&r1=1538211&r2=1538212&view=diff
==============================================================================
--- logging/log4net/trunk/src/Util/SystemStringFormat.cs (original)
+++ logging/log4net/trunk/src/Util/SystemStringFormat.cs Sat Nov  2 16:22:29 2013
@@ -109,7 +109,7 @@ namespace log4net.Util
 				log4net.Util.LogLog.Warn(declaringType, "Exception while rendering format ["+format+"]", ex);
 				return StringFormatError(ex, format, args);
 			}
-#if !NET_2_0 && !MONO_2_0
+#if NETCF
 			catch
 			{
 				log4net.Util.LogLog.Warn(declaringType, "Exception while rendering format ["+format+"]");
@@ -148,7 +148,7 @@ namespace log4net.Util
 				log4net.Util.LogLog.Error(declaringType, "INTERNAL ERROR during StringFormat error handling", ex);
 				return "<log4net.Error>Exception during StringFormat. See Internal Log.</log4net.Error>";
 			}
-#if !NET_2_0 && !MONO_2_0
+#if NETCF
 			catch
 			{
 				log4net.Util.LogLog.Error(declaringType, "INTERNAL ERROR during StringFormat error handling");
@@ -210,7 +210,7 @@ namespace log4net.Util
 				{
 					buffer.Append("<Exception: ").Append(ex.Message).Append(">");
 				}
-#if !NET_2_0 && !MONO_2_0
+#if NETCF
 				catch
 				{
 					buffer.Append("<Exception>");

Modified: logging/log4net/trunk/src/Util/ThreadContextStack.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Util/ThreadContextStack.cs?rev=1538212&r1=1538211&r2=1538212&view=diff
==============================================================================
--- logging/log4net/trunk/src/Util/ThreadContextStack.cs (original)
+++ logging/log4net/trunk/src/Util/ThreadContextStack.cs Sat Nov  2 16:22:29 2013
@@ -18,10 +18,7 @@
 #endregion
 
 using System;
-
-#if !NETCF_1_0
 using System.Collections;
-#endif
 
 using log4net.Core;
 
@@ -380,56 +377,5 @@ namespace log4net.Util
 			#endregion Implementation of IDisposable
 		}
 
-#if NETCF_1_0
-		/// <summary>
-		/// Subclass of <see cref="System.Collections.Stack"/> to
-		/// provide missing methods.
-		/// </summary>
-		/// <remarks>
-		/// <para>
-		/// The Compact Framework version of the <see cref="System.Collections.Stack"/>
-		/// class is missing the <c>Clear</c> and <c>Clone</c> methods.
-		/// This subclass adds implementations of those missing methods.
-		/// </para>
-		/// </remarks>
-		public class Stack : System.Collections.Stack
-		{
-			/// <summary>
-			/// Clears the stack of all elements.
-			/// </summary>
-			/// <remarks>
-			/// <para>
-			/// Clears the stack of all elements.
-			/// </para>
-			/// </remarks>
-			public void Clear()
-			{
-				while(Count > 0)
-				{
-					Pop();
-				}
-			}
-
-			/// <summary>
-			/// Makes a shallow copy of the stack's elements.
-			/// </summary>
-			/// <returns>A new stack that has a shallow copy of the stack's elements.</returns>
-			/// <remarks>
-			/// <para>
-			/// Makes a shallow copy of the stack's elements.
-			/// </para>
-			/// </remarks>
-			public Stack Clone()
-			{
-				Stack res = new Stack();
-				object[] items = ToArray();
-				foreach(object item in items)
-				{
-					res.Push(item);
-				}
-				return res;
-			}
-		}
-#endif
 	}
 }

Modified: logging/log4net/trunk/src/Util/WindowsSecurityContext.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Util/WindowsSecurityContext.cs?rev=1538212&r1=1538211&r2=1538212&view=diff
==============================================================================
--- logging/log4net/trunk/src/Util/WindowsSecurityContext.cs (original)
+++ logging/log4net/trunk/src/Util/WindowsSecurityContext.cs Sat Nov  2 16:22:29 2013
@@ -17,14 +17,8 @@
 //
 #endregion
 
-// .NET Compact Framework 1.0 has no support for WindowsIdentity
+// .NET Compact Framework has no support for WindowsIdentity
 #if !NETCF 
-// MONO 1.0 has no support for Win32 Logon APIs
-#if !MONO
-// SSCLI 1.0 has no support for Win32 Logon APIs
-#if !SSCLI
-// We don't want framework or platform specific code in the CLI version of log4net
-#if !CLI_1_0
 
 using System;
 using System.Runtime.InteropServices;
@@ -380,8 +374,5 @@ namespace log4net.Util
 	}
 }
 
-#endif // !CLI_1_0
-#endif // !SSCLI
-#endif // !MONO
 #endif // !NETCF
 

Modified: logging/log4net/trunk/src/log4net.vs2008.csproj
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/log4net.vs2008.csproj?rev=1538212&r1=1538211&r2=1538212&view=diff
==============================================================================
--- logging/log4net/trunk/src/log4net.vs2008.csproj (original)
+++ logging/log4net/trunk/src/log4net.vs2008.csproj Sat Nov  2 16:22:29 2013
@@ -69,13 +69,13 @@
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>..\build\bin\net\1.0\release\</OutputPath>
+    <OutputPath>..\build\bin\net\2.0\release\</OutputPath>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
     <BaseAddress>285212672</BaseAddress>
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;STRONG;NET;NET_1_0;</DefineConstants>
+    <DefineConstants>TRACE;STRONG;NET;NET_2_0;</DefineConstants>
     <DocumentationFile>log4net.xml</DocumentationFile>
     <DebugSymbols>false</DebugSymbols>
     <FileAlignment>4096</FileAlignment>

Modified: logging/log4net/trunk/tests/src/Appender/RemotingAppenderTest.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/tests/src/Appender/RemotingAppenderTest.cs?rev=1538212&r1=1538211&r2=1538212&view=diff
==============================================================================
--- logging/log4net/trunk/tests/src/Appender/RemotingAppenderTest.cs (original)
+++ logging/log4net/trunk/tests/src/Appender/RemotingAppenderTest.cs Sat Nov  2 16:22:29 2013
@@ -207,7 +207,7 @@ namespace log4net.Tests.Appender
 				// Setup remoting server
 				try
 				{
-#if NET_2_0 || MONO_2_0
+#if !NETCF
 					ChannelServices.RegisterChannel(m_remotingChannel, false);
 #else
 					ChannelServices.RegisterChannel(m_remotingChannel);

Modified: logging/log4net/trunk/tests/src/Layout/XmlLayoutTest.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/tests/src/Layout/XmlLayoutTest.cs?rev=1538212&r1=1538211&r2=1538212&view=diff
==============================================================================
--- logging/log4net/trunk/tests/src/Layout/XmlLayoutTest.cs (original)
+++ logging/log4net/trunk/tests/src/Layout/XmlLayoutTest.cs Sat Nov  2 16:22:29 2013
@@ -81,7 +81,7 @@ namespace log4net.Tests.Layout
 		private static string CreateEventNode(string message)
 		{
 			return String.Format("<event logger=\"TestLogger\" timestamp=\"{0}\" level=\"INFO\" thread=\"TestThread\" domain=\"Tests\" identity=\"TestRunner\" username=\"TestRunner\"><message>{1}</message></event>" + Environment.NewLine,
-#if NET_2_0 || MONO_2_0
+#if !NETCF
 			                     XmlConvert.ToString(DateTime.Today, XmlDateTimeSerializationMode.Local),
 #else
 			                     XmlConvert.ToString(DateTime.Today),
@@ -92,7 +92,7 @@ namespace log4net.Tests.Layout
 		private static string CreateEventNode(string key, string value)
 		{
 			return String.Format("<event logger=\"TestLogger\" timestamp=\"{0}\" level=\"INFO\" thread=\"TestThread\" domain=\"Tests\" identity=\"TestRunner\" username=\"TestRunner\"><message>Test message</message><properties><data name=\"{1}\" value=\"{2}\" /></properties></event>" + Environment.NewLine,
-#if NET_2_0 || MONO_2_0
+#if !NETCF
 			                     XmlConvert.ToString(DateTime.Today, XmlDateTimeSerializationMode.Local),
 #else
 			                     XmlConvert.ToString(DateTime.Today),



Mime
View raw message