You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by bo...@apache.org on 2013/11/05 09:33:52 UTC
svn commit: r1538905 - in /logging/log4net/trunk: log4net.include
src/AssemblyInfo.cs src/Log4netAssemblyInfo.cs src/log4net.vs2008.csproj
src/log4net.vs2010.csproj tests/src/log4net.Tests.vs2010.csproj
Author: bodewig
Date: Tue Nov 5 08:33:51 2013
New Revision: 1538905
URL: http://svn.apache.org/r1538905
Log:
NET => DOTNET
Modified:
logging/log4net/trunk/log4net.include
logging/log4net/trunk/src/AssemblyInfo.cs
logging/log4net/trunk/src/Log4netAssemblyInfo.cs
logging/log4net/trunk/src/log4net.vs2008.csproj
logging/log4net/trunk/src/log4net.vs2010.csproj
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=1538905&r1=1538904&r2=1538905&view=diff
==============================================================================
--- logging/log4net/trunk/log4net.include (original)
+++ logging/log4net/trunk/log4net.include Tue Nov 5 08:33:51 2013
@@ -208,11 +208,11 @@ limitations under the License.
<target name="set-net-2.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-2.0" />
<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},DOTNET" dynamic="true" />
+ <property name="current.build.defines.jsc" value="${build.defines.jsc},DOTNET" dynamic="true" />
+ <property name="current.build.defines.vbc" value="${build.defines.vbc},DOTNET=True" dynamic="true" />
+ <property name="current.build.defines.vjc" value="${build.defines.vjc},DOTNET" dynamic="true" />
+ <property name="current.build.defines.cl" value="${build.defines.cl} /D DOTNET" 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" />
@@ -221,11 +221,11 @@ limitations under the License.
<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,FRAMEWORK_3_5_OR_ABOVE" dynamic="true" />
- <property name="current.build.defines.jsc" value="${build.defines.jsc},NET,FRAMEWORK_3_5_OR_ABOVE" dynamic="true" />
- <property name="current.build.defines.vbc" value="${build.defines.vbc},NET=True,FRAMEWORK_3_5_OR_ABOVE=True" dynamic="true" />
- <property name="current.build.defines.vjc" value="${build.defines.vjc},NET,FRAMEWORK_3_5_OR_ABOVE" dynamic="true" />
- <property name="current.build.defines.cl" value="${build.defines.cl} /D NET /D FRAMEWORK_3_5_OR_ABOVE" dynamic="true" />
+ <property name="current.build.defines.csc" value="${build.defines.csc},DOTNET,FRAMEWORK_3_5_OR_ABOVE" dynamic="true" />
+ <property name="current.build.defines.jsc" value="${build.defines.jsc},DOTNET,FRAMEWORK_3_5_OR_ABOVE" dynamic="true" />
+ <property name="current.build.defines.vbc" value="${build.defines.vbc},DOTNET=True,FRAMEWORK_3_5_OR_ABOVE=True" dynamic="true" />
+ <property name="current.build.defines.vjc" value="${build.defines.vjc},DOTNET,FRAMEWORK_3_5_OR_ABOVE" dynamic="true" />
+ <property name="current.build.defines.cl" value="${build.defines.cl} /D DOTNET /D FRAMEWORK_3_5_OR_ABOVE" 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" />
@@ -234,11 +234,11 @@ limitations under the License.
<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,FRAMEWORK_3_5_OR_ABOVE,CLIENT_PROFILE" dynamic="true" />
- <property name="current.build.defines.jsc" value="${build.defines.jsc},NET,FRAMEWORK_3_5_OR_ABOVE,CLIENT_PROFILE" dynamic="true" />
- <property name="current.build.defines.vbc" value="${build.defines.vbc},NET=True,FRAMEWORK_3_5_OR_ABOVE=True,CLIENT_PROFILE=True" dynamic="true" />
- <property name="current.build.defines.vjc" value="${build.defines.vjc},NET,FRAMEWORK_3_5_OR_ABOVE,CLIENT_PROFILE" dynamic="true" />
- <property name="current.build.defines.cl" value="${build.defines.cl} /D NET /D FRAMEWORK_3_5_OR_ABOVE /D CLIENT_PROFILE" dynamic="true" />
+ <property name="current.build.defines.csc" value="${build.defines.csc},DOTNET,FRAMEWORK_3_5_OR_ABOVE,CLIENT_PROFILE" dynamic="true" />
+ <property name="current.build.defines.jsc" value="${build.defines.jsc},DOTNET,FRAMEWORK_3_5_OR_ABOVE,CLIENT_PROFILE" dynamic="true" />
+ <property name="current.build.defines.vbc" value="${build.defines.vbc},DOTNET=True,FRAMEWORK_3_5_OR_ABOVE=True,CLIENT_PROFILE=True" dynamic="true" />
+ <property name="current.build.defines.vjc" value="${build.defines.vjc},DOTNET,FRAMEWORK_3_5_OR_ABOVE,CLIENT_PROFILE" dynamic="true" />
+ <property name="current.build.defines.cl" value="${build.defines.cl} /D DOTNET /D FRAMEWORK_3_5_OR_ABOVE /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" />
@@ -247,11 +247,11 @@ limitations under the License.
<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,FRAMEWORK_3_5_OR_ABOVE,FRAMEWORK_4_0_OR_ABOVE" dynamic="true" />
- <property name="current.build.defines.jsc" value="${build.defines.jsc},NET,FRAMEWORK_3_5_OR_ABOVE,FRAMEWORK_4_0_OR_ABOVE" dynamic="true" />
- <property name="current.build.defines.vbc" value="${build.defines.vbc},NET=True,FRAMEWORK_3_5_OR_ABOVE=True,FRAMEWORK_4_0_OR_ABOVE=True" dynamic="true" />
- <property name="current.build.defines.vjc" value="${build.defines.vjc},NET,FRAMEWORK_3_5_OR_ABOVE,FRAMEWORK_4_0_OR_ABOVE" dynamic="true" />
- <property name="current.build.defines.cl" value="${build.defines.cl} /D NET /D FRAMEWORK_3_5_OR_ABOVE /D FRAMEWORK_4_0_OR_ABOVE" dynamic="true" />
+ <property name="current.build.defines.csc" value="${build.defines.csc},DOTNET,FRAMEWORK_3_5_OR_ABOVE,FRAMEWORK_4_0_OR_ABOVE" dynamic="true" />
+ <property name="current.build.defines.jsc" value="${build.defines.jsc},DOTNET,FRAMEWORK_3_5_OR_ABOVE,FRAMEWORK_4_0_OR_ABOVE" dynamic="true" />
+ <property name="current.build.defines.vbc" value="${build.defines.vbc},DOTNET=True,FRAMEWORK_3_5_OR_ABOVE=True,FRAMEWORK_4_0_OR_ABOVE=True" dynamic="true" />
+ <property name="current.build.defines.vjc" value="${build.defines.vjc},DOTNET,FRAMEWORK_3_5_OR_ABOVE,FRAMEWORK_4_0_OR_ABOVE" dynamic="true" />
+ <property name="current.build.defines.cl" value="${build.defines.cl} /D DOTNET /D FRAMEWORK_3_5_OR_ABOVE /D FRAMEWORK_4_0_OR_ABOVE" 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" />
@@ -260,11 +260,11 @@ limitations under the License.
<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,FRAMEWORK_3_5_OR_ABOVE,FRAMEWORK_4_0_OR_ABOVE,CLIENT_PROFILE" dynamic="true" />
- <property name="current.build.defines.jsc" value="${build.defines.jsc},NET,FRAMEWORK_3_5_OR_ABOVE,FRAMEWORK_4_0_OR_ABOVE,CLIENT_PROFILE" dynamic="true" />
- <property name="current.build.defines.vbc" value="${build.defines.vbc},NET=True,FRAMEWORK_3_5_OR_ABOVE=True,FRAMEWORK_4_0_OR_ABOVE=True,CLIENT_PROFILE=True" dynamic="true" />
- <property name="current.build.defines.vjc" value="${build.defines.vjc},NET,FRAMEWORK_3_5_OR_ABOVE,FRAMEWORK_4_0_OR_ABOVE,CLIENT_PROFILE" dynamic="true" />
- <property name="current.build.defines.cl" value="${build.defines.cl} /D NET /D FRAMEWORK_3_5_OR_ABOVE /D FRAMEWORK_4_0_OR_ABOVE /D CLIENT_PROFILE" dynamic="true" />
+ <property name="current.build.defines.csc" value="${build.defines.csc},DOTNET,FRAMEWORK_3_5_OR_ABOVE,FRAMEWORK_4_0_OR_ABOVE,CLIENT_PROFILE" dynamic="true" />
+ <property name="current.build.defines.jsc" value="${build.defines.jsc},DOTNET,FRAMEWORK_3_5_OR_ABOVE,FRAMEWORK_4_0_OR_ABOVE,CLIENT_PROFILE" dynamic="true" />
+ <property name="current.build.defines.vbc" value="${build.defines.vbc},DOTNET=True,FRAMEWORK_3_5_OR_ABOVE=True,FRAMEWORK_4_0_OR_ABOVE=True,CLIENT_PROFILE=True" dynamic="true" />
+ <property name="current.build.defines.vjc" value="${build.defines.vjc},DOTNET,FRAMEWORK_3_5_OR_ABOVE,FRAMEWORK_4_0_OR_ABOVE,CLIENT_PROFILE" dynamic="true" />
+ <property name="current.build.defines.cl" value="${build.defines.cl} /D DOTNET /D FRAMEWORK_3_5_OR_ABOVE /D FRAMEWORK_4_0_OR_ABOVE /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=1538905&r1=1538904&r2=1538905&view=diff
==============================================================================
--- logging/log4net/trunk/src/AssemblyInfo.cs (original)
+++ logging/log4net/trunk/src/AssemblyInfo.cs Tue Nov 5 08:33:51 2013
@@ -48,7 +48,7 @@ using System.Runtime.CompilerServices;
// associated with an assembly.
//
-#if NET
+#if DOTNET
#if FRAMEWORK_4_0_OR_ABOVE
#if CLIENT_PROFILE
[assembly: AssemblyTitle("Apache log4net for .NET Framework 4.0 Client Profile")]
Modified: logging/log4net/trunk/src/Log4netAssemblyInfo.cs
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/Log4netAssemblyInfo.cs?rev=1538905&r1=1538904&r2=1538905&view=diff
==============================================================================
--- logging/log4net/trunk/src/Log4netAssemblyInfo.cs (original)
+++ logging/log4net/trunk/src/Log4netAssemblyInfo.cs Tue Nov 5 08:33:51 2013
@@ -37,7 +37,7 @@ namespace log4net {
#endif
/// <summary>Type of framework targeted</summary>
-#if NET
+#if DOTNET
public const string TargetFramework = ".NET Framework";
#elif NETCF
public const string TargetFramework = ".NET Compact Framework";
Modified: logging/log4net/trunk/src/log4net.vs2008.csproj
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/log4net.vs2008.csproj?rev=1538905&r1=1538904&r2=1538905&view=diff
==============================================================================
--- logging/log4net/trunk/src/log4net.vs2008.csproj (original)
+++ logging/log4net/trunk/src/log4net.vs2008.csproj Tue Nov 5 08:33:51 2013
@@ -56,7 +56,7 @@
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
- <DefineConstants>TRACE;DEBUG;NET</DefineConstants>
+ <DefineConstants>TRACE;DEBUG;DOTNET</DefineConstants>
<DocumentationFile>log4net.xml</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
@@ -75,7 +75,7 @@
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
- <DefineConstants>TRACE;STRONG;NET;</DefineConstants>
+ <DefineConstants>TRACE;STRONG;DOTNET;</DefineConstants>
<DocumentationFile>log4net.xml</DocumentationFile>
<DebugSymbols>false</DebugSymbols>
<FileAlignment>4096</FileAlignment>
Modified: logging/log4net/trunk/src/log4net.vs2010.csproj
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/log4net.vs2010.csproj?rev=1538905&r1=1538904&r2=1538905&view=diff
==============================================================================
--- logging/log4net/trunk/src/log4net.vs2010.csproj (original)
+++ logging/log4net/trunk/src/log4net.vs2010.csproj Tue Nov 5 08:33:51 2013
@@ -72,7 +72,7 @@
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
- <DefineConstants>TRACE;DEBUG;NET;FRAMEWORK_3_5_OR_ABOVE;FRAMEWORK_4_0_OR_ABOVE</DefineConstants>
+ <DefineConstants>TRACE;DEBUG;DOTNET;FRAMEWORK_3_5_OR_ABOVE;FRAMEWORK_4_0_OR_ABOVE</DefineConstants>
<DocumentationFile>log4net.xml</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
@@ -92,7 +92,7 @@
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
- <DefineConstants>TRACE;STRONG;NET;FRAMEWORK_3_5_OR_ABOVE;FRAMEWORK_4_0_OR_ABOVE</DefineConstants>
+ <DefineConstants>TRACE;STRONG;DOTNET;FRAMEWORK_3_5_OR_ABOVE;FRAMEWORK_4_0_OR_ABOVE</DefineConstants>
<DocumentationFile>log4net.xml</DocumentationFile>
<DebugSymbols>false</DebugSymbols>
<FileAlignment>4096</FileAlignment>
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=1538905&r1=1538904&r2=1538905&view=diff
==============================================================================
--- logging/log4net/trunk/tests/src/log4net.Tests.vs2010.csproj (original)
+++ logging/log4net/trunk/tests/src/log4net.Tests.vs2010.csproj Tue Nov 5 08:33:51 2013
@@ -72,7 +72,7 @@
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
- <DefineConstants>TRACE;DEBUG;NET;FRAMEWORK_3_5_OR_ABOVE;FRAMEWORK_4_0_OR_ABOVE</DefineConstants>
+ <DefineConstants>TRACE;DEBUG;DOTNET;FRAMEWORK_3_5_OR_ABOVE;FRAMEWORK_4_0_OR_ABOVE</DefineConstants>
<DocumentationFile>
</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
@@ -93,7 +93,7 @@
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
- <DefineConstants>TRACE;NET;FRAMEWORK_3_5_OR_ABOVE;FRAMEWORK_4_0_OR_ABOVE</DefineConstants>
+ <DefineConstants>TRACE;DOTNET;FRAMEWORK_3_5_OR_ABOVE;FRAMEWORK_4_0_OR_ABOVE</DefineConstants>
<DocumentationFile>
</DocumentationFile>
<DebugSymbols>false</DebugSymbols>