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/e33ab6cf Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/e33ab6cf Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/e33ab6cf Branch: refs/heads/feature/RollingFileAppender-NG Commit: e33ab6cfc96b81261430cc118d836bc551efb52d Parents: 2bd214a 3cd1743 Author: Dominik Psenner <[email protected]> Authored: Wed Jul 5 17:04:17 2017 +0200 Committer: Dominik Psenner <[email protected]> Committed: Wed Jul 5 17:04:17 2017 +0200 ---------------------------------------------------------------------- Jenkinsfile | 220 +- buildtools/docker/build.sh | 12 + buildtools/docker/builder-mono-2.0/Dockerfile | 9 + buildtools/docker/builder-mono-3.5/Dockerfile | 9 + buildtools/docker/builder-mono-4.0/Dockerfile | 9 + .../docker/builder-netstandard/Dockerfile | 9 + buildtools/docker/cleanup-containers.sh | 5 + buildtools/docker/cleanup-images.sh | 6 + buildtools/docker/cleanup.py | 13 + log4net.build | 2820 +++++++++--------- log4net.include | 86 +- netstandard/global.json | 3 - netstandard/log4net.netstandard.sln | 30 +- netstandard/log4net.tests/log4net.tests.csproj | 32 + netstandard/log4net.tests/log4net.tests.xproj | 63 - netstandard/log4net.tests/project.json | 45 - netstandard/log4net/log4net.csproj | 62 + netstandard/log4net/log4net.xproj | 260 -- netstandard/log4net/project.json | 70 - tests/nant.build | 71 +- 20 files changed, 1936 insertions(+), 1898 deletions(-) ----------------------------------------------------------------------
