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/07/06 08:39:55 UTC
[1/2] logging-log4net git commit: Renamed Nuget.Config -> NuGet.Config
Repository: logging-log4net
Updated Branches:
refs/heads/feature/cd-pipeline eb40b3948 -> f7a98bcfd
Renamed Nuget.Config -> NuGet.Config
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/77778bd7
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/77778bd7
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/77778bd7
Branch: refs/heads/feature/cd-pipeline
Commit: 77778bd77d125a885bbbb0ceecfa288c760e1091
Parents: eb40b39
Author: Dominik Psenner <dp...@apache.org>
Authored: Thu Jul 6 10:19:24 2017 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Thu Jul 6 10:19:24 2017 +0200
----------------------------------------------------------------------
NuGet.Config | 7 +++++++
Nuget.Config | 7 -------
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/77778bd7/NuGet.Config
----------------------------------------------------------------------
diff --git a/NuGet.Config b/NuGet.Config
new file mode 100644
index 0000000..4980d51
--- /dev/null
+++ b/NuGet.Config
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <add key="repositoryPath" value=".nuget"/>
+ <activePackageSource>
+ <add key="NuGet official package source" value="https://nuget.org/api/v2/" />
+ </activePackageSource>
+</configuration>
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/77778bd7/Nuget.Config
----------------------------------------------------------------------
diff --git a/Nuget.Config b/Nuget.Config
deleted file mode 100644
index 4980d51..0000000
--- a/Nuget.Config
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
- <add key="repositoryPath" value=".nuget"/>
- <activePackageSource>
- <add key="NuGet official package source" value="https://nuget.org/api/v2/" />
- </activePackageSource>
-</configuration>
[2/2] logging-log4net git commit: Moved NuGet.Config and added
--configfile to tasks
Posted by dp...@apache.org.
Moved NuGet.Config and added --configfile to tasks
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/f7a98bcf
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/f7a98bcf
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/f7a98bcf
Branch: refs/heads/feature/cd-pipeline
Commit: f7a98bcfd466a058bff6db494d6941a71a22416d
Parents: 77778bd
Author: Dominik Psenner <dp...@apache.org>
Authored: Thu Jul 6 10:39:26 2017 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Thu Jul 6 10:39:26 2017 +0200
----------------------------------------------------------------------
NuGet.Config | 7 -------
log4net.build | 4 +++-
netstandard/NuGet.Config | 7 +++++++
3 files changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/f7a98bcf/NuGet.Config
----------------------------------------------------------------------
diff --git a/NuGet.Config b/NuGet.Config
deleted file mode 100644
index 4980d51..0000000
--- a/NuGet.Config
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
- <add key="repositoryPath" value=".nuget"/>
- <activePackageSource>
- <add key="NuGet official package source" value="https://nuget.org/api/v2/" />
- </activePackageSource>
-</configuration>
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/f7a98bcf/log4net.build
----------------------------------------------------------------------
diff --git a/log4net.build b/log4net.build
index 96f8102..8ff9e1b 100644
--- a/log4net.build
+++ b/log4net.build
@@ -1763,11 +1763,13 @@ limitations under the License.
<echo message="Skipping build; required framework is not available: netstandard"/>
</if>
<if test="${dotnet.available == '0'}">
- <exec program="dotnet" workingdir="netstandard" resultproperty="dotnet.available">
+ <exec program="dotnet" workingdir="netstandard">
+ <arg value="--configfile NuGet.Config"/>
<arg value="restore"/>
<arg value="log4net.netstandard.sln"/>
</exec>
<exec program="dotnet" workingdir="netstandard">
+ <arg value="--configfile NuGet.Config"/>
<arg value="build"/>
<arg value="log4net"/>
<arg if="${current.build.config.release}" value="-c"/>
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/f7a98bcf/netstandard/NuGet.Config
----------------------------------------------------------------------
diff --git a/netstandard/NuGet.Config b/netstandard/NuGet.Config
new file mode 100644
index 0000000..4980d51
--- /dev/null
+++ b/netstandard/NuGet.Config
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <add key="repositoryPath" value=".nuget"/>
+ <activePackageSource>
+ <add key="NuGet official package source" value="https://nuget.org/api/v2/" />
+ </activePackageSource>
+</configuration>