Revert "log4net.build: fixed mono 3.5 to be stored under a 3.5 directory"
This reverts commit 0055fb4b72f46b805773917af39eff1d8e78d4ed. Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/c88fc261 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/c88fc261 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/c88fc261 Branch: refs/heads/develop Commit: c88fc261949b82ad130abfc057b6ee1c320cee0b Parents: 0055fb4 Author: Dominik Psenner <[email protected]> Authored: Mon Jul 3 12:40:06 2017 +0200 Committer: Dominik Psenner <[email protected]> Committed: Mon Jul 3 12:40:06 2017 +0200 ---------------------------------------------------------------------- log4net.include | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/c88fc261/log4net.include ---------------------------------------------------------------------- diff --git a/log4net.include b/log4net.include index c27797e..7c9bf4a 100644 --- a/log4net.include +++ b/log4net.include @@ -357,7 +357,7 @@ limitations under the License. <property name="current.build.defines.vbc" value="${build.defines.vbc},MONO=True,MONO_2_0=True" dynamic="true" /> <property name="current.build.defines.vjc" value="${build.defines.vjc},MONO,MONO_2_0" dynamic="true" /> <property name="current.build.defines.cl" value="${build.defines.cl} /D MONO /D MONO_2_0" dynamic="true" /> - <property name="current.bin.dir" value="${bin.dir}/${framework::get-family(framework::get-target-framework())}/3.5/${current.build.config}" /> + <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> @@ -370,7 +370,7 @@ limitations under the License. <property name="current.build.defines.vbc" value="${build.defines.vbc},MONO=True,MONO_2_0=True,MONO_4_0=True" dynamic="true" /> <property name="current.build.defines.vjc" value="${build.defines.vjc},MONO,MONO_2_0,MONO_4_0" dynamic="true" /> <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.bin.dir" value="${bin.dir}/${framework::get-family(framework::get-target-framework())}/4.0/${current.build.config}" /> + <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>
