logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r1538416 - in /logging/log4net/trunk: ./ src/ src/Appender/ src/Config/ src/Core/ src/Plugin/ src/Util/ src/Util/PatternStringConverters/ tests/src/ tests/src/Layout/ tests/src/Util/
Date Sun, 03 Nov 2013 18:53:30 GMT
Author: bodewig
Date: Sun Nov  3 18:53:30 2013
New Revision: 1538416

URL: http://svn.apache.org/r1538416
Log:
NET_4_0 => FRAMEWORK_4_0 if we wanted to support mono-4.0 someday

Modified:
    logging/log4net/trunk/log4net.include
    logging/log4net/trunk/src/Appender/ColoredConsoleAppender.cs
    logging/log4net/trunk/src/Appender/FileAppender.cs
    logging/log4net/trunk/src/Appender/LocalSyslogAppender.cs
    logging/log4net/trunk/src/Appender/NetSendAppender.cs
    logging/log4net/trunk/src/Appender/OutputDebugStringAppender.cs
    logging/log4net/trunk/src/Appender/RemotingAppender.cs
    logging/log4net/trunk/src/Appender/SmtpAppender.cs
    logging/log4net/trunk/src/AssemblyInfo.cs
    logging/log4net/trunk/src/Config/XmlConfigurator.cs
    logging/log4net/trunk/src/Core/LoggingEvent.cs
    logging/log4net/trunk/src/Log4netAssemblyInfo.cs
    logging/log4net/trunk/src/Plugin/RemoteLoggingServerPlugin.cs
    logging/log4net/trunk/src/Util/ILogExtensions.cs
    logging/log4net/trunk/src/Util/LogicalThreadContextProperties.cs
    logging/log4net/trunk/src/Util/NativeError.cs
    logging/log4net/trunk/src/Util/PatternStringConverters/ProcessIdPatternConverter.cs
    logging/log4net/trunk/src/Util/ReadOnlyPropertiesDictionary.cs
    logging/log4net/trunk/src/Util/ReaderWriterLock.cs
    logging/log4net/trunk/src/Util/SystemInfo.cs
    logging/log4net/trunk/src/Util/WindowsSecurityContext.cs
    logging/log4net/trunk/src/log4net.vs2010.csproj
    logging/log4net/trunk/tests/src/Layout/XmlLayoutTest.cs
    logging/log4net/trunk/tests/src/Util/SystemInfoTest.cs
    logging/log4net/trunk/tests/src/log4net.Tests.vs2010.csproj

Modified: logging/log4net/trunk/log4net.include
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/log4net.include?rev=1538416&r1=1538415&r2=1538416&view=diff
==============================================================================
--- logging/log4net/trunk/log4net.include (original)
+++ logging/log4net/trunk/log4net.include Sun Nov  3 18:53:30 2013
@@ -243,28 +243,28 @@ limitations under the License.
       <property name="current.sdkdoc.dir" value="${sdkdoc.dir}/${framework::get-family(framework::get-target-framework())}-cp/${framework::get-version(framework::get-target-framework())}"
/>      
       <property name="current.sdkdoc.debug" value="${sdkdoc.debug}" dynamic="true" />
     </target>
-    <!-- uses NET_2_0 plus NET_4_0 defines -->
+    <!-- uses NET_2_0 plus FRAMEWORK_4_0 defines -->
     <target name="set-net-4.0-runtime-configuration" depends="check-bin-dir, check-sdkdoc-dir,
check-sdkdoc-debug, check-current-build-config, check-build-debug, check-build-defines">
       <property name="nant.settings.currentframework" value="net-4.0" />
       <property name="current.build.debug" value="${build.debug}" dynamic="true" />
-      <property name="current.build.defines.csc" value="${build.defines.csc},NET,NET_4_0"
dynamic="true" />
-      <property name="current.build.defines.jsc" value="${build.defines.jsc},NET,NET_4_0"
dynamic="true" />
-      <property name="current.build.defines.vbc" value="${build.defines.vbc},NET=True,NET_4_0=True"
dynamic="true" />
-      <property name="current.build.defines.vjc" value="${build.defines.vjc},NET,NET_4_0"
dynamic="true" />
-      <property name="current.build.defines.cl" value="${build.defines.cl} /D NET /D NET_4_0"
dynamic="true" />
+      <property name="current.build.defines.csc" value="${build.defines.csc},NET,FRAMEWORK_4_0"
dynamic="true" />
+      <property name="current.build.defines.jsc" value="${build.defines.jsc},NET,FRAMEWORK_4_0"
dynamic="true" />
+      <property name="current.build.defines.vbc" value="${build.defines.vbc},NET=True,FRAMEWORK_4_0=True"
dynamic="true" />
+      <property name="current.build.defines.vjc" value="${build.defines.vjc},NET,FRAMEWORK_4_0"
dynamic="true" />
+      <property name="current.build.defines.cl" value="${build.defines.cl} /D NET /D FRAMEWORK_4_0"
dynamic="true" />
       <property name="current.bin.dir" value="${bin.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}"
/>
       <property name="current.sdkdoc.dir" value="${sdkdoc.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"
/>      
       <property name="current.sdkdoc.debug" value="${sdkdoc.debug}" dynamic="true" />
     </target>
-    <!-- uses NET_2_0 plus NET_4_0 and CLIENT_PROFILE defines -->
+    <!-- uses NET_2_0 plus FRAMEWORK_4_0 and CLIENT_PROFILE defines -->
     <target name="set-net-4.0-cp-runtime-configuration" depends="check-bin-dir, check-sdkdoc-dir,
check-sdkdoc-debug, check-current-build-config, check-build-debug, check-build-defines">
       <property name="nant.settings.currentframework" value="net-4.0" />
       <property name="current.build.debug" value="${build.debug}" dynamic="true" />
-      <property name="current.build.defines.csc" value="${build.defines.csc},NET,NET_4_0,CLIENT_PROFILE"
dynamic="true" />
-      <property name="current.build.defines.jsc" value="${build.defines.jsc},NET,NET_4_0,CLIENT_PROFILE"
dynamic="true" />
-      <property name="current.build.defines.vbc" value="${build.defines.vbc},NET=True,NET_4_0=True,CLIENT_PROFILE=True"
dynamic="true" />
-      <property name="current.build.defines.vjc" value="${build.defines.vjc},NET,NET_4_0,CLIENT_PROFILE"
dynamic="true" />
-      <property name="current.build.defines.cl" value="${build.defines.cl} /D NET /D NET_4_0
/D CLIENT_PROFILE" dynamic="true" />
+      <property name="current.build.defines.csc" value="${build.defines.csc},NET,FRAMEWORK_4_0,CLIENT_PROFILE"
dynamic="true" />
+      <property name="current.build.defines.jsc" value="${build.defines.jsc},NET,FRAMEWORK_4_0,CLIENT_PROFILE"
dynamic="true" />
+      <property name="current.build.defines.vbc" value="${build.defines.vbc},NET=True,FRAMEWORK_4_0=True,CLIENT_PROFILE=True"
dynamic="true" />
+      <property name="current.build.defines.vjc" value="${build.defines.vjc},NET,FRAMEWORK_4_0,CLIENT_PROFILE"
dynamic="true" />
+      <property name="current.build.defines.cl" value="${build.defines.cl} /D NET /D FRAMEWORK_4_0
/D CLIENT_PROFILE" dynamic="true" />
       <property name="current.bin.dir" value="${bin.dir}/${framework::get-family(framework::get-target-framework())}-cp/${framework::get-version(framework::get-target-framework())}/${current.build.config}"
/>
       <property name="current.sdkdoc.dir" value="${sdkdoc.dir}/${framework::get-family(framework::get-target-framework())}-cp/${framework::get-version(framework::get-target-framework())}"
/>      
       <property name="current.sdkdoc.debug" value="${sdkdoc.debug}" dynamic="true" />

Modified: logging/log4net/trunk/src/Appender/ColoredConsoleAppender.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Appender/ColoredConsoleAppender.cs?rev=1538416&r1=1538415&r2=1538416&view=diff
==============================================================================
--- logging/log4net/trunk/src/Appender/ColoredConsoleAppender.cs (original)
+++ logging/log4net/trunk/src/Appender/ColoredConsoleAppender.cs Sun Nov  3 18:53:30 2013
@@ -257,7 +257,7 @@ namespace log4net.Appender
 		/// The format of the output will depend on the appender's layout.
 		/// </para>
 		/// </remarks>
-#if NET_4_0
+#if FRAMEWORK_4_0
         [System.Security.SecuritySafeCritical]
 #endif
         [System.Security.Permissions.SecurityPermission(System.Security.Permissions.SecurityAction.Demand,
UnmanagedCode = true)]
@@ -426,7 +426,7 @@ namespace log4net.Appender
 		/// Initialize the level to color mappings set on this appender.
 		/// </para>
 		/// </remarks>
-#if NET_4_0
+#if FRAMEWORK_4_0
         [System.Security.SecuritySafeCritical]
 #endif
         [System.Security.Permissions.SecurityPermission(System.Security.Permissions.SecurityAction.Demand,
UnmanagedCode=true)]

Modified: logging/log4net/trunk/src/Appender/FileAppender.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Appender/FileAppender.cs?rev=1538416&r1=1538415&r2=1538416&view=diff
==============================================================================
--- logging/log4net/trunk/src/Appender/FileAppender.cs (original)
+++ logging/log4net/trunk/src/Appender/FileAppender.cs Sun Nov  3 18:53:30 2013
@@ -664,7 +664,7 @@ namespace log4net.Appender
             /// -<see cref="ReleaseLock"/> and <see cref="CloseFile"/>.
             /// </para>
             /// </remarks>
-#if NET_4_0
+#if FRAMEWORK_4_0
             [System.Security.SecuritySafeCritical]
 #endif
             public override void OpenFile(string filename, bool append, Encoding encoding)

Modified: logging/log4net/trunk/src/Appender/LocalSyslogAppender.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Appender/LocalSyslogAppender.cs?rev=1538416&r1=1538415&r2=1538416&view=diff
==============================================================================
--- logging/log4net/trunk/src/Appender/LocalSyslogAppender.cs (original)
+++ logging/log4net/trunk/src/Appender/LocalSyslogAppender.cs Sun Nov  3 18:53:30 2013
@@ -336,7 +336,7 @@ namespace log4net.Appender 
 		/// <see cref="ActivateOptions"/> must be called again.
 		/// </para>
 		/// </remarks>
-#if NET_4_0
+#if FRAMEWORK_4_0
         [System.Security.SecuritySafeCritical]
 #endif
         public override void ActivateOptions()
@@ -377,7 +377,7 @@ namespace log4net.Appender 
 		/// The format of the output will depend on the appender's layout.
 		/// </para>
 		/// </remarks>
-#if NET_4_0
+#if FRAMEWORK_4_0
         [System.Security.SecuritySafeCritical]
 #endif
         [System.Security.Permissions.SecurityPermission(System.Security.Permissions.SecurityAction.Demand,
UnmanagedCode = true)]
@@ -399,7 +399,7 @@ namespace log4net.Appender 
 		/// Close the syslog when the appender is closed
 		/// </para>
 		/// </remarks>
-#if NET_4_0
+#if FRAMEWORK_4_0
         [System.Security.SecuritySafeCritical]
 #endif
         protected override void OnClose()

Modified: logging/log4net/trunk/src/Appender/NetSendAppender.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Appender/NetSendAppender.cs?rev=1538416&r1=1538415&r2=1538416&view=diff
==============================================================================
--- logging/log4net/trunk/src/Appender/NetSendAppender.cs (original)
+++ logging/log4net/trunk/src/Appender/NetSendAppender.cs Sun Nov  3 18:53:30 2013
@@ -296,7 +296,7 @@ namespace log4net.Appender 
 		/// Sends the event using a network message.
 		/// </para>
 		/// </remarks>
-#if NET_4_0
+#if FRAMEWORK_4_0
         [System.Security.SecuritySafeCritical]
 #endif
         [System.Security.Permissions.SecurityPermission(System.Security.Permissions.SecurityAction.Demand,
UnmanagedCode = true)]

Modified: logging/log4net/trunk/src/Appender/OutputDebugStringAppender.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Appender/OutputDebugStringAppender.cs?rev=1538416&r1=1538415&r2=1538416&view=diff
==============================================================================
--- logging/log4net/trunk/src/Appender/OutputDebugStringAppender.cs (original)
+++ logging/log4net/trunk/src/Appender/OutputDebugStringAppender.cs Sun Nov  3 18:53:30 2013
@@ -68,7 +68,7 @@ namespace log4net.Appender
 		/// Write the logging event to the output debug string API
 		/// </para>
 		/// </remarks>
-#if NET_4_0
+#if FRAMEWORK_4_0
         [System.Security.SecuritySafeCritical]
 #elif !NETCF
         [System.Security.Permissions.SecurityPermission(System.Security.Permissions.SecurityAction.Demand,
UnmanagedCode = true)]

Modified: logging/log4net/trunk/src/Appender/RemotingAppender.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Appender/RemotingAppender.cs?rev=1538416&r1=1538415&r2=1538416&view=diff
==============================================================================
--- logging/log4net/trunk/src/Appender/RemotingAppender.cs (original)
+++ logging/log4net/trunk/src/Appender/RemotingAppender.cs Sun Nov  3 18:53:30 2013
@@ -138,7 +138,7 @@ namespace log4net.Appender
 		/// <see cref="ActivateOptions"/> must be called again.
 		/// </para>
 		/// </remarks>
-#if NET_4_0
+#if FRAMEWORK_4_0
         [System.Security.SecuritySafeCritical]
 #endif
         override public void ActivateOptions() 

Modified: logging/log4net/trunk/src/Appender/SmtpAppender.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Appender/SmtpAppender.cs?rev=1538416&r1=1538415&r2=1538416&view=diff
==============================================================================
--- logging/log4net/trunk/src/Appender/SmtpAppender.cs (original)
+++ logging/log4net/trunk/src/Appender/SmtpAppender.cs Sun Nov  3 18:53:30 2013
@@ -480,7 +480,7 @@ namespace log4net.Appender
                 {
                     // .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
+#if !FRAMEWORK_4_0
                     mailMessage.ReplyTo = new MailAddress(m_replyTo);
 #else
                     mailMessage.ReplyToList.Add(new MailAddress(m_replyTo));

Modified: logging/log4net/trunk/src/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/AssemblyInfo.cs?rev=1538416&r1=1538415&r2=1538416&view=diff
==============================================================================
--- logging/log4net/trunk/src/AssemblyInfo.cs (original)
+++ logging/log4net/trunk/src/AssemblyInfo.cs Sun Nov  3 18:53:30 2013
@@ -34,7 +34,7 @@ using System.Runtime.CompilerServices;
 [assembly: System.Security.AllowPartiallyTrustedCallers]
 #endif
 
-#if (NET_4_0)
+#if FRAMEWORK_4_0
 //
 // Allows partial trust applications (e.g. ASP.NET shared hosting) on .NET 4.0 to work
 // given our implementation of ISerializable.
@@ -48,7 +48,8 @@ using System.Runtime.CompilerServices;
 // associated with an assembly.
 //
 
-#if (NET_4_0)
+#if NET
+#if FRAMEWORK_4_0
 #if CLIENT_PROFILE
 [assembly: AssemblyTitle("Apache log4net for .NET Framework 4.0 Client Profile")]
 #else
@@ -56,12 +57,13 @@ using System.Runtime.CompilerServices;
 #endif // Client Profile
 #elif CLIENT_PROFILE
 [assembly: AssemblyTitle("Apache log4net for .NET Framework 3.5 Client Profile")]
+#else
+[assembly: AssemblyTitle("Apache log4net for .NET Framework 2.0")]
+#endif // FW 4.0 
 #elif NETCF
 [assembly: AssemblyTitle("Apache log4net for .NET Compact Framework 2.0")]
 #elif MONO
 [assembly: AssemblyTitle("Apache log4net for Mono 2.0")]
-#else
-[assembly: AssemblyTitle("Apache log4net for .NET Framework 2.0")]
 #endif
 
 #if DEBUG

Modified: logging/log4net/trunk/src/Config/XmlConfigurator.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Config/XmlConfigurator.cs?rev=1538416&r1=1538415&r2=1538416&view=diff
==============================================================================
--- logging/log4net/trunk/src/Config/XmlConfigurator.cs (original)
+++ logging/log4net/trunk/src/Config/XmlConfigurator.cs Sun Nov  3 18:53:30 2013
@@ -725,7 +725,7 @@ namespace log4net.Config
 					XmlReaderSettings settings = new XmlReaderSettings();
                                         // .NET 4.0 warning CS0618: 'System.Xml.XmlReaderSettings.ProhibitDtd'
                                         // is obsolete: 'Use XmlReaderSettings.DtdProcessing
property instead.'
-#if !NET_4_0
+#if !FRAMEWORK_4_0
 					settings.ProhibitDtd = false;
 #else
 					settings.DtdProcessing = DtdProcessing.Parse;
@@ -950,7 +950,7 @@ namespace log4net.Config
 			/// Initializes a new instance of the <see cref="ConfigureAndWatchHandler" /> class.
 			/// </para>
 			/// </remarks>
-#if NET_4_0
+#if FRAMEWORK_4_0
             [System.Security.SecuritySafeCritical]
 #endif
             public ConfigureAndWatchHandler(ILoggerRepository repository, FileInfo configFile)
@@ -1030,7 +1030,7 @@ namespace log4net.Config
             /// <summary>
             /// Release the handles held by the watcher and timer.
             /// </summary>
-#if NET_4_0
+#if FRAMEWORK_4_0
             [System.Security.SecuritySafeCritical]
 #endif
             public void Dispose()

Modified: logging/log4net/trunk/src/Core/LoggingEvent.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Core/LoggingEvent.cs?rev=1538416&r1=1538415&r2=1538416&view=diff
==============================================================================
--- logging/log4net/trunk/src/Core/LoggingEvent.cs (original)
+++ logging/log4net/trunk/src/Core/LoggingEvent.cs Sun Nov  3 18:53:30 2013
@@ -1022,7 +1022,7 @@ namespace log4net.Core
 		/// is to be used outside that method.
 		/// </para>
 		/// </remarks>
-#if NET_4_0
+#if FRAMEWORK_4_0
         [System.Security.SecurityCritical]
 #else
 		[System.Security.Permissions.SecurityPermissionAttribute(System.Security.Permissions.SecurityAction.Demand,
SerializationFormatter=true)]

Modified: logging/log4net/trunk/src/Log4netAssemblyInfo.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Log4netAssemblyInfo.cs?rev=1538416&r1=1538415&r2=1538416&view=diff
==============================================================================
--- logging/log4net/trunk/src/Log4netAssemblyInfo.cs (original)
+++ logging/log4net/trunk/src/Log4netAssemblyInfo.cs Sun Nov  3 18:53:30 2013
@@ -28,7 +28,7 @@ namespace log4net {
         public const string Version = "1.3.0";
 
         /// <summary>Version of the framework targeted</summary>
-#if NET_4_0
+#if FRAMEWORK_4_0
         public const decimal TargetFrameworkVersion = 4.0M;
 #elif !CLIENT_PROFILE
         public const decimal TargetFrameworkVersion = 2.0M;

Modified: logging/log4net/trunk/src/Plugin/RemoteLoggingServerPlugin.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Plugin/RemoteLoggingServerPlugin.cs?rev=1538416&r1=1538415&r2=1538416&view=diff
==============================================================================
--- logging/log4net/trunk/src/Plugin/RemoteLoggingServerPlugin.cs (original)
+++ logging/log4net/trunk/src/Plugin/RemoteLoggingServerPlugin.cs Sun Nov  3 18:53:30 2013
@@ -119,7 +119,7 @@ namespace log4net.Plugin
 		/// This method is called when the plugin is attached to the repository.
 		/// </para>
 		/// </remarks>
-#if NET_4_0
+#if FRAMEWORK_4_0
 		[System.Security.SecuritySafeCritical]
 #endif
 		override public void Attach(ILoggerRepository repository)
@@ -148,7 +148,7 @@ namespace log4net.Plugin
 		/// sink is disconnected.
 		/// </para>
 		/// </remarks>
-#if NET_4_0
+#if FRAMEWORK_4_0
         [System.Security.SecuritySafeCritical]
 #endif
         override public void Shutdown()
@@ -253,7 +253,7 @@ namespace log4net.Plugin
 			/// therefore this implementation returns <c>null</c>.
 			/// </para>
 			/// </remarks>
-#if NET_4_0
+#if FRAMEWORK_4_0
             [System.Security.SecurityCritical]
 #endif
             public override object InitializeLifetimeService()

Modified: logging/log4net/trunk/src/Util/ILogExtensions.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Util/ILogExtensions.cs?rev=1538416&r1=1538415&r2=1538416&view=diff
==============================================================================
--- logging/log4net/trunk/src/Util/ILogExtensions.cs (original)
+++ logging/log4net/trunk/src/Util/ILogExtensions.cs Sun Nov  3 18:53:30 2013
@@ -17,7 +17,7 @@
 //
 #endregion
 
-#if NET_3_5 || NET_4_0
+#if NET_3_5 || FRAMEWORK_4_0
 
 using System;
 

Modified: logging/log4net/trunk/src/Util/LogicalThreadContextProperties.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Util/LogicalThreadContextProperties.cs?rev=1538416&r1=1538415&r2=1538416&view=diff
==============================================================================
--- logging/log4net/trunk/src/Util/LogicalThreadContextProperties.cs (original)
+++ logging/log4net/trunk/src/Util/LogicalThreadContextProperties.cs Sun Nov  3 18:53:30 2013
@@ -203,7 +203,7 @@ namespace log4net.Util
 		/// security link demand, therfore we must put the method call in a seperate method
 		/// that we can wrap in an exception handler.
 		/// </remarks>
-#if NET_4_0
+#if FRAMEWORK_4_0
         [System.Security.SecuritySafeCritical]
 #endif
         private static PropertiesDictionary GetCallContextData()
@@ -224,7 +224,7 @@ namespace log4net.Util
 		/// security link demand, therfore we must put the method call in a seperate method
 		/// that we can wrap in an exception handler.
 		/// </remarks>
-#if NET_4_0
+#if FRAMEWORK_4_0
         [System.Security.SecuritySafeCritical]
 #endif
         private static void SetCallContextData(PropertiesDictionary properties)

Modified: logging/log4net/trunk/src/Util/NativeError.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Util/NativeError.cs?rev=1538416&r1=1538415&r2=1538416&view=diff
==============================================================================
--- logging/log4net/trunk/src/Util/NativeError.cs (original)
+++ logging/log4net/trunk/src/Util/NativeError.cs Sun Nov  3 18:53:30 2013
@@ -107,7 +107,7 @@ namespace log4net.Util 
 		/// native Win32 <c>FormatMessage</c> function.
 		/// </para>
 		/// </remarks>
-#if NET_4_0
+#if FRAMEWORK_4_0
         [System.Security.SecuritySafeCritical]
 #elif !NETCF
         [System.Security.Permissions.SecurityPermission(System.Security.Permissions.SecurityAction.Demand,
UnmanagedCode=true)]
@@ -150,7 +150,7 @@ namespace log4net.Util 
 		/// using the native <c>FormatMessage</c> function.
 		/// </para>
 		/// </remarks>
-#if NET_4_0
+#if FRAMEWORK_4_0
         [System.Security.SecuritySafeCritical]
 #elif !NETCF
         [System.Security.Permissions.SecurityPermission(System.Security.Permissions.SecurityAction.Demand,
UnmanagedCode = true)]

Modified: logging/log4net/trunk/src/Util/PatternStringConverters/ProcessIdPatternConverter.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Util/PatternStringConverters/ProcessIdPatternConverter.cs?rev=1538416&r1=1538415&r2=1538416&view=diff
==============================================================================
--- logging/log4net/trunk/src/Util/PatternStringConverters/ProcessIdPatternConverter.cs (original)
+++ logging/log4net/trunk/src/Util/PatternStringConverters/ProcessIdPatternConverter.cs Sun
Nov  3 18:53:30 2013
@@ -46,7 +46,7 @@ namespace log4net.Util.PatternStringConv
 		/// Write the current process ID to the output <paramref name="writer"/>.
 		/// </para>
 		/// </remarks>
-#if NET_4_0
+#if FRAMEWORK_4_0
         [System.Security.SecuritySafeCritical]
 #endif
         override protected void Convert(TextWriter writer, object state) 

Modified: logging/log4net/trunk/src/Util/ReadOnlyPropertiesDictionary.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Util/ReadOnlyPropertiesDictionary.cs?rev=1538416&r1=1538415&r2=1538416&view=diff
==============================================================================
--- logging/log4net/trunk/src/Util/ReadOnlyPropertiesDictionary.cs (original)
+++ logging/log4net/trunk/src/Util/ReadOnlyPropertiesDictionary.cs Sun Nov  3 18:53:30 2013
@@ -203,7 +203,7 @@ namespace log4net.Util
 		/// Serializes this object into the <see cref="SerializationInfo" /> provided.
 		/// </para>
 		/// </remarks>
-#if NET_4_0
+#if FRAMEWORK_4_0
         [System.Security.SecurityCritical]
 #else
 		[System.Security.Permissions.SecurityPermissionAttribute(System.Security.Permissions.SecurityAction.Demand,
SerializationFormatter=true)]

Modified: logging/log4net/trunk/src/Util/ReaderWriterLock.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Util/ReaderWriterLock.cs?rev=1538416&r1=1538415&r2=1538416&view=diff
==============================================================================
--- logging/log4net/trunk/src/Util/ReaderWriterLock.cs (original)
+++ logging/log4net/trunk/src/Util/ReaderWriterLock.cs Sun Nov  3 18:53:30 2013
@@ -17,12 +17,12 @@
 //
 #endregion
 
-#if (!NETCF)
+#if !NETCF
 #define HAS_READERWRITERLOCK
-#endif
-#if (NET_4_0)
+#if FRAMEWORK_4_0
 #define HAS_READERWRITERLOCKSLIM
 #endif
+#endif
 
 using System;
 

Modified: logging/log4net/trunk/src/Util/SystemInfo.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Util/SystemInfo.cs?rev=1538416&r1=1538415&r2=1538416&view=diff
==============================================================================
--- logging/log4net/trunk/src/Util/SystemInfo.cs (original)
+++ logging/log4net/trunk/src/Util/SystemInfo.cs Sun Nov  3 18:53:30 2013
@@ -451,7 +451,7 @@ namespace log4net.Util
 			{
 				try
 				{
-#if NET_4_0
+#if FRAMEWORK_4_0
 					if (myAssembly.IsDynamic)
 					{
 						return "Dynamic Assembly";

Modified: logging/log4net/trunk/src/Util/WindowsSecurityContext.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Util/WindowsSecurityContext.cs?rev=1538416&r1=1538415&r2=1538416&view=diff
==============================================================================
--- logging/log4net/trunk/src/Util/WindowsSecurityContext.cs (original)
+++ logging/log4net/trunk/src/Util/WindowsSecurityContext.cs Sun Nov  3 18:53:30 2013
@@ -269,7 +269,7 @@ namespace log4net.Util
 		/// token is used to initialize the WindowsIdentity.
 		/// </para>
 		/// </remarks>
-#if NET_4_0
+#if FRAMEWORK_4_0
         [System.Security.SecuritySafeCritical]
 #endif
         [System.Security.Permissions.SecurityPermission(System.Security.Permissions.SecurityAction.Demand,
UnmanagedCode = true)]

Modified: logging/log4net/trunk/src/log4net.vs2010.csproj
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/log4net.vs2010.csproj?rev=1538416&r1=1538415&r2=1538416&view=diff
==============================================================================
--- logging/log4net/trunk/src/log4net.vs2010.csproj (original)
+++ logging/log4net/trunk/src/log4net.vs2010.csproj Sun Nov  3 18:53:30 2013
@@ -72,7 +72,7 @@
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG;NET;NET_4_0</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;NET;FRAMEWORK_4_0</DefineConstants>
     <DocumentationFile>log4net.xml</DocumentationFile>
     <DebugSymbols>true</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
@@ -92,7 +92,7 @@
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;STRONG;NET;NET_4_0</DefineConstants>
+    <DefineConstants>TRACE;STRONG;NET;FRAMEWORK_4_0</DefineConstants>
     <DocumentationFile>log4net.xml</DocumentationFile>
     <DebugSymbols>false</DebugSymbols>
     <FileAlignment>4096</FileAlignment>

Modified: logging/log4net/trunk/tests/src/Layout/XmlLayoutTest.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/tests/src/Layout/XmlLayoutTest.cs?rev=1538416&r1=1538415&r2=1538416&view=diff
==============================================================================
--- logging/log4net/trunk/tests/src/Layout/XmlLayoutTest.cs (original)
+++ logging/log4net/trunk/tests/src/Layout/XmlLayoutTest.cs Sun Nov  3 18:53:30 2013
@@ -303,7 +303,7 @@ namespace log4net.Tests.Layout
 			Assert.AreEqual(expected, stringAppender.GetString());
 		}
 
-#if NET_4_0
+#if FRAMEWORK_4_0
         [Test]
         public void BracketsInStackTracesKeepLogWellFormed() {
             XmlLayout layout = new XmlLayout();

Modified: logging/log4net/trunk/tests/src/Util/SystemInfoTest.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/tests/src/Util/SystemInfoTest.cs?rev=1538416&r1=1538415&r2=1538416&view=diff
==============================================================================
--- logging/log4net/trunk/tests/src/Util/SystemInfoTest.cs (original)
+++ logging/log4net/trunk/tests/src/Util/SystemInfoTest.cs Sun Nov  3 18:53:30 2013
@@ -23,7 +23,7 @@ using log4net.Util;
 
 using NUnit.Framework;
 
-#if NET_4_0
+#if FRAMEWORK_4_0
 using System.Linq.Expressions;
 using System.Reflection;
 #endif
@@ -37,7 +37,7 @@ namespace log4net.Tests.Util
 	public class SystemInfoTest
 	{
 
-#if NET_4_0
+#if FRAMEWORK_4_0
 		/// <summary>
 		/// It's "does not throw not supported exception" NOT
 		/// "returns 'Dynamic Assembly' string for dynamic assemblies" by purpose.

Modified: logging/log4net/trunk/tests/src/log4net.Tests.vs2010.csproj
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/tests/src/log4net.Tests.vs2010.csproj?rev=1538416&r1=1538415&r2=1538416&view=diff
==============================================================================
--- logging/log4net/trunk/tests/src/log4net.Tests.vs2010.csproj (original)
+++ logging/log4net/trunk/tests/src/log4net.Tests.vs2010.csproj Sun Nov  3 18:53:30 2013
@@ -72,7 +72,7 @@
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG;NET;NET_4_0</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;NET;FRAMEWORK_4_0</DefineConstants>
     <DocumentationFile>
     </DocumentationFile>
     <DebugSymbols>true</DebugSymbols>
@@ -93,7 +93,7 @@
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;NET;NET_4_0</DefineConstants>
+    <DefineConstants>TRACE;NET;FRAMEWORK_4_0</DefineConstants>
     <DocumentationFile>
     </DocumentationFile>
     <DebugSymbols>false</DebugSymbols>



Mime
View raw message