You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by dp...@apache.org on 2017/10/31 21:19:25 UTC
[1/5] logging-log4net git commit: Jenkinsfile: expect a mstests.xml
to be generated by the target runtests-netstandard-1.3
Repository: logging-log4net
Updated Branches:
refs/heads/feature/netstandard-2.0 c027a5e7b -> f21049f43
Jenkinsfile: expect a mstests.xml to be generated by the target runtests-netstandard-1.3
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/26455f00
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/26455f00
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/26455f00
Branch: refs/heads/feature/netstandard-2.0
Commit: 26455f005411ca9cf6d3dad7ede695abed73eeae
Parents: fec14bf
Author: Dominik Psenner <dp...@apache.org>
Authored: Wed Aug 23 21:23:00 2017 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Tue Oct 31 20:30:16 2017 +0100
----------------------------------------------------------------------
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/26455f00/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index d9d877e..4e091a2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -64,7 +64,7 @@ pipeline {
// test
sh "nant -buildfile:tests/nant.build runtests-netstandard-1.3"
- stash includes: 'tests/bin/**/*.nunit.xml', name: 'netstandard-1.3-testresults'
+ stash includes: 'tests/bin/**/*.mstests.xml', name: 'netstandard-1.3-testresults'
}
}
}
[3/5] logging-log4net git commit: log4net.bin.dir is not available in
the runtests-netstandard-1.3 target
Posted by dp...@apache.org.
log4net.bin.dir is not available in the runtests-netstandard-1.3 target
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/ff5e4205
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/ff5e4205
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/ff5e4205
Branch: refs/heads/feature/netstandard-2.0
Commit: ff5e420554d9ad98be4acb8608531410e4a74db4
Parents: c731855
Author: Dominik Psenner <dp...@apache.org>
Authored: Tue Oct 31 20:56:16 2017 +0100
Committer: Dominik Psenner <dp...@apache.org>
Committed: Tue Oct 31 20:56:16 2017 +0100
----------------------------------------------------------------------
tests/nant.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/ff5e4205/tests/nant.build
----------------------------------------------------------------------
diff --git a/tests/nant.build b/tests/nant.build
index c79ffaa..310eca7 100644
--- a/tests/nant.build
+++ b/tests/nant.build
@@ -869,7 +869,7 @@ limitations under the License.
<exec program="dotnet" workingdir="${log4net.basedir}/netstandard/log4net.tests">
<arg value="test"/>
<arg value="-xml"/>
- <arg value="${current.bin.dir}/log4net.Tests.dll-results.mstest.xml"/>
+ <arg value="${log4net.basedir}/tests/bin/log4net.Tests.dll-results.mstest.xml"/>
<arg value="--verbosity"/>
<arg value="detailed"/>
</exec>
[2/5] logging-log4net git commit: Make dotnet test output build
results to an xml file
Posted by dp...@apache.org.
Make dotnet test output build results to an xml file
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/c731855a
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/c731855a
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/c731855a
Branch: refs/heads/feature/netstandard-2.0
Commit: c731855a49cecd37150d53794bcdbd1ce2b684bc
Parents: 26455f0
Author: Dominik Psenner <dp...@apache.org>
Authored: Tue Oct 31 20:35:26 2017 +0100
Committer: Dominik Psenner <dp...@apache.org>
Committed: Tue Oct 31 20:35:26 2017 +0100
----------------------------------------------------------------------
tests/nant.build | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/c731855a/tests/nant.build
----------------------------------------------------------------------
diff --git a/tests/nant.build b/tests/nant.build
index 815ead1..c79ffaa 100644
--- a/tests/nant.build
+++ b/tests/nant.build
@@ -868,6 +868,8 @@ limitations under the License.
<target name="runtests-netstandard-1.3" description="Runs log4net tests on .NET Standard 1.3">
<exec program="dotnet" workingdir="${log4net.basedir}/netstandard/log4net.tests">
<arg value="test"/>
+ <arg value="-xml"/>
+ <arg value="${current.bin.dir}/log4net.Tests.dll-results.mstest.xml"/>
<arg value="--verbosity"/>
<arg value="detailed"/>
</exec>
[5/5] logging-log4net git commit: Merge branch 'feature/cd-pipeline'
into feature/netstandard-2.0
Posted by dp...@apache.org.
Merge branch 'feature/cd-pipeline' into feature/netstandard-2.0
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/f21049f4
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/f21049f4
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/f21049f4
Branch: refs/heads/feature/netstandard-2.0
Commit: f21049f43ec2e71e9862c0295727e8ad7172d13e
Parents: c027a5e cfaf6db
Author: Dominik Psenner <dp...@apache.org>
Authored: Tue Oct 31 22:15:18 2017 +0100
Committer: Dominik Psenner <dp...@apache.org>
Committed: Tue Oct 31 22:15:18 2017 +0100
----------------------------------------------------------------------
log4net.include | 142 +++++++++++++++++++++++++-------------------------
tests/nant.build | 66 +++++++++++------------
2 files changed, 105 insertions(+), 103 deletions(-)
----------------------------------------------------------------------
[4/5] logging-log4net git commit: Format nant build xml by replacing
tabs with spaces and aligning indentations
Posted by dp...@apache.org.
Format nant build xml by replacing tabs with spaces and aligning indentations
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/cfaf6db3
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/cfaf6db3
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/cfaf6db3
Branch: refs/heads/feature/netstandard-2.0
Commit: cfaf6db3f30322c6ac097cd184eacd623c5ab1e4
Parents: ff5e420
Author: Dominik Psenner <dp...@apache.org>
Authored: Tue Oct 31 20:56:55 2017 +0100
Committer: Dominik Psenner <dp...@apache.org>
Committed: Tue Oct 31 20:56:55 2017 +0100
----------------------------------------------------------------------
log4net.include | 142 +++++++++++++++++++++++++-------------------------
tests/nant.build | 68 ++++++++++++------------
2 files changed, 105 insertions(+), 105 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/cfaf6db3/log4net.include
----------------------------------------------------------------------
diff --git a/log4net.include b/log4net.include
index 7cfe8e1..6597dd4 100644
--- a/log4net.include
+++ b/log4net.include
@@ -132,7 +132,7 @@ limitations under the License.
</if>
</target>
<target name="check-log4net-assembly" depends="check-current-build-config, check-log4net-output-dir">
- <echo message="Testing if file exists: ${path::combine(log4net.output.dir, 'log4net.dll')} "/>
+ <echo message="Testing if file exists: ${path::combine(log4net.output.dir, 'log4net.dll')} "/>
<if test="${not file::exists(path::combine(log4net.output.dir, 'log4net.dll'))}">
<fail message="The log4net '${current.build.config}' assembly for ${framework::get-description(framework::get-target-framework())} is not available." />
</if>
@@ -235,83 +235,83 @@ limitations under the License.
</target>
<!-- uses NET_2_0 defines plus NET_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.optimize" value="${build.optimize}" dynamic="true" />
- <property name="current.build.defines.csc" value="${build.defines.csc},NET,NET_2_0,NET_3_5" dynamic="true" />
- <property name="current.build.defines.jsc" value="${build.defines.jsc},NET,NET_2_0,NET_3_5" dynamic="true" />
- <property name="current.build.defines.vbc" value="${build.defines.vbc},NET=True,NET_2_0=True,NET_3_5=True" dynamic="true" />
- <property name="current.build.defines.vjc" value="${build.defines.vjc},NET,NET_2_0,NET_3_5" dynamic="true" />
- <property name="current.build.defines.cl" value="${build.defines.cl} /D NET /D NET_2_0 /D NET_3_5" dynamic="true" />
- <property name="current.build.configuration.dir" value="${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}" />
+ <property name="nant.settings.currentframework" value="net-3.5" />
+ <property name="current.build.debug" value="${build.debug}" dynamic="true" />
+ <property name="current.build.optimize" value="${build.optimize}" dynamic="true" />
+ <property name="current.build.defines.csc" value="${build.defines.csc},NET,NET_2_0,NET_3_5" dynamic="true" />
+ <property name="current.build.defines.jsc" value="${build.defines.jsc},NET,NET_2_0,NET_3_5" dynamic="true" />
+ <property name="current.build.defines.vbc" value="${build.defines.vbc},NET=True,NET_2_0=True,NET_3_5=True" dynamic="true" />
+ <property name="current.build.defines.vjc" value="${build.defines.vjc},NET,NET_2_0,NET_3_5" dynamic="true" />
+ <property name="current.build.defines.cl" value="${build.defines.cl} /D NET /D NET_2_0 /D NET_3_5" dynamic="true" />
+ <property name="current.build.configuration.dir" value="${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}" />
<property name="current.bin.dir" value="${bin.dir}/${current.build.configuration.dir}"/>
- <property name="log4net.output.dir" value="${log4net.basedir}/${current.bin.dir}" />
- <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" />
+ <property name="log4net.output.dir" value="${log4net.basedir}/${current.bin.dir}" />
+ <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 NET_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.optimize" value="${build.optimize}" dynamic="true" />
- <property name="current.build.defines.csc" value="${build.defines.csc},NET,NET_2_0,NET_3_5,CLIENT_PROFILE" dynamic="true" />
- <property name="current.build.defines.jsc" value="${build.defines.jsc},NET,NET_2_0,NET_3_5,CLIENT_PROFILE" dynamic="true" />
- <property name="current.build.defines.vbc" value="${build.defines.vbc},NET=True,NET_2_0=True,NET_3_5=True,CLIENT_PROFILE=True" dynamic="true" />
- <property name="current.build.defines.vjc" value="${build.defines.vjc},NET,NET_2_0,NET_3_5,CLIENT_PROFILE" dynamic="true" />
- <property name="current.build.defines.cl" value="${build.defines.cl} /D NET /D NET_2_0 /D NET_3_5 /D CLIENT_PROFILE" dynamic="true" />
- <property name="current.build.configuration.dir" value="${framework::get-family(framework::get-target-framework())}-cp/${framework::get-version(framework::get-target-framework())}/${current.build.config}" />
+ <property name="nant.settings.currentframework" value="net-3.5" />
+ <property name="current.build.debug" value="${build.debug}" dynamic="true" />
+ <property name="current.build.optimize" value="${build.optimize}" dynamic="true" />
+ <property name="current.build.defines.csc" value="${build.defines.csc},NET,NET_2_0,NET_3_5,CLIENT_PROFILE" dynamic="true" />
+ <property name="current.build.defines.jsc" value="${build.defines.jsc},NET,NET_2_0,NET_3_5,CLIENT_PROFILE" dynamic="true" />
+ <property name="current.build.defines.vbc" value="${build.defines.vbc},NET=True,NET_2_0=True,NET_3_5=True,CLIENT_PROFILE=True" dynamic="true" />
+ <property name="current.build.defines.vjc" value="${build.defines.vjc},NET,NET_2_0,NET_3_5,CLIENT_PROFILE" dynamic="true" />
+ <property name="current.build.defines.cl" value="${build.defines.cl} /D NET /D NET_2_0 /D NET_3_5 /D CLIENT_PROFILE" dynamic="true" />
+ <property name="current.build.configuration.dir" value="${framework::get-family(framework::get-target-framework())}-cp/${framework::get-version(framework::get-target-framework())}/${current.build.config}" />
<property name="current.bin.dir" value="${bin.dir}/${current.build.configuration.dir}"/>
- <property name="log4net.output.dir" value="${log4net.basedir}/${current.bin.dir}" />
- <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" />
+ <property name="log4net.output.dir" value="${log4net.basedir}/${current.bin.dir}" />
+ <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 -->
<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.optimize" value="${build.optimize}" dynamic="true" />
- <property name="current.build.defines.csc" value="${build.defines.csc},NET,NET_2_0,NET_4_0" dynamic="true" />
- <property name="current.build.defines.jsc" value="${build.defines.jsc},NET,NET_2_0,NET_4_0" dynamic="true" />
- <property name="current.build.defines.vbc" value="${build.defines.vbc},NET=True,NET_2_0=True,NET_4_0=True" dynamic="true" />
- <property name="current.build.defines.vjc" value="${build.defines.vjc},NET,NET_2_0,NET_4_0" dynamic="true" />
- <property name="current.build.defines.cl" value="${build.defines.cl} /D NET /D NET_2_0 /D NET_4_0" dynamic="true" />
- <property name="current.build.configuration.dir" value="${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}" />
+ <property name="nant.settings.currentframework" value="net-4.0" />
+ <property name="current.build.debug" value="${build.debug}" dynamic="true" />
+ <property name="current.build.optimize" value="${build.optimize}" dynamic="true" />
+ <property name="current.build.defines.csc" value="${build.defines.csc},NET,NET_2_0,NET_4_0" dynamic="true" />
+ <property name="current.build.defines.jsc" value="${build.defines.jsc},NET,NET_2_0,NET_4_0" dynamic="true" />
+ <property name="current.build.defines.vbc" value="${build.defines.vbc},NET=True,NET_2_0=True,NET_4_0=True" dynamic="true" />
+ <property name="current.build.defines.vjc" value="${build.defines.vjc},NET,NET_2_0,NET_4_0" dynamic="true" />
+ <property name="current.build.defines.cl" value="${build.defines.cl} /D NET /D NET_2_0 /D NET_4_0" dynamic="true" />
+ <property name="current.build.configuration.dir" value="${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}" />
<property name="current.bin.dir" value="${bin.dir}/${current.build.configuration.dir}"/>
- <property name="log4net.output.dir" value="${log4net.basedir}/${current.bin.dir}" />
- <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" />
+ <property name="log4net.output.dir" value="${log4net.basedir}/${current.bin.dir}" />
+ <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 -->
<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.optimize" value="${build.optimize}" dynamic="true" />
- <property name="current.build.defines.csc" value="${build.defines.csc},NET,NET_2_0,NET_4_0,CLIENT_PROFILE" dynamic="true" />
- <property name="current.build.defines.jsc" value="${build.defines.jsc},NET,NET_2_0,NET_4_0,CLIENT_PROFILE" dynamic="true" />
- <property name="current.build.defines.vbc" value="${build.defines.vbc},NET=True,NET_2_0=True,NET_4_0=True,CLIENT_PROFILE=True" dynamic="true" />
- <property name="current.build.defines.vjc" value="${build.defines.vjc},NET,NET_2_0,NET_4_0,CLIENT_PROFILE" dynamic="true" />
- <property name="current.build.defines.cl" value="${build.defines.cl} /D NET /D NET_2_0 /D NET_4_0 /D CLIENT_PROFILE" dynamic="true" />
- <property name="current.build.configuration.dir" value="${framework::get-family(framework::get-target-framework())}-cp/${framework::get-version(framework::get-target-framework())}/${current.build.config}" />
+ <property name="nant.settings.currentframework" value="net-4.0" />
+ <property name="current.build.debug" value="${build.debug}" dynamic="true" />
+ <property name="current.build.optimize" value="${build.optimize}" dynamic="true" />
+ <property name="current.build.defines.csc" value="${build.defines.csc},NET,NET_2_0,NET_4_0,CLIENT_PROFILE" dynamic="true" />
+ <property name="current.build.defines.jsc" value="${build.defines.jsc},NET,NET_2_0,NET_4_0,CLIENT_PROFILE" dynamic="true" />
+ <property name="current.build.defines.vbc" value="${build.defines.vbc},NET=True,NET_2_0=True,NET_4_0=True,CLIENT_PROFILE=True" dynamic="true" />
+ <property name="current.build.defines.vjc" value="${build.defines.vjc},NET,NET_2_0,NET_4_0,CLIENT_PROFILE" dynamic="true" />
+ <property name="current.build.defines.cl" value="${build.defines.cl} /D NET /D NET_2_0 /D NET_4_0 /D CLIENT_PROFILE" dynamic="true" />
+ <property name="current.build.configuration.dir" value="${framework::get-family(framework::get-target-framework())}-cp/${framework::get-version(framework::get-target-framework())}/${current.build.config}" />
<property name="current.bin.dir" value="${bin.dir}/${current.build.configuration.dir}"/>
- <property name="log4net.output.dir" value="${log4net.basedir}/${current.bin.dir}" />
- <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" />
+ <property name="log4net.output.dir" value="${log4net.basedir}/${current.bin.dir}" />
+ <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_4_0 plus NET_4_5 defines -->
<target name="set-net-4.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-4.0" />
- <property name="current.build.debug" value="${build.debug}" dynamic="true" />
- <property name="current.build.optimize" value="${build.optimize}" dynamic="true" />
- <property name="current.build.defines.csc" value="${build.defines.csc},NET,NET_2_0,NET_4_0,NET_4_5" dynamic="true" />
- <property name="current.build.defines.jsc" value="${build.defines.jsc},NET,NET_2_0,NET_4_0,NET_4_5" dynamic="true" />
- <property name="current.build.defines.vbc" value="${build.defines.vbc},NET=True,NET_2_0=True,NET_4_0=True,NET_4_5=True" dynamic="true" />
- <property name="current.build.defines.vjc" value="${build.defines.vjc},NET,NET_2_0,NET_4_0,NET_4_5" dynamic="true" />
- <property name="current.build.defines.cl" value="${build.defines.cl} /D NET /D NET_2_0 /D NET_4_0 /D NET_4_5" dynamic="true" />
- <property name="current.build.configuration.dir" value="${framework::get-family(framework::get-target-framework())}/4.5/${current.build.config}" />
+ <property name="nant.settings.currentframework" value="net-4.0" />
+ <property name="current.build.debug" value="${build.debug}" dynamic="true" />
+ <property name="current.build.optimize" value="${build.optimize}" dynamic="true" />
+ <property name="current.build.defines.csc" value="${build.defines.csc},NET,NET_2_0,NET_4_0,NET_4_5" dynamic="true" />
+ <property name="current.build.defines.jsc" value="${build.defines.jsc},NET,NET_2_0,NET_4_0,NET_4_5" dynamic="true" />
+ <property name="current.build.defines.vbc" value="${build.defines.vbc},NET=True,NET_2_0=True,NET_4_0=True,NET_4_5=True" dynamic="true" />
+ <property name="current.build.defines.vjc" value="${build.defines.vjc},NET,NET_2_0,NET_4_0,NET_4_5" dynamic="true" />
+ <property name="current.build.defines.cl" value="${build.defines.cl} /D NET /D NET_2_0 /D NET_4_0 /D NET_4_5" dynamic="true" />
+ <property name="current.build.configuration.dir" value="${framework::get-family(framework::get-target-framework())}/4.5/${current.build.config}" />
<property name="current.bin.dir" value="${bin.dir}/${current.build.configuration.dir}"/>
- <property name="log4net.output.dir" value="${log4net.basedir}/${current.bin.dir}" />
- <property name="current.sdkdoc.dir" value="${sdkdoc.dir}/${framework::get-family(framework::get-target-framework())}/4.5" />
- <property name="current.sdkdoc.debug" value="${sdkdoc.debug}" dynamic="true" />
+ <property name="log4net.output.dir" value="${log4net.basedir}/${current.bin.dir}" />
+ <property name="current.sdkdoc.dir" value="${sdkdoc.dir}/${framework::get-family(framework::get-target-framework())}/4.5" />
+ <property name="current.sdkdoc.debug" value="${sdkdoc.debug}" dynamic="true" />
</target>
<target name="set-netcf-1.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="netcf-1.0" />
@@ -324,11 +324,11 @@ limitations under the License.
<property name="current.build.defines.cl" value="${build.defines.cl} /D NETCF /D NETCF_1_0" dynamic="true" />
<property name="current.build.configuration.dir" value="${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}" />
<property name="current.bin.dir" value="${bin.dir}/${current.build.configuration.dir}"/>
- <property name="log4net.output.dir" value="${log4net.basedir}/${current.bin.dir}" />
+ <property name="log4net.output.dir" value="${log4net.basedir}/${current.bin.dir}" />
<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>
- <target name="set-netcf-2.0-runtime-configuration" depends="check-bin-dir, check-sdkdoc-dir, check-sdkdoc-debug, check-current-build-config, check-build-debug, check-build-defines">
+ <target name="set-netcf-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="netcf-2.0" />
<property name="current.build.debug" value="${build.debug}" dynamic="true" />
<property name="current.build.optimize" value="${build.optimize}" dynamic="true" />
@@ -339,7 +339,7 @@ limitations under the License.
<property name="current.build.defines.cl" value="${build.defines.cl} /D NETCF /D NETCF_2_0" dynamic="true" />
<property name="current.build.configuration.dir" value="${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}" />
<property name="current.bin.dir" value="${bin.dir}/${current.build.configuration.dir}"/>
- <property name="log4net.output.dir" value="${log4net.basedir}/${current.bin.dir}" />
+ <property name="log4net.output.dir" value="${log4net.basedir}/${current.bin.dir}" />
<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>
@@ -354,7 +354,7 @@ limitations under the License.
<property name="current.build.defines.cl" value="${build.defines.cl} /D MONO /D MONO_1_0" dynamic="true" />
<property name="current.build.configuration.dir" value="${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}" />
<property name="current.bin.dir" value="${bin.dir}/${current.build.configuration.dir}"/>
- <property name="log4net.output.dir" value="${log4net.basedir}/${current.bin.dir}" />
+ <property name="log4net.output.dir" value="${log4net.basedir}/${current.bin.dir}" />
<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>
@@ -369,7 +369,7 @@ limitations under the License.
<property name="current.build.defines.cl" value="${build.defines.cl} /D MONO /D MONO_2_0" dynamic="true" />
<property name="current.build.configuration.dir" value="${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}" />
<property name="current.bin.dir" value="${bin.dir}/${current.build.configuration.dir}"/>
- <property name="log4net.output.dir" value="${log4net.basedir}/${current.bin.dir}" />
+ <property name="log4net.output.dir" value="${log4net.basedir}/${current.bin.dir}" />
<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>
@@ -384,7 +384,7 @@ limitations under the License.
<property name="current.build.defines.cl" value="${build.defines.cl} /D MONO /D MONO_2_0" dynamic="true" />
<property name="current.build.configuration.dir" value="${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}" />
<property name="current.bin.dir" value="${bin.dir}/${current.build.configuration.dir}"/>
- <property name="log4net.output.dir" value="${log4net.basedir}/${current.bin.dir}" />
+ <property name="log4net.output.dir" value="${log4net.basedir}/${current.bin.dir}" />
<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>
@@ -399,7 +399,7 @@ limitations under the License.
<property name="current.build.defines.cl" value="${build.defines.cl} /D MONO /D MONO_2_0 /D MONO_4_0" dynamic="true" />
<property name="current.build.configuration.dir" value="${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}" />
<property name="current.bin.dir" value="${bin.dir}/${current.build.configuration.dir}"/>
- <property name="log4net.output.dir" value="${log4net.basedir}/${current.bin.dir}" />
+ <property name="log4net.output.dir" value="${log4net.basedir}/${current.bin.dir}" />
<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>
@@ -414,7 +414,7 @@ limitations under the License.
<property name="current.build.defines.cl" value="${build.defines.cl} /D MONO /D MONO_2_0 /D MONO_4_0 /D MONO_4_5" dynamic="true" />
<property name="current.build.configuration.dir" value="${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}" />
<property name="current.bin.dir" value="${bin.dir}/${current.build.configuration.dir}"/>
- <property name="log4net.output.dir" value="${log4net.basedir}/${current.bin.dir}" />
+ <property name="log4net.output.dir" value="${log4net.basedir}/${current.bin.dir}" />
<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>
@@ -429,7 +429,7 @@ limitations under the License.
<property name="current.build.defines.cl" value="${build.defines.cl} /D SSCLI /D SSCLI_1_0" dynamic="true" />
<property name="current.build.configuration.dir" value="${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}" />
<property name="current.bin.dir" value="${bin.dir}/${current.build.configuration.dir}"/>
- <property name="log4net.output.dir" value="${log4net.basedir}/${current.bin.dir}" />
+ <property name="log4net.output.dir" value="${log4net.basedir}/${current.bin.dir}" />
<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>
@@ -444,7 +444,7 @@ limitations under the License.
<property name="current.build.defines.cl" value="${build.defines.cl} /D CLI /D CLI_1_0" dynamic="true" />
<property name="current.build.configuration.dir" value="cli/1.0/${current.build.config}" />
<property name="current.bin.dir" value="${bin.dir}/${current.build.configuration.dir}"/>
- <property name="log4net.output.dir" value="${log4net.basedir}/${current.bin.dir}" />
+ <property name="log4net.output.dir" value="${log4net.basedir}/${current.bin.dir}" />
<property name="current.sdkdoc.dir" value="${sdkdoc.dir}" />
<property name="current.sdkdoc.debug" value="${sdkdoc.debug}" dynamic="true" />
</target>
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/cfaf6db3/tests/nant.build
----------------------------------------------------------------------
diff --git a/tests/nant.build b/tests/nant.build
index 310eca7..a3e2908 100644
--- a/tests/nant.build
+++ b/tests/nant.build
@@ -26,14 +26,14 @@ limitations under the License.
<target name="install-nunit">
<if test="${not file::exists('lib/${current.build.configuration.dir}/nunit.framework.dll')}">
- <get src="https://github.com/nunit/nunitv2/releases/download/2.6.4/NUnit-2.6.4.zip"
- dest=".tmp-nunit.zip"/>
- <unzip zipfile=".tmp-nunit.zip"
- todir=".tmp-nunit"/>
- <copy file=".tmp-nunit/NUnit-2.6.4/bin/nunit.framework.dll"
- todir="lib/${current.build.configuration.dir}"/>
- <delete file=".tmp-nunit.zip"/>
- <delete dir=".tmp-nunit"/>
+ <get src="https://github.com/nunit/nunitv2/releases/download/2.6.4/NUnit-2.6.4.zip"
+ dest=".tmp-nunit.zip"/>
+ <unzip zipfile=".tmp-nunit.zip"
+ todir=".tmp-nunit"/>
+ <copy file=".tmp-nunit/NUnit-2.6.4/bin/nunit.framework.dll"
+ todir="lib/${current.build.configuration.dir}"/>
+ <delete file=".tmp-nunit.zip"/>
+ <delete dir=".tmp-nunit"/>
</if>
</target>
@@ -295,7 +295,7 @@ limitations under the License.
<references defaultexcludes="true">
<include name="mscorlib.dll" />
<include name="System.dll" />
- <include name="System.Configuration.dll" />
+ <include name="System.Configuration.dll" />
<include name="System.Data.dll" />
<include name="System.Web.dll" />
<include name="System.Xml.dll" />
@@ -351,7 +351,7 @@ limitations under the License.
<references defaultexcludes="true">
<!-- include name="mscorlib.dll" / -->
<include name="System.dll" />
- <include name="System.Configuration.dll" />
+ <include name="System.Configuration.dll" />
<include name="System.Data.dll" />
<include name="System.Web.dll" />
<include name="System.Xml.dll" />
@@ -407,7 +407,7 @@ limitations under the License.
<references defaultexcludes="true">
<!-- include name="mscorlib.dll" / -->
<include name="System.dll" />
- <include name="System.Configuration.dll" />
+ <include name="System.Configuration.dll" />
<include name="System.Core.dll" />
<include name="System.Data.dll" />
<include name="System.Web.dll" />
@@ -464,7 +464,7 @@ limitations under the License.
<references defaultexcludes="true">
<!-- include name="mscorlib.dll" / -->
<include name="System.dll" />
- <include name="System.Configuration.dll" />
+ <include name="System.Configuration.dll" />
<include name="System.Core.dll" />
<include name="System.Data.dll" />
<include name="System.Web.dll" />
@@ -521,7 +521,7 @@ limitations under the License.
<references defaultexcludes="true">
<include name="mscorlib.dll" />
<include name="System.dll" />
- <include name="System.Configuration.dll" />
+ <include name="System.Configuration.dll" />
<include name="System.Data.dll" />
<include name="System.Web.dll" />
<include name="System.Xml.dll" />
@@ -577,7 +577,7 @@ limitations under the License.
<references defaultexcludes="true">
<include name="mscorlib.dll" />
<include name="System.dll" />
- <include name="System.Configuration.dll" />
+ <include name="System.Configuration.dll" />
<include name="System.Data.dll" />
<include name="System.Xml.dll" />
<include name="System.Runtime.Remoting.dll" />
@@ -632,7 +632,7 @@ limitations under the License.
<references defaultexcludes="true">
<include name="mscorlib.dll" />
<include name="System.dll" />
- <include name="System.Configuration.dll" />
+ <include name="System.Configuration.dll" />
<include name="System.Core.dll" />
<include name="System.Data.dll" />
<include name="System.Web.dll" />
@@ -689,7 +689,7 @@ limitations under the License.
<references defaultexcludes="true">
<include name="mscorlib.dll" />
<include name="System.dll" />
- <include name="System.Configuration.dll" />
+ <include name="System.Configuration.dll" />
<include name="System.Core.dll" />
<include name="System.Data.dll" />
<include name="System.Xml.dll" />
@@ -745,7 +745,7 @@ limitations under the License.
<references defaultexcludes="true">
<include name="mscorlib.dll" />
<include name="System.dll" />
- <include name="System.Configuration.dll" />
+ <include name="System.Configuration.dll" />
<include name="System.Core.dll" />
<include name="System.Data.dll" />
<include name="System.Web.dll" />
@@ -764,28 +764,28 @@ limitations under the License.
<!-- Currently we cannot run the tests in the environment of the target framework only in the host framework -->
<target name="runtests" description="Runs log4net tests">
- <!--
- Because the <nunit2> task does not support multiple frameworks through the
- nant.settings.currentframework setting we cannot just run the tests for each framework.
- Only the tests for the current framework are run.
-
+ <!--
+ Because the <nunit2> task does not support multiple frameworks through the
+ nant.settings.currentframework setting we cannot just run the tests for each framework.
+ Only the tests for the current framework are run.
+
<if test="${framework::exists('net-1.0')}">
- <call target="runtests-net-1.0" />
+ <call target="runtests-net-1.0" />
</if>
<if test="${framework::exists('net-1.1')}">
- <call target="runtests-net-1.1" />
+ <call target="runtests-net-1.1" />
</if>
<if test="${framework::exists('net-2.0')}">
- <call target="runtests-net-2.0" />
+ <call target="runtests-net-2.0" />
</if>
<if test="${framework::exists('mono-2.0')}">
- <call target="runtests-mono-2.0" />
+ <call target="runtests-mono-2.0" />
+ </if>
+ -->
+ <if test="${target::exists('runtests-' + nant.settings.currentframework)}">
+ <echo message="Running tests for ${framework::get-target-framework()}" />
+ <call target="runtests-${nant.settings.currentframework}" />
</if>
- -->
- <if test="${target::exists('runtests-' + nant.settings.currentframework)}">
- <echo message="Running tests for ${framework::get-target-framework()}" />
- <call target="runtests-${nant.settings.currentframework}" />
- </if>
</target>
<target name="runtests-net-1.0" description="Runs log4net tests on .NET Framework 1.0 version" depends="compile-net-1.0">
@@ -868,10 +868,10 @@ limitations under the License.
<target name="runtests-netstandard-1.3" description="Runs log4net tests on .NET Standard 1.3">
<exec program="dotnet" workingdir="${log4net.basedir}/netstandard/log4net.tests">
<arg value="test"/>
- <arg value="-xml"/>
- <arg value="${log4net.basedir}/tests/bin/log4net.Tests.dll-results.mstest.xml"/>
+ <arg value="-xml"/>
+ <arg value="${log4net.basedir}/tests/bin/log4net.Tests.dll-results.mstest.xml"/>
<arg value="--verbosity"/>
- <arg value="detailed"/>
+ <arg value="detailed"/>
</exec>
</target>