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/08/19 16:15:10 UTC
[04/12] logging-log4net git commit: build: refactored netstandard
target to mention 1.3
build: refactored netstandard target to mention 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/38465f7a
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/38465f7a
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/38465f7a
Branch: refs/heads/feature/netstandard-2.0
Commit: 38465f7a478103b952dcea5753d9dcfb33ece5d4
Parents: 276eb81
Author: Dominik Psenner <dp...@apache.org>
Authored: Sat Aug 19 10:19:12 2017 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Sat Aug 19 10:21:39 2017 +0200
----------------------------------------------------------------------
Jenkinsfile | 2 +-
log4net.build | 20 ++++++++++----------
2 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/38465f7a/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index 826bc17..b988843 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -59,7 +59,7 @@ pipeline {
// run docker container
builder.inside {
// compile
- sh "nant compile-netstandard"
+ sh "nant compile-netstandard-1.3"
stash includes: 'bin/**/*.*', name: 'netstandard-assemblies'
// test
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/38465f7a/log4net.build
----------------------------------------------------------------------
diff --git a/log4net.build b/log4net.build
index 6961d8b..f08133f 100644
--- a/log4net.build
+++ b/log4net.build
@@ -1,10 +1,10 @@
<?xml version="1.0"?>
<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
+Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
+this work for additional information regarding copyright ownership.
The ASF licenses this file to you under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
+(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
@@ -201,8 +201,8 @@ limitations under the License.
<call target="compile-mono-4.0"/>
<!-- SSCLI_1_0 -->
<call target="compile-sscli-1.0"/>
- <!-- netstandard -->
- <call target="compile-netstandard"/>
+ <!-- netstandard-1.3 -->
+ <call target="compile-netstandard-1.3"/>
</target>
<!-- Target for compiling all build configurations for the current runtime configurations -->
<target name="compile-runtime" description="Compile all build configurations for the current target framework">
@@ -1748,14 +1748,14 @@ 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">
+ <!-- these targets build lognet assemblies against .NET Core (.net standard 1.3)-->
+ <target name="compile-netstandard-1.3" description="Builds .NET Core">
<call target="set-debug-build-configuration"/>
- <call target="compile-netstandard-current-configuration"/>
+ <call target="compile-netstandard-1.3-current-configuration"/>
<call target="set-release-build-configuration"/>
- <call target="compile-netstandard-current-configuration"/>
+ <call target="compile-netstandard-1.3-current-configuration"/>
</target>
- <target name="compile-netstandard-current-configuration">
+ <target name="compile-netstandard-1.3-current-configuration">
<echo message="dotnet --version"/>
<exec program="dotnet" workingdir="netstandard" failonerror="false" resultproperty="dotnet.available">
<arg value="--version"/>