logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r1538419 - in /logging/log4net/trunk: log4net.build log4net.include src/AssemblyInfo.cs src/Log4netAssemblyInfo.cs src/Util/ILogExtensions.cs
Date Sun, 03 Nov 2013 19:05:32 GMT
Author: bodewig
Date: Sun Nov  3 19:05:32 2013
New Revision: 1538419

URL: http://svn.apache.org/r1538419
Log:
introduce a FRAMEWORK_3_5 symbol and use it for the 3.5 and 3.5 client profile builds

Modified:
    logging/log4net/trunk/log4net.build
    logging/log4net/trunk/log4net.include
    logging/log4net/trunk/src/AssemblyInfo.cs
    logging/log4net/trunk/src/Log4netAssemblyInfo.cs
    logging/log4net/trunk/src/Util/ILogExtensions.cs

Modified: logging/log4net/trunk/log4net.build
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/log4net.build?rev=1538419&r1=1538418&r2=1538419&view=diff
==============================================================================
--- logging/log4net/trunk/log4net.build (original)
+++ logging/log4net/trunk/log4net.build Sun Nov  3 19:05:32 2013
@@ -421,6 +421,7 @@ limitations under the License.
       <references>
         <include name="mscorlib.dll" />
         <include name="System.dll" />
+        <include name="System.Core.dll" />
         <include name="System.Data.dll" />
         <include name="System.Web.dll" />
         <include name="System.Xml.dll" />

Modified: logging/log4net/trunk/log4net.include
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/log4net.include?rev=1538419&r1=1538418&r2=1538419&view=diff
==============================================================================
--- logging/log4net/trunk/log4net.include (original)
+++ logging/log4net/trunk/log4net.include Sun Nov  3 19:05:32 2013
@@ -217,28 +217,28 @@ limitations under the License.
         <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 defines -->
+    <!-- uses NET_2_0 defines plus FRAMEWORK_3_5-->
     <target name="set-net-3.5-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-3.5" />
       <property name="current.build.debug" value="${build.debug}" dynamic="true" />
-      <property name="current.build.defines.csc" value="${build.defines.csc},NET" dynamic="true"
/>
-      <property name="current.build.defines.jsc" value="${build.defines.jsc},NET" dynamic="true"
/>
-      <property name="current.build.defines.vbc" value="${build.defines.vbc},NET=True"
dynamic="true" />
-      <property name="current.build.defines.vjc" value="${build.defines.vjc},NET" dynamic="true"
/>
-      <property name="current.build.defines.cl" value="${build.defines.cl} /D NET" dynamic="true"
/>
+      <property name="current.build.defines.csc" value="${build.defines.csc},NET,FRAMEWORK_3_5"
dynamic="true" />
+      <property name="current.build.defines.jsc" value="${build.defines.jsc},NET,FRAMEWORK_3_5"
dynamic="true" />
+      <property name="current.build.defines.vbc" value="${build.defines.vbc},NET=True,FRAMEWORK_3_5=True"
dynamic="true" />
+      <property name="current.build.defines.vjc" value="${build.defines.vjc},NET,FRAMEWORK_3_5"
dynamic="true" />
+      <property name="current.build.defines.cl" value="${build.defines.cl} /D NET /D FRAMEWORK_3_5"
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 defines plus CLIENT_PROFILE-->
+    <!-- uses NET_2_0 defines plus FRAMEWORK_3_5 and CLIENT_PROFILE-->
     <target name="set-net-3.5-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-3.5" />
       <property name="current.build.debug" value="${build.debug}" dynamic="true" />
-      <property name="current.build.defines.csc" value="${build.defines.csc},NET,CLIENT_PROFILE"
dynamic="true" />
-      <property name="current.build.defines.jsc" value="${build.defines.jsc},NET,CLIENT_PROFILE"
dynamic="true" />
-      <property name="current.build.defines.vbc" value="${build.defines.vbc},NET=True,CLIENT_PROFILE=True"
dynamic="true" />
-      <property name="current.build.defines.vjc" value="${build.defines.vjc},NET,CLIENT_PROFILE"
dynamic="true" />
-      <property name="current.build.defines.cl" value="${build.defines.cl} /D NET /D CLIENT_PROFILE"
dynamic="true" />
+      <property name="current.build.defines.csc" value="${build.defines.csc},NET,FRAMEWORK_3_5,CLIENT_PROFILE"
dynamic="true" />
+      <property name="current.build.defines.jsc" value="${build.defines.jsc},NET,FRAMEWORK_3_5,CLIENT_PROFILE"
dynamic="true" />
+      <property name="current.build.defines.vbc" value="${build.defines.vbc},NET=True,FRAMEWORK_3_5=True,CLIENT_PROFILE=True"
dynamic="true" />
+      <property name="current.build.defines.vjc" value="${build.defines.vjc},NET,FRAMEWORK_3_5,CLIENT_PROFILE"
dynamic="true" />
+      <property name="current.build.defines.cl" value="${build.defines.cl} /D NET /D FRAMEWORK_3_5
/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/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/AssemblyInfo.cs?rev=1538419&r1=1538418&r2=1538419&view=diff
==============================================================================
--- logging/log4net/trunk/src/AssemblyInfo.cs (original)
+++ logging/log4net/trunk/src/AssemblyInfo.cs Sun Nov  3 19:05:32 2013
@@ -55,9 +55,13 @@ using System.Runtime.CompilerServices;
 #else
 [assembly: AssemblyTitle("Apache log4net for .NET Framework 4.0")]
 #endif // Client Profile
-#elif CLIENT_PROFILE
+#elif FRAMEWORK_3_5
+#if CLIENT_PROFILE
 [assembly: AssemblyTitle("Apache log4net for .NET Framework 3.5 Client Profile")]
 #else
+[assembly: AssemblyTitle("Apache log4net for .NET Framework 3.5")]
+#endif // Client Profile
+#else
 [assembly: AssemblyTitle("Apache log4net for .NET Framework 2.0")]
 #endif // FW 4.0 
 #elif NETCF

Modified: logging/log4net/trunk/src/Log4netAssemblyInfo.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Log4netAssemblyInfo.cs?rev=1538419&r1=1538418&r2=1538419&view=diff
==============================================================================
--- logging/log4net/trunk/src/Log4netAssemblyInfo.cs (original)
+++ logging/log4net/trunk/src/Log4netAssemblyInfo.cs Sun Nov  3 19:05:32 2013
@@ -30,10 +30,10 @@ namespace log4net {
         /// <summary>Version of the framework targeted</summary>
 #if FRAMEWORK_4_0
         public const decimal TargetFrameworkVersion = 4.0M;
-#elif !CLIENT_PROFILE
-        public const decimal TargetFrameworkVersion = 2.0M;
-#else
+#elif FRAMEWORK_3_5
         public const decimal TargetFrameworkVersion = 3.5M;
+#else
+        public const decimal TargetFrameworkVersion = 2.0M;
 #endif
 
         /// <summary>Type of framework targeted</summary>

Modified: logging/log4net/trunk/src/Util/ILogExtensions.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Util/ILogExtensions.cs?rev=1538419&r1=1538418&r2=1538419&view=diff
==============================================================================
--- logging/log4net/trunk/src/Util/ILogExtensions.cs (original)
+++ logging/log4net/trunk/src/Util/ILogExtensions.cs Sun Nov  3 19:05:32 2013
@@ -17,7 +17,7 @@
 //
 #endregion
 
-#if NET_3_5 || FRAMEWORK_4_0
+#if FRAMEWORK_3_5 || FRAMEWORK_4_0
 
 using System;
 



Mime
View raw message