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 2018/05/20 15:49:34 UTC
[50/50] logging-log4net git commit: Merge branch 'develop' into
feature/RollingFileAppender-NG
Merge branch 'develop' into feature/RollingFileAppender-NG
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/b79127e5
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/b79127e5
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/b79127e5
Branch: refs/heads/feature/RollingFileAppender-NG
Commit: b79127e54b98472d1fd2a3d243768065a011826d
Parents: b798278 48f6901
Author: Dominik Psenner <dp...@apache.org>
Authored: Sun May 20 17:48:23 2018 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Sun May 20 17:48:23 2018 +0200
----------------------------------------------------------------------
.gitignore | 4 +-
Jenkinsfile | 71 ++++++----
NOTICE | 2 +-
.../docker/build-builder-netstandard-1.3.sh | 23 +++
buildtools/docker/build-builder-netstandard.sh | 23 ---
buildtools/docker/builder-mono-2.0/Dockerfile | 8 +-
buildtools/docker/builder-mono-3.5/Dockerfile | 6 +-
buildtools/docker/builder-mono-4.0/Dockerfile | 6 +-
.../docker/builder-netstandard-1.3/Dockerfile | 18 +++
.../docker/builder-netstandard/Dockerfile | 23 ---
.../docker/run-builder-netstandard-1.3.sh | 18 +++
buildtools/docker/run-builder-netstandard.sh | 18 ---
log4net.build | 38 ++---
log4net.include | 142 +++++++++----------
log4net.nuspec | 6 +-
log4net.shfbproj | 8 +-
netstandard/1.3/log4net.netstandard.sln | 54 +++++++
.../1.3/log4net.tests/ApplicationException.cs | 27 ++++
.../log4net.tests/CompatibilityExtensions.cs | 38 +++++
.../log4net.tests/ExpectedExceptionAttribute.cs | 85 +++++++++++
.../1.3/log4net.tests/log4net.tests.csproj | 58 ++++++++
.../1.3/log4net/CompatibilityExtensions.cs | 53 +++++++
netstandard/1.3/log4net/log4net.csproj | 79 +++++++++++
netstandard/log4net.netstandard.sln | 33 -----
.../log4net.tests/ApplicationException.cs | 27 ----
.../log4net.tests/CompatibilityExtensions.cs | 38 -----
.../log4net.tests/ExpectedExceptionAttribute.cs | 85 -----------
netstandard/log4net.tests/log4net.tests.csproj | 32 -----
netstandard/log4net/CompatibilityExtensions.cs | 53 -------
netstandard/log4net/log4net.csproj | 62 --------
src/Appender/AdoNetAppender.cs | 16 ++-
src/AssemblyVersionInfo.cpp | 12 +-
src/AssemblyVersionInfo.cs | 2 +-
src/AssemblyVersionInfo.js | 12 +-
src/AssemblyVersionInfo.vb | 14 +-
src/Config/XmlConfigurator.cs | 4 +-
src/Repository/Hierarchy/Hierarchy.cs | 42 +++---
src/Util/ReadOnlyPropertiesDictionary.cs | 7 +-
src/site/site.xml | 5 +-
src/site/xdoc/release/security-reports.xml | 64 +++++++++
tests/nant.build | 92 +++++++-----
tests/src/Appender/RollingFileAppenderTest.cs | 2 +
tests/src/Hierarchy/Hierarchy.cs | 50 ++++++-
tests/src/packages.config | 5 +-
44 files changed, 847 insertions(+), 618 deletions(-)
----------------------------------------------------------------------