Repository: logging-log4net Updated Branches: refs/heads/feature/cd-pipeline c21ad2d00 -> 0e6ad3b1f
log4net.build: moved compile-netstandard target to the other compile targets Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/0e6ad3b1 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/0e6ad3b1 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/0e6ad3b1 Branch: refs/heads/feature/cd-pipeline Commit: 0e6ad3b1f90f3fce2a009479432af1e82e9a46ce Parents: c21ad2d Author: Dominik Psenner <[email protected]> Authored: Thu Jul 6 00:04:49 2017 +0200 Committer: Dominik Psenner <[email protected]> Committed: Thu Jul 6 00:04:49 2017 +0200 ---------------------------------------------------------------------- log4net.build | 73 +++++++++++++++++++++++++++--------------------------- 1 file changed, 37 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/0e6ad3b1/log4net.build ---------------------------------------------------------------------- diff --git a/log4net.build b/log4net.build index c6c6b2e..18286bf 100644 --- a/log4net.build +++ b/log4net.build @@ -1748,6 +1748,43 @@ limitations under the License. </csc> </if> </target> + <!-- these targets build lognet assemblies against .NET Core (.net standard 1.0.4)--> + <target name="compile-netstandard" description="Builds .NET Core"> + <call target="set-debug-build-configuration"/> + <call target="compile-netstandard-current-configuration"/> + <call target="set-release-build-configuration"/> + <call target="compile-netstandard-current-configuration"/> + </target> + <target name="compile-netstandard-current-configuration"> + <exec program="dotnet" workingdir="netstandard" failonerror="false" resultproperty="dotnet.available"> + <arg value="--version"/> + </exec> + <if test="${dotnet.available != '0'}"> + <echo message="Skipping build; required framework is not available: netstandard"/> + </if> + <if test="${dotnet.available == '0'}"> + <exec program="dotnet" workingdir="netstandard" resultproperty="dotnet.available"> + <arg value="restore"/> + </exec> + <exec program="dotnet" workingdir="netstandard"> + <arg value="build"/> + <arg value="log4net"/> + <arg if="${current.build.config.release}" value="-c"/> + <arg if="${current.build.config.release}" value="Release"/> + </exec> + <mkdir dir="${log4net.basedir}/bin/netstandard/1.3"/> + <if test="${current.build.config.release}"> + <move todir="${log4net.basedir}/bin/netstandard/1.3/Release"> + <fileset basedir="netstandard/log4net/bin/Release/netstandard1.3"/> + </move> + </if> + <ifnot test="${current.build.config.release}"> + <move todir="${log4net.basedir}/bin/netstandard/1.3/Debug"> + <fileset basedir="netstandard/log4net/bin/Debug/netstandard1.3"/> + </move> + </ifnot> + </if> + </target> <!-- Target for generating docs for all runtime configurations --> <target name="generate-sdkdoc-all" depends="check-current-build-config"> <echo message="Generating SDK documentation temporarily disabled."/> @@ -1999,40 +2036,4 @@ limitations under the License. </asminfo> </if> </target> - <target name="compile-netstandard" description="Builds .NET Core"> - <call target="set-debug-build-configuration"/> - <call target="compile-netstandard-current-configuration"/> - <call target="set-release-build-configuration"/> - <call target="compile-netstandard-current-configuration"/> - </target> - <target name="compile-netstandard-current-configuration"> - <exec program="dotnet" workingdir="netstandard" failonerror="false" resultproperty="dotnet.available"> - <arg value="--version"/> - </exec> - <if test="${dotnet.available != '0'}"> - <echo message="Skipping build; required framework is not available: netstandard"/> - </if> - <if test="${dotnet.available == '0'}"> - <exec program="dotnet" workingdir="netstandard" resultproperty="dotnet.available"> - <arg value="restore"/> - </exec> - <exec program="dotnet" workingdir="netstandard"> - <arg value="build"/> - <arg value="log4net"/> - <arg if="${current.build.config.release}" value="-c"/> - <arg if="${current.build.config.release}" value="Release"/> - </exec> - <mkdir dir="${log4net.basedir}/bin/netstandard/1.3"/> - <if test="${current.build.config.release}"> - <move todir="${log4net.basedir}/bin/netstandard/1.3/Release"> - <fileset basedir="netstandard/log4net/bin/Release/netstandard1.3"/> - </move> - </if> - <ifnot test="${current.build.config.release}"> - <move todir="${log4net.basedir}/bin/netstandard/1.3/Debug"> - <fileset basedir="netstandard/log4net/bin/Debug/netstandard1.3"/> - </move> - </ifnot> - </if> - </target> </project>
