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:48:45 UTC

[01/50] logging-log4net git commit: Fix test build script to have the proper working directory

Repository: logging-log4net
Updated Branches:
  refs/heads/feature/RollingFileAppender-NG b7982786c -> b79127e54


Fix test build script to have the proper working directory


Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/05974851
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/05974851
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/05974851

Branch: refs/heads/feature/RollingFileAppender-NG
Commit: 0597485143502d1f61f120fef8a9a40bb8d2c496
Parents: 05c3a61
Author: Dominik Psenner <dp...@apache.org>
Authored: Sun Nov 12 16:17:11 2017 +0100
Committer: Dominik Psenner <dp...@apache.org>
Committed: Sun Nov 12 16:17:11 2017 +0100

----------------------------------------------------------------------
 tests/nant.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/05974851/tests/nant.build
----------------------------------------------------------------------
diff --git a/tests/nant.build b/tests/nant.build
index edbe3f9..b04af84 100644
--- a/tests/nant.build
+++ b/tests/nant.build
@@ -866,7 +866,7 @@ limitations under the License.
     </target>
 
     <target name="runtests-netstandard-1.3" description="Runs log4net tests on .NET Standard 1.3">
-		<exec program="dotnet" workingdir="${log4net.basedir}/netstandard/1.3" failonerror="false">
+		<exec program="dotnet" workingdir="${log4net.basedir}/netstandard/1.3/log4net.tests" failonerror="false">
             <arg value="test"/>
             <arg value="--logger:trx"/>
         </exec>

[14/50] logging-log4net git commit: Merge branch 'develop' into feature/cd-pipeline

Posted by dp...@apache.org.

Merge branch 'develop' into feature/cd-pipeline


Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/bc53a4fc
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/bc53a4fc
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/bc53a4fc

Branch: refs/heads/feature/RollingFileAppender-NG
Commit: bc53a4fce05268f895c54bee2668450e4f8c75cd
Parents: 9f7118c 1d3afc1
Author: Stefan Bodewig <st...@innoq.com>
Authored: Sat Jan 20 18:43:12 2018 +0100
Committer: Stefan Bodewig <st...@innoq.com>
Committed: Sat Jan 20 18:43:12 2018 +0100

----------------------------------------------------------------------
 NOTICE                                           |  2 +-
 log4net.build                                    |  6 +++---
 log4net.nuspec                                   |  6 +++---
 log4net.shfbproj                                 |  8 ++++----
 netstandard/1.3/log4net.netstandard.sln          | 18 ++++++++++++++++++
 .../1.3/log4net.tests/log4net.tests.csproj       | 17 +++++++++++++++++
 netstandard/1.3/log4net/log4net.csproj           | 19 ++++++++++++++++++-
 src/AssemblyVersionInfo.cpp                      | 12 ++++++------
 src/AssemblyVersionInfo.cs                       |  2 +-
 src/AssemblyVersionInfo.js                       | 12 ++++++------
 src/AssemblyVersionInfo.vb                       | 14 +++++++-------
 11 files changed, 84 insertions(+), 32 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/bc53a4fc/log4net.build
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/bc53a4fc/netstandard/1.3/log4net.netstandard.sln
----------------------------------------------------------------------
diff --cc netstandard/1.3/log4net.netstandard.sln
index c578a2e,0000000..f811388
mode 100644,000000..100644
--- a/netstandard/1.3/log4net.netstandard.sln
+++ b/netstandard/1.3/log4net.netstandard.sln
@@@ -1,33 -1,0 +1,51 @@@
 +
 +Microsoft Visual Studio Solution File, Format Version 12.00
 +# Visual Studio 15
++#
++# 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.  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 obtain a copy of the License at
++#
++#   http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing,
++# software distributed under the License is distributed on an
++# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
++# KIND, either express or implied.  See the License for the
++# specific language governing permissions and limitations
++# under the License.
++#
 +VisualStudioVersion = 15.0.26114.2
 +MinimumVisualStudioVersion = 10.0.40219.1
 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "log4net", "log4net\log4net.csproj", "{00764202-B361-4BC8-A1B9-01D87F9D2D51}"
 +EndProject
 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "log4net.tests", "log4net.tests\log4net.tests.csproj", "{6A78D53B-C864-4316-AA00-F2EBFE975223}"
 +EndProject
 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4BB38D1C-1862-432B-881C-925714F7F997}"
 +	ProjectSection(SolutionItems) = preProject
 +		nuget.config = nuget.config
 +	EndProjectSection
 +EndProject
 +Global
 +	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 +		Debug|Any CPU = Debug|Any CPU
 +		Release|Any CPU = Release|Any CPU
 +	EndGlobalSection
 +	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 +		{00764202-B361-4BC8-A1B9-01D87F9D2D51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 +		{00764202-B361-4BC8-A1B9-01D87F9D2D51}.Debug|Any CPU.Build.0 = Debug|Any CPU
 +		{00764202-B361-4BC8-A1B9-01D87F9D2D51}.Release|Any CPU.ActiveCfg = Release|Any CPU
 +		{00764202-B361-4BC8-A1B9-01D87F9D2D51}.Release|Any CPU.Build.0 = Release|Any CPU
 +		{6A78D53B-C864-4316-AA00-F2EBFE975223}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 +		{6A78D53B-C864-4316-AA00-F2EBFE975223}.Debug|Any CPU.Build.0 = Debug|Any CPU
 +		{6A78D53B-C864-4316-AA00-F2EBFE975223}.Release|Any CPU.ActiveCfg = Release|Any CPU
 +		{6A78D53B-C864-4316-AA00-F2EBFE975223}.Release|Any CPU.Build.0 = Release|Any CPU
 +	EndGlobalSection
 +	GlobalSection(SolutionProperties) = preSolution
 +		HideSolutionNode = FALSE
 +	EndGlobalSection
 +EndGlobal

http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/bc53a4fc/netstandard/1.3/log4net.tests/log4net.tests.csproj
----------------------------------------------------------------------
diff --cc netstandard/1.3/log4net.tests/log4net.tests.csproj
index b644ad9,0000000..f2b8843
mode 100755,000000..100755
--- a/netstandard/1.3/log4net.tests/log4net.tests.csproj
+++ b/netstandard/1.3/log4net.tests/log4net.tests.csproj
@@@ -1,32 -1,0 +1,49 @@@
++<?xml version="1.0"?>
++<!--
++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.
++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 obtain a copy of the License at
++
++http://www.apache.org/licenses/LICENSE-2.0
++
++Unless required by applicable law or agreed to in writing, software
++distributed under the License is distributed on an "AS IS" BASIS,
++WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++See the License for the specific language governing permissions and
++limitations under the License.
++-->
 +<Project Sdk="Microsoft.NET.Sdk">
 +
 +  <PropertyGroup>
 +    <VersionPrefix>2.0.9</VersionPrefix>
 +    <TargetFramework>netcoreapp1.0</TargetFramework>
 +    <DefineConstants>$(DefineConstants);NETSTANDARD1_3</DefineConstants>
 +    <AssemblyName>log4net.tests</AssemblyName>
 +    <PackageId>log4net.tests</PackageId>
 +    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
 +    <PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8</PackageTargetFallback>
 +    <RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
 +    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
 +    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
 +    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
 +    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
 +  </PropertyGroup>
 +
 +  <ItemGroup>
 +    <Compile Include="../../../tests/src/*.cs;../../../tests/src/Appender/AppenderCollectionTest.cs;../../../tests/src/Appender/BufferingAppenderTest.cs;../../../tests/src/Appender/CountingAppender.cs;../../../tests/src/Appender/MemoryAppenderTest.cs;../../../tests/src/Appender/RollingFileAppenderTest.cs;../../../tests/src/Appender/SmtpPickupDirAppenderTest.cs;../../../tests/src/Appender/StringAppender.cs;../../../tests/src/Appender/TraceAppenderTest.cs;../../../tests/src/Context/LogicalThreadContextTest.cs;../../../tests/src/Context/ThreadContextTest.cs;../../../tests/src/Co../../../*.cs;../../../tests/src/DateFormatt../../../*.cs;../../../tests/src/Hierarc../../../*.cs;../../../tests/src/Layo../../../*.cs;../../../tests/src/LoggerReposito../../../*.cs;../../../tests/src/Util/CyclicBufferTest.cs;../../../tests/src/Util/LogLogTest.cs;../../../tests/src/Util/PatternConverterTest.cs;../../../tests/src/Util/RandomStringPatternConverterTest.cs;../../../tests/src/Util/SystemInfoTest.cs;
 ../../../tests/src/Util/TransformTest.cs" Exclude="bin/**;obj/**;**/*.xproj;packages/**" />
 +  </ItemGroup>
 +
 +  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
 +    <ProjectReference Include="../log4net/log4net.csproj" />
 +    <PackageReference Include="NUnit" Version="3.9.0" />
 +  </ItemGroup>
 +
 +  <ItemGroup>
 +    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
 +    <PackageReference Include="NUnit3TestAdapter" Version="3.9.0" />
 +  </ItemGroup>
 +
 +</Project>

http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/bc53a4fc/netstandard/1.3/log4net/log4net.csproj
----------------------------------------------------------------------
diff --cc netstandard/1.3/log4net/log4net.csproj
index c484481,0000000..460d549
mode 100755,000000..100755
--- a/netstandard/1.3/log4net/log4net.csproj
+++ b/netstandard/1.3/log4net/log4net.csproj
@@@ -1,62 -1,0 +1,79 @@@
++<?xml version="1.0"?>
++<!--
++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.
++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 obtain a copy of the License at
++
++http://www.apache.org/licenses/LICENSE-2.0
++
++Unless required by applicable law or agreed to in writing, software
++distributed under the License is distributed on an "AS IS" BASIS,
++WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++See the License for the specific language governing permissions and
++limitations under the License.
++-->
 +<Project Sdk="Microsoft.NET.Sdk">
 +
 +  <PropertyGroup>
-     <Copyright>Copyright 2004-2017 The Apache Software Foundation.</Copyright>
++    <Copyright>Copyright 2004-2018 The Apache Software Foundation.</Copyright>
 +    <AssemblyTitle>Apache log4net for .NET Core</AssemblyTitle>
 +    <VersionPrefix>2.0.9</VersionPrefix>
 +    <TargetFramework>netstandard1.3</TargetFramework>
 +    <AssemblyName>log4net</AssemblyName>
 +    <PackageId>log4net</PackageId>
 +    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
 +    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
 +    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
 +    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
 +    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
 +    <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
 +    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
 +    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
 +    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
 +  </PropertyGroup>
 +
 +  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
 +    <DefineConstants>$(DefineConstants);HAS_READERWRITERLOCKSLIM</DefineConstants>
 +    <PublicSign>true</PublicSign>
 +	<AssemblyOriginatorKeyFile>../../../log4net.snk</AssemblyOriginatorKeyFile>
 +    <SignAssembly>true</SignAssembly>
 +  </PropertyGroup>
 +
 +  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
 +    <Compile Remove="..\..\..\src\Appender\AdoNetAppender.cs;..\..\..\src\Appender\AspNetTraceAppender.cs;..\..\..\src\Appender\ColoredConsoleAppender.cs;..\..\..\src\Appender\EventLogAppender.cs;..\..\..\src\Appender\NetSendAppender.cs;..\..\..\src\Appender\RemotingAppender.cs;..\..\..\src\Appender\SmtpAppender.cs;..\..\..\src\Config\DOMConfigurator.cs;..\..\..\src\Config\DOMConfiguratorAttribute.cs;..\..\..\src\Config\Log4NetConfigurationSectionHandler.cs;..\..\..\src\Layout\Pattern\AspNetCachePatternConverter.cs;..\..\..\src\Layout\Pattern\AspNetContextPatternConverter.cs;..\..\..\src\Layout\Pattern\AspNetPatternConverter.cs;..\..\..\src\Layout\Pattern\AspNetRequestPatternConverter.cs;..\..\..\src\Layout\Pattern\AspNetSessionPatternConverter.cs;..\..\..\src\Layout\Pattern\StackTraceDetailPatternConverter.cs;..\..\..\src\Layout\Pattern\StackTracePatternConverter.cs;..\..\..\src\Plugin\RemoteLoggingServerPlugin.cs;..\..\..\src\Util\PatternStringConverters\AppSettingPatternConverte
 r.cs;..\..\..\src\Util\PatternStringConverters\EnvironmentFolderPathPatternConverter.cs;..\..\..\src\Util\NativeError.cs;..\..\..\src\Util\WindowsSecurityContext.cs" />
 +   <Compile Include="..\..\..\src\**\*.cs" Exclude="..\..\..\src\Appender\AdoNetAppender.cs;..\..\..\src\Appender\AspNetTraceAppender.cs;..\..\..\src\Appender\ColoredConsoleAppender.cs;..\..\..\src\Appender\EventLogAppender.cs;..\..\..\src\Appender\NetSendAppender.cs;..\..\..\src\Appender\RemotingAppender.cs;..\..\..\src\Appender\SmtpAppender.cs;..\..\..\src\Config\DOMConfigurator.cs;..\..\..\src\Config\DOMConfiguratorAttribute.cs;..\..\..\src\Config\Log4NetConfigurationSectionHandler.cs;..\..\..\src\Layout\Pattern\AspNetCachePatternConverter.cs;..\..\..\src\Layout\Pattern\AspNetContextPatternConverter.cs;..\..\..\src\Layout\Pattern\AspNetPatternConverter.cs;..\..\..\src\Layout\Pattern\AspNetRequestPatternConverter.cs;..\..\..\src\Layout\Pattern\AspNetSessionPatternConverter.cs;..\..\..\src\Layout\Pattern\StackTraceDetailPatternConverter.cs;..\..\..\src\Layout\Pattern\StackTracePatternConverter.cs;..\..\..\src\Plugin\RemoteLoggingServerPlugin.cs;..\..\..\src\Util\PatternStringConve
 rters\AppSettingPatternConverter.cs;..\..\..\src\Util\PatternStringConverters\EnvironmentFolderPathPatternConverter.cs;..\..\..\src\Util\NativeError.cs;..\..\..\src\Util\WindowsSecurityContext.cs;bin\**;obj\**;**\*.xproj;packages\**" />
 +  </ItemGroup>
 +
 +  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
 +    <PackageReference Include="System.AppContext" Version="4.3.0" />
 +    <PackageReference Include="System.Collections.NonGeneric" Version="4.0.1" />
 +    <PackageReference Include="System.Console" Version="4.3.0" />
 +    <PackageReference Include="System.Diagnostics.Debug" Version="4.3.0" />
 +    <PackageReference Include="System.Diagnostics.Process" Version="4.1.0" />
 +    <PackageReference Include="System.Diagnostics.StackTrace" Version="4.0.1" />
 +    <PackageReference Include="System.Diagnostics.TraceSource" Version="4.0.0" />
 +    <PackageReference Include="System.IO.FileSystem" Version="4.3.0" />
 +    <PackageReference Include="System.IO.FileSystem.Watcher" Version="4.0.0" />
 +    <PackageReference Include="System.Linq" Version="4.3.0" />
 +    <PackageReference Include="System.Net.NameResolution" Version="4.0.0" />
 +    <PackageReference Include="System.Net.Requests" Version="4.0.11" />
 +    <PackageReference Include="System.Net.Sockets" Version="4.3.0" />
 +    <PackageReference Include="System.Reflection" Version="4.3.0" />
 +    <PackageReference Include="System.Reflection.Extensions" Version="4.3.0" />
 +    <PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" />
 +    <PackageReference Include="System.Runtime.Extensions" Version="4.3.0" />
 +    <PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
 +    <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
 +    <PackageReference Include="System.Runtime.Serialization.Formatters" Version="4.3.0" />
 +    <PackageReference Include="System.Text.RegularExpressions" Version="4.3.0" />
 +    <PackageReference Include="System.Threading" Version="4.3.0" />
 +    <PackageReference Include="System.Threading.Thread" Version="4.0.0" />
 +    <PackageReference Include="System.Threading.Timer" Version="4.3.0" />
 +    <PackageReference Include="System.Xml.ReaderWriter" Version="4.3.0" />
 +    <PackageReference Include="System.Xml.XmlDocument" Version="4.0.1" />
 +  </ItemGroup>
 +
 +</Project>

[03/50] logging-log4net git commit: netstandard-1.3: specify csproj to test when running dotnet test

Posted by dp...@apache.org.

netstandard-1.3: specify csproj to test when running dotnet test

This also changes the working directory hopefully fixing the test
build errors with jenkins.


Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/9bbb6585
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/9bbb6585
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/9bbb6585

Branch: refs/heads/feature/RollingFileAppender-NG
Commit: 9bbb6585fefd2c9ea5aebd2830b90e2118a8ada8
Parents: 9ed358f
Author: Dominik Psenner <dp...@apache.org>
Authored: Tue Nov 28 21:08:39 2017 +0100
Committer: Dominik Psenner <dp...@apache.org>
Committed: Tue Nov 28 21:08:39 2017 +0100

----------------------------------------------------------------------
 tests/nant.build | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/9bbb6585/tests/nant.build
----------------------------------------------------------------------
diff --git a/tests/nant.build b/tests/nant.build
index b04af84..4c6536f 100644
--- a/tests/nant.build
+++ b/tests/nant.build
@@ -866,9 +866,10 @@ limitations under the License.
     </target>
 
     <target name="runtests-netstandard-1.3" description="Runs log4net tests on .NET Standard 1.3">
-		<exec program="dotnet" workingdir="${log4net.basedir}/netstandard/1.3/log4net.tests" failonerror="false">
+		<exec program="dotnet" workingdir="${log4net.basedir}/netstandard/1.3" failonerror="false">
             <arg value="test"/>
-            <arg value="--logger:trx"/>
+			<arg value="--logger:trx"/>
+			<arg value="log4net.tests/log4net.tests.csproj" />
         </exec>
     </target>

[21/50] logging-log4net git commit: there are files under source control in a dir named release

Posted by dp...@apache.org.

there are files under source control in a dir named release


Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/a0329e04
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/a0329e04
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/a0329e04

Branch: refs/heads/feature/RollingFileAppender-NG
Commit: a0329e046d2cb3904928da7f56a478970acc1275
Parents: 24a9c08
Author: Stefan Bodewig <bo...@apache.org>
Authored: Wed Jan 31 16:51:29 2018 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Wed Jan 31 16:51:29 2018 +0100

----------------------------------------------------------------------
 .gitignore | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/a0329e04/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 6c925f2..b9a8678 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@
 [Dd]ebug/
 [Dd]ebugPublic/
 [Rr]elease/
+!src/site/xdoc/release/
 [Rr]eleases/
 x64/
 x86/
@@ -137,7 +138,7 @@ publish/
 # Publish Web Output
 *.[Pp]ublish.xml
 *.azurePubxml
-# TODO: Comment the next line if you want to checkin your web deploy settings 
+# TODO: Comment the next line if you want to checkin your web deploy settings
 # but database connection strings (with potential passwords) will be unencrypted
 *.pubxml
 *.publishproj
@@ -235,4 +236,3 @@ target
 # other files to ignore
 old-log4net.snk
 src/GeneratedAssemblyInfo.cs
-

[25/50] logging-log4net git commit: Bump netstandard-1.3 builder docker to 2-sdk-jessie

Posted by dp...@apache.org.

Bump netstandard-1.3 builder docker to 2-sdk-jessie

The reasoning is that nant is no longer available in stretch.


Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/f5583cfc
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/f5583cfc
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/f5583cfc

Branch: refs/heads/feature/RollingFileAppender-NG
Commit: f5583cfc904ecc78c9a37fea0e981146b5c35323
Parents: c5c984e
Author: Dominik Psenner <dp...@apache.org>
Authored: Tue May 8 19:35:38 2018 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Tue May 8 19:35:38 2018 +0200

----------------------------------------------------------------------
 buildtools/docker/builder-netstandard-1.3/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/f5583cfc/buildtools/docker/builder-netstandard-1.3/Dockerfile
----------------------------------------------------------------------
diff --git a/buildtools/docker/builder-netstandard-1.3/Dockerfile b/buildtools/docker/builder-netstandard-1.3/Dockerfile
index 1b6aa90..6e43e81 100644
--- a/buildtools/docker/builder-netstandard-1.3/Dockerfile
+++ b/buildtools/docker/builder-netstandard-1.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM microsoft/dotnet:2.0-sdk
+FROM microsoft/dotnet:2-sdk-jessie
 
 # define arguments passed in as environment variables
 ARG JENKINS_UID

[41/50] logging-log4net git commit: mono-2.0: remove the outer agent dockerfile

Posted by dp...@apache.org.

mono-2.0: remove the outer agent dockerfile


Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/dcaca5ad
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/dcaca5ad
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/dcaca5ad

Branch: refs/heads/feature/RollingFileAppender-NG
Commit: dcaca5ad2c7d87b59a8bf8795b06f2a83ae2b352
Parents: 2d1c4d7
Author: Dominik Psenner <dp...@apache.org>
Authored: Thu May 10 09:48:17 2018 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Thu May 10 09:48:17 2018 +0200

----------------------------------------------------------------------
 Jenkinsfile | 7 -------
 1 file changed, 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/dcaca5ad/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index 4df17e0..29f4a51 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -155,13 +155,6 @@ pipeline {
 			}
 		}
 		stage('build mono-2.0') {
-			agent {
-				dockerfile {
-					dir 'buildtools/docker/builder-mono-2.0'
-					args '-v /etc/localtime:/etc/localtime:ro'
-					reuseNode true
-				}
-			}
 			steps {
 				script {
 					checkout scm

[28/50] logging-log4net git commit: Fix netstandard-1.3 tests project file to reference asset target fallback

Posted by dp...@apache.org.

Fix netstandard-1.3 tests project file to reference asset target fallback


Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/21572611
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/21572611
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/21572611

Branch: refs/heads/feature/RollingFileAppender-NG
Commit: 21572611b96bad67c01580565b0ba015872b255a
Parents: 2930d05
Author: Dominik Psenner <dp...@apache.org>
Authored: Tue May 8 22:29:13 2018 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Tue May 8 22:29:13 2018 +0200

----------------------------------------------------------------------
 netstandard/1.3/log4net.tests/log4net.tests.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/21572611/netstandard/1.3/log4net.tests/log4net.tests.csproj
----------------------------------------------------------------------
diff --git a/netstandard/1.3/log4net.tests/log4net.tests.csproj b/netstandard/1.3/log4net.tests/log4net.tests.csproj
index 89ceb64..f03a012 100755
--- a/netstandard/1.3/log4net.tests/log4net.tests.csproj
+++ b/netstandard/1.3/log4net.tests/log4net.tests.csproj
@@ -24,7 +24,7 @@ limitations under the License.
     <AssemblyName>log4net.tests</AssemblyName>
     <PackageId>log4net.tests</PackageId>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
-    <PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8</PackageTargetFallback>
+    <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8</PackageTargetFallback>
     <RuntimeFrameworkVersion>2.0.7</RuntimeFrameworkVersion>
     <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
     <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>

[50/50] logging-log4net git commit: Merge branch 'develop' into feature/RollingFileAppender-NG

Posted by dp...@apache.org.

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(-)
----------------------------------------------------------------------

[26/50] logging-log4net git commit: Attempt to allow stash of empty sets

Posted by dp...@apache.org.

Attempt to allow stash of empty sets


Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/69b2d9fc
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/69b2d9fc
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/69b2d9fc

Branch: refs/heads/feature/RollingFileAppender-NG
Commit: 69b2d9fc02eac7f7253a7b0403804e94b7f25821
Parents: f5583cf
Author: Dominik Psenner <dp...@apache.org>
Authored: Tue May 8 20:57:49 2018 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Tue May 8 20:57:49 2018 +0200

----------------------------------------------------------------------
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/69b2d9fc/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index 8b434c4..6e8ab50 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -64,8 +64,8 @@ pipeline {
 
 						// test
 						sh "nant -buildfile:tests/nant.build runtests-netstandard-1.3"
-						stash includes: '**/*.trx', name: 'netstandard-1.3-testresults'
-						stash includes: '**/*.log', name: 'netstandard-1.3-testlogs'
+						stash includes: '**/*.trx', name: 'netstandard-1.3-testresults', allowEmpty: true
+						stash includes: '**/*.log', name: 'netstandard-1.3-testlogs', allowEmpty: true
 					}
 				}
 			}

[44/50] logging-log4net git commit: Restore previous jenkinsfile now that we use ubuntu:16.04

Posted by dp...@apache.org.

Restore previous jenkinsfile now that we use ubuntu:16.04


Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/8f28eb21
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/8f28eb21
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/8f28eb21

Branch: refs/heads/feature/RollingFileAppender-NG
Commit: 8f28eb2136d3caf1de715a60fbe6af643219b997
Parents: 9839767
Author: Dominik Psenner <dp...@apache.org>
Authored: Thu May 10 22:32:13 2018 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Thu May 10 22:32:13 2018 +0200

----------------------------------------------------------------------
 Jenkinsfile | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8f28eb21/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index 55318ac..d4bf538 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -155,26 +155,21 @@ pipeline {
 			}
 		}
 		stage('build mono-2.0') {
-			steps {
-				script {
-					checkout scm
-					def builder_target = "mono-2.0"
-					def builder_dir = "buildtools/docker/builder-$builder_target"
-
-					// build docker container
-					def builder = docker.build "builder-$builder_target:latest", "--file $builder_dir/Dockerfile $builder_dir"
-
-					// run docker container
-					builder.inside {
-						sh "rm -rf bin/ tests/"
-						checkout scm
-						sh "nant -t:mono-2.0 -buildfile:log4net.build compile-mono-2.0"
-						stash includes: 'bin/**/*.*', name: 'mono-2.0-assemblies'
-						sh "nant -t:mono-2.0 -buildfile:tests/nant.build runtests-mono-2.0"
-						stash includes: 'tests/bin/**/*.nunit.xml', name: 'mono-2.0-testresults'
-					}
+			agent {
+				dockerfile {
+					dir 'buildtools/docker/builder-mono-2.0'
+					args '-v /etc/localtime:/etc/localtime:ro'
+					reuseNode true
 				}
 			}
+			steps {
+				sh "rm -rf bin/ tests/"
+				checkout scm
+				sh "nant -t:mono-2.0 -buildfile:log4net.build compile-mono-2.0"
+				stash includes: 'bin/**/*.*', name: 'mono-2.0-assemblies'
+				sh "nant -t:mono-2.0 -buildfile:tests/nant.build runtests-mono-2.0"
+				stash includes: 'tests/bin/**/*.nunit.xml', name: 'mono-2.0-testresults'
+			}
 		}
 		stage('build mono-3.5') {
 			agent {

[19/50] logging-log4net git commit: reduce verbosity

Posted by dp...@apache.org.

reduce verbosity


Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/24a9c08d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/24a9c08d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/24a9c08d

Branch: refs/heads/feature/RollingFileAppender-NG
Commit: 24a9c08d219e227f695562a4109aea6efee29af3
Parents: 3a2e0a9
Author: Stefan Bodewig <st...@innoq.com>
Authored: Sat Jan 20 22:11:43 2018 +0100
Committer: Stefan Bodewig <st...@innoq.com>
Committed: Sat Jan 20 22:11:43 2018 +0100

----------------------------------------------------------------------
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/24a9c08d/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index 96a1675..afcde92 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -63,7 +63,7 @@ pipeline {
 						stash includes: 'bin/**/*.*', name: 'netstandard-1.3-assemblies'
 
 						// test
-						sh 'cd netstandard/log4net.tests && dotnet test --verbosity detailed'
+						sh 'cd netstandard/log4net.tests && dotnet test'
 					}
 				}
 			}

[24/50] logging-log4net git commit: Bump netstandard-1.3 builder to be based on the docker dotnet:2.0-sdk

Posted by dp...@apache.org.

Bump netstandard-1.3 builder to be based on the docker dotnet:2.0-sdk


Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/c5c984e2
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/c5c984e2
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/c5c984e2

Branch: refs/heads/feature/RollingFileAppender-NG
Commit: c5c984e2fd4bb63cb82ac48dc89b1bb4a985da97
Parents: 0db7c58
Author: Dominik Psenner <dp...@apache.org>
Authored: Tue May 8 19:04:39 2018 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Tue May 8 19:04:39 2018 +0200

----------------------------------------------------------------------
 buildtools/docker/builder-netstandard-1.3/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/c5c984e2/buildtools/docker/builder-netstandard-1.3/Dockerfile
----------------------------------------------------------------------
diff --git a/buildtools/docker/builder-netstandard-1.3/Dockerfile b/buildtools/docker/builder-netstandard-1.3/Dockerfile
index b0f4892..1b6aa90 100644
--- a/buildtools/docker/builder-netstandard-1.3/Dockerfile
+++ b/buildtools/docker/builder-netstandard-1.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM microsoft/dotnet:1.1-sdk
+FROM microsoft/dotnet:2.0-sdk
 
 # define arguments passed in as environment variables
 ARG JENKINS_UID

[38/50] logging-log4net git commit: Install tzdata first

Posted by dp...@apache.org.

Install tzdata first


Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/547d7a71
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/547d7a71
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/547d7a71

Branch: refs/heads/feature/RollingFileAppender-NG
Commit: 547d7a718d6a361736583c2c4fc3b3800bc61107
Parents: 758d9c6
Author: Dominik Psenner <dp...@apache.org>
Authored: Wed May 9 21:41:04 2018 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Wed May 9 21:41:04 2018 +0200

----------------------------------------------------------------------
 buildtools/docker/builder-mono-2.0/Dockerfile | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/547d7a71/buildtools/docker/builder-mono-2.0/Dockerfile
----------------------------------------------------------------------
diff --git a/buildtools/docker/builder-mono-2.0/Dockerfile b/buildtools/docker/builder-mono-2.0/Dockerfile
index 82ead9a..6f7c6d4 100644
--- a/buildtools/docker/builder-mono-2.0/Dockerfile
+++ b/buildtools/docker/builder-mono-2.0/Dockerfile
@@ -5,6 +5,7 @@ FROM ubuntu:latest
 MAINTAINER "dev@logging.apache.org"
 
 # prepare tz
+RUN apt-get install tzdata
 RUN ln -fs /usr/share/zoneinfo/Universal /etc/localtime
 RUN dpkg-reconfigure -f noninteractive tzdata

[27/50] logging-log4net git commit: Bump netstandard-1.3 tests to runtime 2.0.7 and netcoreapp2.0

Posted by dp...@apache.org.

Bump netstandard-1.3 tests to runtime 2.0.7 and netcoreapp2.0


Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/2930d056
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/2930d056
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/2930d056

Branch: refs/heads/feature/RollingFileAppender-NG
Commit: 2930d056f28eb7a15b68631183e7c63ab00a4886
Parents: 69b2d9f
Author: Dominik Psenner <dp...@apache.org>
Authored: Tue May 8 22:04:39 2018 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Tue May 8 22:07:14 2018 +0200

----------------------------------------------------------------------
 netstandard/1.3/log4net.tests/log4net.tests.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/2930d056/netstandard/1.3/log4net.tests/log4net.tests.csproj
----------------------------------------------------------------------
diff --git a/netstandard/1.3/log4net.tests/log4net.tests.csproj b/netstandard/1.3/log4net.tests/log4net.tests.csproj
index d389e82..89ceb64 100755
--- a/netstandard/1.3/log4net.tests/log4net.tests.csproj
+++ b/netstandard/1.3/log4net.tests/log4net.tests.csproj
@@ -19,13 +19,13 @@ limitations under the License.
 
   <PropertyGroup>
     <VersionPrefix>2.0.9</VersionPrefix>
-    <TargetFramework>netcoreapp1.0</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <DefineConstants>$(DefineConstants);NETSTANDARD1_3</DefineConstants>
     <AssemblyName>log4net.tests</AssemblyName>
     <PackageId>log4net.tests</PackageId>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
     <PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8</PackageTargetFallback>
-    <RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
+    <RuntimeFrameworkVersion>2.0.7</RuntimeFrameworkVersion>
     <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
     <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>

[30/50] logging-log4net git commit: Fix indentation in tests/nant.build

Posted by dp...@apache.org.

Fix indentation in tests/nant.build


Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/31356d6e
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/31356d6e
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/31356d6e

Branch: refs/heads/feature/RollingFileAppender-NG
Commit: 31356d6eecea59a4dddb8dc2a14e35f151cbbf1c
Parents: 3059aff
Author: Dominik Psenner <dp...@apache.org>
Authored: Tue May 8 22:45:02 2018 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Tue May 8 22:45:02 2018 +0200

----------------------------------------------------------------------
 tests/nant.build | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/31356d6e/tests/nant.build
----------------------------------------------------------------------
diff --git a/tests/nant.build b/tests/nant.build
index dabbf5d..2204501 100644
--- a/tests/nant.build
+++ b/tests/nant.build
@@ -25,16 +25,16 @@ limitations under the License.
     <call target="set-build-configuration" />
 
     <target name="install-nunit">
-      <if test="${not file::exists('lib/${current.build.configuration.dir}/nunit.framework.dll')}">
-    <get src="https://github.com/nunit/nunitv2/releases/download/2.6.4/NUnit-2.6.4.zip"
-         dest=".tmp-nunit.zip"/>
-    <unzip zipfile=".tmp-nunit.zip"
-           todir=".tmp-nunit"/>
-    <copy file=".tmp-nunit/NUnit-2.6.4/bin/nunit.framework.dll"
-          todir="lib/${current.build.configuration.dir}"/>
-    <delete file=".tmp-nunit.zip"/>
-    <delete dir=".tmp-nunit"/>
-      </if>
+        <if test="${not file::exists('lib/${current.build.configuration.dir}/nunit.framework.dll')}">
+            <get src="https://github.com/nunit/nunitv2/releases/download/2.6.4/NUnit-2.6.4.zip"
+                 dest=".tmp-nunit.zip"/>
+            <unzip zipfile=".tmp-nunit.zip"
+                   todir=".tmp-nunit"/>
+            <copy file=".tmp-nunit/NUnit-2.6.4/bin/nunit.framework.dll"
+                  todir="lib/${current.build.configuration.dir}"/>
+            <delete file=".tmp-nunit.zip"/>
+            <delete dir=".tmp-nunit"/>
+        </if>
     </target>
 
     <!-- Target for compiling the tests on all frameworks -->

[34/50] logging-log4net git commit: mono-2.0: configure timezone to be utc before attempting to install any tools

Posted by dp...@apache.org.

mono-2.0: configure timezone to be utc before attempting to install any tools


Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/90cfda7b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/90cfda7b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/90cfda7b

Branch: refs/heads/feature/RollingFileAppender-NG
Commit: 90cfda7bc516af96b9194759b851ad0290f61a68
Parents: d82a37f
Author: Dominik Psenner <dp...@apache.org>
Authored: Wed May 9 19:39:11 2018 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Wed May 9 19:39:11 2018 +0200

----------------------------------------------------------------------
 buildtools/docker/builder-mono-2.0/Dockerfile | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/90cfda7b/buildtools/docker/builder-mono-2.0/Dockerfile
----------------------------------------------------------------------
diff --git a/buildtools/docker/builder-mono-2.0/Dockerfile b/buildtools/docker/builder-mono-2.0/Dockerfile
index 016d55b..82ead9a 100644
--- a/buildtools/docker/builder-mono-2.0/Dockerfile
+++ b/buildtools/docker/builder-mono-2.0/Dockerfile
@@ -4,6 +4,10 @@ FROM ubuntu:latest
 # set the maintainer of this docker image
 MAINTAINER "dev@logging.apache.org"
 
+# prepare tz
+RUN ln -fs /usr/share/zoneinfo/Universal /etc/localtime
+RUN dpkg-reconfigure -f noninteractive tzdata
+
 # install dependencies
 RUN apt-get update && apt-get install -y nant git mono-complete mono-reference-assemblies-2.0

[36/50] logging-log4net git commit: Make the entire script always run on H20

Posted by dp...@apache.org.

Make the entire script always run on H20


Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/d8deee97
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/d8deee97
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/d8deee97

Branch: refs/heads/feature/RollingFileAppender-NG
Commit: d8deee9717689f2dd7d7671dd344874f27341214
Parents: 1aa1734
Author: Dominik Psenner <dp...@apache.org>
Authored: Wed May 9 21:00:33 2018 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Wed May 9 21:01:13 2018 +0200

----------------------------------------------------------------------
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/d8deee97/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index 23a4bfb..f0c5ab4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -25,7 +25,7 @@ pipeline {
 		disableConcurrentBuilds()
 	}
 	agent {
-		label 'ubuntu'
+		label 'H20'
 	}
 	stages {
 		// prepare node for builds

[33/50] logging-log4net git commit: netstandard-1.3: bump to nunit 3.10

Posted by dp...@apache.org.

netstandard-1.3: bump to nunit 3.10


Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/d82a37f3
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/d82a37f3
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/d82a37f3

Branch: refs/heads/feature/RollingFileAppender-NG
Commit: d82a37f3cd20406ef72b447ed6cb359bdf04e667
Parents: 382561f
Author: Dominik Psenner <dp...@apache.org>
Authored: Wed May 9 10:50:28 2018 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Wed May 9 10:50:28 2018 +0200

----------------------------------------------------------------------
 netstandard/1.3/log4net.netstandard.sln            | 7 +++++--
 netstandard/1.3/log4net.tests/log4net.tests.csproj | 9 +++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/d82a37f3/netstandard/1.3/log4net.netstandard.sln
----------------------------------------------------------------------
diff --git a/netstandard/1.3/log4net.netstandard.sln b/netstandard/1.3/log4net.netstandard.sln
index f811388..e79c8d6 100644
--- a/netstandard/1.3/log4net.netstandard.sln
+++ b/netstandard/1.3/log4net.netstandard.sln
@@ -21,9 +21,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 #
 VisualStudioVersion = 15.0.26114.2
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "log4net", "log4net\log4net.csproj", "{00764202-B361-4BC8-A1B9-01D87F9D2D51}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "log4net", "log4net\log4net.csproj", "{00764202-B361-4BC8-A1B9-01D87F9D2D51}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "log4net.tests", "log4net.tests\log4net.tests.csproj", "{6A78D53B-C864-4316-AA00-F2EBFE975223}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "log4net.tests", "log4net.tests\log4net.tests.csproj", "{6A78D53B-C864-4316-AA00-F2EBFE975223}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4BB38D1C-1862-432B-881C-925714F7F997}"
 	ProjectSection(SolutionItems) = preProject
@@ -48,4 +48,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {8DFAD82F-72D1-4CE7-8CFB-06E7F7B2B0A9}
+	EndGlobalSection
 EndGlobal

http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/d82a37f3/netstandard/1.3/log4net.tests/log4net.tests.csproj
----------------------------------------------------------------------
diff --git a/netstandard/1.3/log4net.tests/log4net.tests.csproj b/netstandard/1.3/log4net.tests/log4net.tests.csproj
index 31e144d..157c6fa 100755
--- a/netstandard/1.3/log4net.tests/log4net.tests.csproj
+++ b/netstandard/1.3/log4net.tests/log4net.tests.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements. See the NOTICE file distributed with
@@ -47,7 +47,12 @@ limitations under the License.
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.9.0" />
+    <PackageReference Include="NUnit" Version="3.10.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\log4net\log4net.csproj" />
   </ItemGroup>
 
 </Project>

[16/50] logging-log4net git commit: copy-paste gone bad

Posted by dp...@apache.org.

copy-paste gone bad


Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/c7e5895d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/c7e5895d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/c7e5895d

Branch: refs/heads/feature/RollingFileAppender-NG
Commit: c7e5895dbb8657b6ab0d5eb21073643f6ad9dd70
Parents: 57647e3
Author: Stefan Bodewig <st...@innoq.com>
Authored: Sat Jan 20 21:30:09 2018 +0100
Committer: Stefan Bodewig <st...@innoq.com>
Committed: Sat Jan 20 21:30:09 2018 +0100

----------------------------------------------------------------------
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/c7e5895d/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index 8bc0602..96a1675 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -68,7 +68,7 @@ pipeline {
 				}
 			}
 		}
-		stage('build net-3.5') {
+		stage('build net-2.0') {
 			agent { label 'Windows' }
 			environment {
 				NANT_BIN = 'F:\\jenkins\\tools\\nant\\nant-0.92\\bin\\NAnt.exe'

[06/50] logging-log4net git commit: Revert "netstandard-1.3: removed itemgroup condition when referencing the log4net project"

Posted by dp...@apache.org.

Revert "netstandard-1.3: removed itemgroup condition when referencing the log4net project"

This reverts commit 9ed358f8a56e7ab70f92c9c1a2bc758585025745.


Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/af5562e1
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/af5562e1
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/af5562e1

Branch: refs/heads/feature/RollingFileAppender-NG
Commit: af5562e1d073abaa93790335e26551804a9be059
Parents: 6751fce
Author: Dominik Psenner <dp...@apache.org>
Authored: Tue Nov 28 22:02:26 2017 +0100
Committer: Dominik Psenner <dp...@apache.org>
Committed: Tue Nov 28 22:02:26 2017 +0100

----------------------------------------------------------------------
 netstandard/1.3/log4net.tests/log4net.tests.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/af5562e1/netstandard/1.3/log4net.tests/log4net.tests.csproj
----------------------------------------------------------------------
diff --git a/netstandard/1.3/log4net.tests/log4net.tests.csproj b/netstandard/1.3/log4net.tests/log4net.tests.csproj
index 2f20fbb..b644ad9 100755
--- a/netstandard/1.3/log4net.tests/log4net.tests.csproj
+++ b/netstandard/1.3/log4net.tests/log4net.tests.csproj
@@ -19,7 +19,7 @@
     <Compile Include="../../../tests/src/*.cs;../../../tests/src/Appender/AppenderCollectionTest.cs;../../../tests/src/Appender/BufferingAppenderTest.cs;../../../tests/src/Appender/CountingAppender.cs;../../../tests/src/Appender/MemoryAppenderTest.cs;../../../tests/src/Appender/RollingFileAppenderTest.cs;../../../tests/src/Appender/SmtpPickupDirAppenderTest.cs;../../../tests/src/Appender/StringAppender.cs;../../../tests/src/Appender/TraceAppenderTest.cs;../../../tests/src/Context/LogicalThreadContextTest.cs;../../../tests/src/Context/ThreadContextTest.cs;../../../tests/src/Co../../../*.cs;../../../tests/src/DateFormatt../../../*.cs;../../../tests/src/Hierarc../../../*.cs;../../../tests/src/Layo../../../*.cs;../../../tests/src/LoggerReposito../../../*.cs;../../../tests/src/Util/CyclicBufferTest.cs;../../../tests/src/Util/LogLogTest.cs;../../../tests/src/Util/PatternConverterTest.cs;../../../tests/src/Util/RandomStringPatternConverterTest.cs;../../../tests/src/Util/SystemInfoTest.cs;.
 ./../../tests/src/Util/TransformTest.cs" Exclude="bin/**;obj/**;**/*.xproj;packages/**" />
   </ItemGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
     <ProjectReference Include="../log4net/log4net.csproj" />
     <PackageReference Include="NUnit" Version="3.9.0" />
   </ItemGroup>

[40/50] logging-log4net git commit: mono-2.0: change docker to be tagged like netstandard-1.3

Posted by dp...@apache.org.

mono-2.0: change docker to be tagged like netstandard-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/2d1c4d78
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/2d1c4d78
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/2d1c4d78

Branch: refs/heads/feature/RollingFileAppender-NG
Commit: 2d1c4d78ae080283797aecea5b16229909c84e29
Parents: 26afadb
Author: Dominik Psenner <dp...@apache.org>
Authored: Wed May 9 22:11:25 2018 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Wed May 9 22:11:25 2018 +0200

----------------------------------------------------------------------
 Jenkinsfile | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/2d1c4d78/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index ed54f8b..4df17e0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -54,7 +54,7 @@ pipeline {
 					).trim()
 
 					// build docker container
-					def builder = docker.build 'builder-netstandard:latest', "--file $builder_dir/Dockerfile --build-arg JENKINS_UID=$JENKINS_UID --build-arg JENKINS_GID=$JENKINS_GID $builder_dir"
+					def builder = docker.build 'builder-netstandard-1.3:latest', "--file $builder_dir/Dockerfile --build-arg JENKINS_UID=$JENKINS_UID --build-arg JENKINS_GID=$JENKINS_GID $builder_dir"
 
 					// run docker container
 					builder.inside {
@@ -163,12 +163,24 @@ pipeline {
 				}
 			}
 			steps {
-				sh "rm -rf bin/ tests/"
-				checkout scm
-				sh "nant -t:mono-2.0 -buildfile:log4net.build compile-mono-2.0"
-				stash includes: 'bin/**/*.*', name: 'mono-2.0-assemblies'
-				sh "nant -t:mono-2.0 -buildfile:tests/nant.build runtests-mono-2.0"
-				stash includes: 'tests/bin/**/*.nunit.xml', name: 'mono-2.0-testresults'
+				script {
+					checkout scm
+					def builder_target = "mono-2.0"
+					def builder_dir = "buildtools/docker/builder-$builder_target"
+
+					// build docker container
+					def builder = docker.build 'builder-$builder_target:latest', "--file $builder_dir/Dockerfile $builder_dir"
+
+					// run docker container
+					builder.inside {
+						sh "rm -rf bin/ tests/"
+						checkout scm
+						sh "nant -t:mono-2.0 -buildfile:log4net.build compile-mono-2.0"
+						stash includes: 'bin/**/*.*', name: 'mono-2.0-assemblies'
+						sh "nant -t:mono-2.0 -buildfile:tests/nant.build runtests-mono-2.0"
+						stash includes: 'tests/bin/**/*.nunit.xml', name: 'mono-2.0-testresults'
+					}
+				}
 			}
 		}
 		stage('build mono-3.5') {

[35/50] logging-log4net git commit: Make the windows jobs run on either one of the windows-2012 nodes

Posted by dp...@apache.org.

Make the windows jobs run on either one of the windows-2012 nodes

The windows-2016 node is missing the required nant executable.


Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/1aa17343
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/1aa17343
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/1aa17343

Branch: refs/heads/feature/RollingFileAppender-NG
Commit: 1aa173438e0a77ae0a4209db2f5007b5b568f58e
Parents: 90cfda7
Author: Dominik Psenner <dp...@apache.org>
Authored: Wed May 9 20:56:13 2018 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Wed May 9 20:56:13 2018 +0200

----------------------------------------------------------------------
 Jenkinsfile | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/1aa17343/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index 6e8ab50..23a4bfb 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -71,7 +71,7 @@ pipeline {
 			}
 		}
 		stage('build net-2.0') {
-			agent { label 'Windows' }
+			agent { label 'windows-2012-1||windows-2012-2||windows-2012-3' }
 			environment {
 				NANT_BIN = 'F:\\jenkins\\tools\\nant\\nant-0.92\\bin\\NAnt.exe'
 			}
@@ -85,7 +85,7 @@ pipeline {
 			}
 		}
 		stage('build net-3.5') {
-			agent { label 'Windows' }
+			agent { label 'windows-2012-1||windows-2012-2||windows-2012-3' }
 			environment {
 				NANT_BIN = 'F:\\jenkins\\tools\\nant\\nant-0.92\\bin\\NAnt.exe'
 			}
@@ -99,7 +99,7 @@ pipeline {
 			}
 		}
 		stage('build net-3.5-cp') {
-			agent { label 'Windows' }
+			agent { label 'windows-2012-1||windows-2012-2||windows-2012-3' }
 			environment {
 				NANT_BIN = 'F:\\jenkins\\tools\\nant\\nant-0.92\\bin\\NAnt.exe'
 			}
@@ -113,7 +113,7 @@ pipeline {
 			}
 		}
 		stage('build net-4.0') {
-			agent { label 'Windows' }
+			agent { label 'windows-2012-1||windows-2012-2||windows-2012-3' }
 			environment {
 				NANT_BIN = 'F:\\jenkins\\tools\\nant\\nant-0.92\\bin\\NAnt.exe'
 			}
@@ -127,7 +127,7 @@ pipeline {
 			}
 		}
 		stage('build net-4.0-cp') {
-			agent { label 'Windows' }
+			agent { label 'windows-2012-1||windows-2012-2||windows-2012-3' }
 			environment {
 				NANT_BIN = 'F:\\jenkins\\tools\\nant\\nant-0.92\\bin\\NAnt.exe'
 			}
@@ -141,7 +141,7 @@ pipeline {
 			}
 		}
 		stage('build net-4.5') {
-			agent { label 'Windows' }
+			agent { label 'windows-2012-1||windows-2012-2||windows-2012-3' }
 			environment {
 				NANT_BIN = 'F:\\jenkins\\tools\\nant\\nant-0.92\\bin\\NAnt.exe'
 			}
@@ -206,7 +206,7 @@ pipeline {
 			}
 		}
 		stage('build site') {
-			agent { label 'Windows' }
+			agent { label 'windows-2012-1||windows-2012-2||windows-2012-3' }
 			tools {
 				maven 'Maven 3.3.9 (Windows)'
 				jdk 'JDK 1.8 (latest)'

[10/50] logging-log4net git commit: make debug build of .NET 2.0 work again

Posted by dp...@apache.org.

make debug build of .NET 2.0 work again


Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/c9b9382b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/c9b9382b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/c9b9382b

Branch: refs/heads/feature/RollingFileAppender-NG
Commit: c9b9382bdae5c745d4b26fe32425fbbf0b0dfd7c
Parents: 978db27
Author: Stefan Bodewig <st...@innoq.com>
Authored: Mon Jan 15 09:36:23 2018 +0100
Committer: Stefan Bodewig <st...@innoq.com>
Committed: Mon Jan 15 09:36:23 2018 +0100

----------------------------------------------------------------------
 log4net.build | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/c9b9382b/log4net.build
----------------------------------------------------------------------
diff --git a/log4net.build b/log4net.build
index f08133f..bd79c15 100644
--- a/log4net.build
+++ b/log4net.build
@@ -544,12 +544,12 @@ limitations under the License.
       <echo message="Skipping build; required framework is not available: .NET Framework 2.0"/>
     </if>
     <if test="${framework::exists('net-2.0')}">
+      <call target="set-net-2.0-runtime-configuration"/>
+      <call target="check-log4net-basedir"/>
+      <call target="clean-current-bin-dir"/>
       <!-- initialize the temp.build.skip property to false -->
       <property name="temp.build.skip" value="false"/>
       <if test="${current.build.config.release}">
-        <call target="set-net-2.0-runtime-configuration"/>
-        <call target="check-log4net-basedir"/>
-        <call target="clean-current-bin-dir"/>
         <!-- check if the old log4net key file is available -->
         <if test="${not file::exists(log4net.basedir + '/old-log4net.snk')}">
           <if test="${property::exists('project.build.package') and project.build.package}">

[31/50] logging-log4net git commit: Attempt to download latest nunit 2.6.4 binaries from nuget

Posted by dp...@apache.org.

Attempt to download latest nunit 2.6.4 binaries from nuget


Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/7f689393
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/7f689393
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/7f689393

Branch: refs/heads/feature/RollingFileAppender-NG
Commit: 7f689393e91551236647f0cf8897b0a66474b11d
Parents: 31356d6
Author: Dominik Psenner <dp...@apache.org>
Authored: Tue May 8 22:46:53 2018 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Tue May 8 22:46:53 2018 +0200

----------------------------------------------------------------------
 tests/nant.build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/7f689393/tests/nant.build
----------------------------------------------------------------------
diff --git a/tests/nant.build b/tests/nant.build
index 2204501..f25dc1b 100644
--- a/tests/nant.build
+++ b/tests/nant.build
@@ -26,11 +26,11 @@ limitations under the License.
 
     <target name="install-nunit">
         <if test="${not file::exists('lib/${current.build.configuration.dir}/nunit.framework.dll')}">
-            <get src="https://github.com/nunit/nunitv2/releases/download/2.6.4/NUnit-2.6.4.zip"
+			<get src="https://www.nuget.org/api/v2/package/NUnit/2.6.5"
                  dest=".tmp-nunit.zip"/>
             <unzip zipfile=".tmp-nunit.zip"
                    todir=".tmp-nunit"/>
-            <copy file=".tmp-nunit/NUnit-2.6.4/bin/nunit.framework.dll"
+            <copy file=".tmp-nunit/lib/nunit.framework.dll"
                   todir="lib/${current.build.configuration.dir}"/>
             <delete file=".tmp-nunit.zip"/>
             <delete dir=".tmp-nunit"/>

[29/50] logging-log4net git commit: Fix typo in the netstandard-1.3 tests csproj file

Posted by dp...@apache.org.

Fix typo in the netstandard-1.3 tests csproj file


Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/3059aff9
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/3059aff9
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/3059aff9

Branch: refs/heads/feature/RollingFileAppender-NG
Commit: 3059aff9088b16a4412bfdbbe5b6f05d6c050752
Parents: 2157261
Author: Dominik Psenner <dp...@apache.org>
Authored: Tue May 8 22:34:14 2018 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Tue May 8 22:34:14 2018 +0200

----------------------------------------------------------------------
 netstandard/1.3/log4net.tests/log4net.tests.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/3059aff9/netstandard/1.3/log4net.tests/log4net.tests.csproj
----------------------------------------------------------------------
diff --git a/netstandard/1.3/log4net.tests/log4net.tests.csproj b/netstandard/1.3/log4net.tests/log4net.tests.csproj
index f03a012..31e144d 100755
--- a/netstandard/1.3/log4net.tests/log4net.tests.csproj
+++ b/netstandard/1.3/log4net.tests/log4net.tests.csproj
@@ -24,7 +24,7 @@ limitations under the License.
     <AssemblyName>log4net.tests</AssemblyName>
     <PackageId>log4net.tests</PackageId>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
-    <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8</PackageTargetFallback>
+    <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8</AssetTargetFallback>
     <RuntimeFrameworkVersion>2.0.7</RuntimeFrameworkVersion>
     <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
     <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>

[02/50] logging-log4net git commit: netstandard-1.3: removed itemgroup condition when referencing the log4net project

Posted by dp...@apache.org.

netstandard-1.3: removed itemgroup condition when referencing the log4net project


Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/9ed358f8
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/9ed358f8
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/9ed358f8

Branch: refs/heads/feature/RollingFileAppender-NG
Commit: 9ed358f8a56e7ab70f92c9c1a2bc758585025745
Parents: 0597485
Author: Dominik Psenner <dp...@apache.org>
Authored: Tue Nov 28 20:57:29 2017 +0100
Committer: Dominik Psenner <dp...@apache.org>
Committed: Tue Nov 28 20:57:29 2017 +0100

----------------------------------------------------------------------
 netstandard/1.3/log4net.tests/log4net.tests.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/9ed358f8/netstandard/1.3/log4net.tests/log4net.tests.csproj
----------------------------------------------------------------------
diff --git a/netstandard/1.3/log4net.tests/log4net.tests.csproj b/netstandard/1.3/log4net.tests/log4net.tests.csproj
index b644ad9..2f20fbb 100755
--- a/netstandard/1.3/log4net.tests/log4net.tests.csproj
+++ b/netstandard/1.3/log4net.tests/log4net.tests.csproj
@@ -19,7 +19,7 @@
     <Compile Include="../../../tests/src/*.cs;../../../tests/src/Appender/AppenderCollectionTest.cs;../../../tests/src/Appender/BufferingAppenderTest.cs;../../../tests/src/Appender/CountingAppender.cs;../../../tests/src/Appender/MemoryAppenderTest.cs;../../../tests/src/Appender/RollingFileAppenderTest.cs;../../../tests/src/Appender/SmtpPickupDirAppenderTest.cs;../../../tests/src/Appender/StringAppender.cs;../../../tests/src/Appender/TraceAppenderTest.cs;../../../tests/src/Context/LogicalThreadContextTest.cs;../../../tests/src/Context/ThreadContextTest.cs;../../../tests/src/Co../../../*.cs;../../../tests/src/DateFormatt../../../*.cs;../../../tests/src/Hierarc../../../*.cs;../../../tests/src/Layo../../../*.cs;../../../tests/src/LoggerReposito../../../*.cs;../../../tests/src/Util/CyclicBufferTest.cs;../../../tests/src/Util/LogLogTest.cs;../../../tests/src/Util/PatternConverterTest.cs;../../../tests/src/Util/RandomStringPatternConverterTest.cs;../../../tests/src/Util/SystemInfoTest.cs;.
 ./../../tests/src/Util/TransformTest.cs" Exclude="bin/**;obj/**;**/*.xproj;packages/**" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
+  <ItemGroup>
     <ProjectReference Include="../log4net/log4net.csproj" />
     <PackageReference Include="NUnit" Version="3.9.0" />
   </ItemGroup>

[05/50] logging-log4net git commit: netstandard-1.3: another attempt to fix the source file imports in the csproj file

Posted by dp...@apache.org.

netstandard-1.3: another attempt to fix the source file imports in the csproj file


Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/6751fce3
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/6751fce3
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/6751fce3

Branch: refs/heads/feature/RollingFileAppender-NG
Commit: 6751fce3afeabc9b614a1d1a3a3277ba060e5d99
Parents: 8595af6
Author: Dominik Psenner <dp...@apache.org>
Authored: Tue Nov 28 21:55:54 2017 +0100
Committer: Dominik Psenner <dp...@apache.org>
Committed: Tue Nov 28 21:55:54 2017 +0100

----------------------------------------------------------------------
 netstandard/1.3/log4net/log4net.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/6751fce3/netstandard/1.3/log4net/log4net.csproj
----------------------------------------------------------------------
diff --git a/netstandard/1.3/log4net/log4net.csproj b/netstandard/1.3/log4net/log4net.csproj
index a90bafa..c484481 100755
--- a/netstandard/1.3/log4net/log4net.csproj
+++ b/netstandard/1.3/log4net/log4net.csproj
@@ -26,8 +26,8 @@
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
-	  <Compile Remove="../../../src/Appender/AdoNetAppender.cs;../../../src/Appender/AspNetTraceAppender.cs;../../../src/Appender/ColoredConsoleAppender.cs;../../../src/Appender/EventLogAppender.cs;../../../src/Appender/NetSendAppender.cs;../../../src/Appender/RemotingAppender.cs;../../../src/Appender/SmtpAppender.cs;../../../src/Config/DOMConfigurator.cs;../../../src/Config/DOMConfiguratorAttribute.cs;../../../src/Config/Log4NetConfigurationSectionHandler.cs;../../../src/Layout/Pattern/AspNetCachePatternConverter.cs;../../../src/Layout/Pattern/AspNetContextPatternConverter.cs;../../../src/Layout/Pattern/AspNetPatternConverter.cs;../../../src/Layout/Pattern/AspNetRequestPatternConverter.cs;../../../src/Layout/Pattern/AspNetSessionPatternConverter.cs;../../../src/Layout/Pattern/StackTraceDetailPatternConverter.cs;../../../src/Layout/Pattern/StackTracePatternConverter.cs;../../../src/Plugin/RemoteLoggingServerPlugin.cs;../../../src/Util/PatternStringConverters/AppSettingPatternConverter.
 cs;../../../src/Util/PatternStringConverters/EnvironmentFolderPathPatternConverter.cs;../../../src/Util/NativeError.cs;../../../src/Util/WindowsSecurityContext.cs" />
-    <Compile Include="../../../*.cs" Exclude="../../../src/Appender/AdoNetAppender.cs;../../../src/Appender/AspNetTraceAppender.cs;../../../src/Appender/ColoredConsoleAppender.cs;../../../src/Appender/EventLogAppender.cs;../../../src/Appender/NetSendAppender.cs;../../../src/Appender/RemotingAppender.cs;../../../src/Appender/SmtpAppender.cs;../../../src/Config/DOMConfigurator.cs;../../../src/Config/DOMConfiguratorAttribute.cs;../../../src/Config/Log4NetConfigurationSectionHandler.cs;../../../src/Layout/Pattern/AspNetCachePatternConverter.cs;../../../src/Layout/Pattern/AspNetContextPatternConverter.cs;../../../src/Layout/Pattern/AspNetPatternConverter.cs;../../../src/Layout/Pattern/AspNetRequestPatternConverter.cs;../../../src/Layout/Pattern/AspNetSessionPatternConverter.cs;../../../src/Layout/Pattern/StackTraceDetailPatternConverter.cs;../../../src/Layout/Pattern/StackTracePatternConverter.cs;../../../src/Plugin/RemoteLoggingServerPlugin.cs;../../../src/Util/PatternStringConverters/A
 ppSettingPatternConverter.cs;../../../src/Util/PatternStringConverters/EnvironmentFolderPathPatternConverter.cs;../../../src/Util/NativeError.cs;../../../src/Util/WindowsSecurityContext.cs;bin/**;obj/**;**/*.xproj;packages/**" />
+    <Compile Remove="..\..\..\src\Appender\AdoNetAppender.cs;..\..\..\src\Appender\AspNetTraceAppender.cs;..\..\..\src\Appender\ColoredConsoleAppender.cs;..\..\..\src\Appender\EventLogAppender.cs;..\..\..\src\Appender\NetSendAppender.cs;..\..\..\src\Appender\RemotingAppender.cs;..\..\..\src\Appender\SmtpAppender.cs;..\..\..\src\Config\DOMConfigurator.cs;..\..\..\src\Config\DOMConfiguratorAttribute.cs;..\..\..\src\Config\Log4NetConfigurationSectionHandler.cs;..\..\..\src\Layout\Pattern\AspNetCachePatternConverter.cs;..\..\..\src\Layout\Pattern\AspNetContextPatternConverter.cs;..\..\..\src\Layout\Pattern\AspNetPatternConverter.cs;..\..\..\src\Layout\Pattern\AspNetRequestPatternConverter.cs;..\..\..\src\Layout\Pattern\AspNetSessionPatternConverter.cs;..\..\..\src\Layout\Pattern\StackTraceDetailPatternConverter.cs;..\..\..\src\Layout\Pattern\StackTracePatternConverter.cs;..\..\..\src\Plugin\RemoteLoggingServerPlugin.cs;..\..\..\src\Util\PatternStringConverters\AppSettingPatternConverter
 .cs;..\..\..\src\Util\PatternStringConverters\EnvironmentFolderPathPatternConverter.cs;..\..\..\src\Util\NativeError.cs;..\..\..\src\Util\WindowsSecurityContext.cs" />
+   <Compile Include="..\..\..\src\**\*.cs" Exclude="..\..\..\src\Appender\AdoNetAppender.cs;..\..\..\src\Appender\AspNetTraceAppender.cs;..\..\..\src\Appender\ColoredConsoleAppender.cs;..\..\..\src\Appender\EventLogAppender.cs;..\..\..\src\Appender\NetSendAppender.cs;..\..\..\src\Appender\RemotingAppender.cs;..\..\..\src\Appender\SmtpAppender.cs;..\..\..\src\Config\DOMConfigurator.cs;..\..\..\src\Config\DOMConfiguratorAttribute.cs;..\..\..\src\Config\Log4NetConfigurationSectionHandler.cs;..\..\..\src\Layout\Pattern\AspNetCachePatternConverter.cs;..\..\..\src\Layout\Pattern\AspNetContextPatternConverter.cs;..\..\..\src\Layout\Pattern\AspNetPatternConverter.cs;..\..\..\src\Layout\Pattern\AspNetRequestPatternConverter.cs;..\..\..\src\Layout\Pattern\AspNetSessionPatternConverter.cs;..\..\..\src\Layout\Pattern\StackTraceDetailPatternConverter.cs;..\..\..\src\Layout\Pattern\StackTracePatternConverter.cs;..\..\..\src\Plugin\RemoteLoggingServerPlugin.cs;..\..\..\src\Util\PatternStringConver
 ters\AppSettingPatternConverter.cs;..\..\..\src\Util\PatternStringConverters\EnvironmentFolderPathPatternConverter.cs;..\..\..\src\Util\NativeError.cs;..\..\..\src\Util\WindowsSecurityContext.cs;bin\**;obj\**;**\*.xproj;packages\**" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">

[11/50] logging-log4net git commit: make dotnet test work on .NET Core SDK 1.1.7 on Windows

Posted by dp...@apache.org.

make dotnet test work on .NET Core SDK 1.1.7 on Windows


Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/35c8ac87
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/35c8ac87
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/35c8ac87

Branch: refs/heads/feature/RollingFileAppender-NG
Commit: 35c8ac87ae1255838afa453a423d1bfd5decb812
Parents: c9b9382
Author: Stefan Bodewig <st...@innoq.com>
Authored: Mon Jan 15 10:18:06 2018 +0100
Committer: Stefan Bodewig <st...@innoq.com>
Committed: Mon Jan 15 10:18:06 2018 +0100

----------------------------------------------------------------------
 netstandard/log4net.tests/log4net.tests.csproj | 7 ++++---
 netstandard/log4net/log4net.csproj             | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/35c8ac87/netstandard/log4net.tests/log4net.tests.csproj
----------------------------------------------------------------------
diff --git a/netstandard/log4net.tests/log4net.tests.csproj b/netstandard/log4net.tests/log4net.tests.csproj
index 69d5fcb..8a185ce 100755
--- a/netstandard/log4net.tests/log4net.tests.csproj
+++ b/netstandard/log4net.tests/log4net.tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <VersionPrefix>2.0.9</VersionPrefix>
@@ -21,8 +21,9 @@
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
     <ProjectReference Include="../log4net/log4net.csproj" />
-    <PackageReference Include="dotnet-test-nunit" Version="3.4.0-beta-2" />
-    <PackageReference Include="NUnit" Version="3.4.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.9.0" />
+    <PackageReference Include="NUnit" Version="3.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.*" />
   </ItemGroup>
 
   <ItemGroup>

http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/35c8ac87/netstandard/log4net/log4net.csproj
----------------------------------------------------------------------
diff --git a/netstandard/log4net/log4net.csproj b/netstandard/log4net/log4net.csproj
index 712f8fc..8c69a9a 100755
--- a/netstandard/log4net/log4net.csproj
+++ b/netstandard/log4net/log4net.csproj
@@ -49,7 +49,7 @@
     <PackageReference Include="System.Reflection.TypeExtensions" Version="4.1.0" />
     <PackageReference Include="System.Runtime.Extensions" Version="4.1.0" />
     <PackageReference Include="System.Runtime.InteropServices" Version="4.1.0" />
-    <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.0.0" />
+    <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
     <PackageReference Include="System.Runtime.Serialization.Formatters" Version="4.3.0" />
     <PackageReference Include="System.Text.RegularExpressions" Version="4.1.0" />
     <PackageReference Include="System.Threading" Version="4.0.11" />

[08/50] logging-log4net git commit: Merge branch 'develop' into feature/cd-pipeline

Posted by dp...@apache.org.

Merge branch 'develop' into feature/cd-pipeline


Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/c4bcd6ee
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/c4bcd6ee
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/c4bcd6ee

Branch: refs/heads/feature/RollingFileAppender-NG
Commit: c4bcd6ee74ae2eaddb3239931b14505f05ada388
Parents: feef693 68aaff9
Author: Dominik Psenner <dp...@apache.org>
Authored: Wed Jan 10 23:24:22 2018 +0100
Committer: Dominik Psenner <dp...@apache.org>
Committed: Wed Jan 10 23:24:22 2018 +0100

----------------------------------------------------------------------
 src/Appender/AdoNetAppender.cs           | 16 ++++++---
 src/Config/XmlConfigurator.cs            |  4 +--
 src/Repository/Hierarchy/Hierarchy.cs    | 42 +++++++++++-----------
 src/Util/ReadOnlyPropertiesDictionary.cs |  7 +++-
 tests/src/Hierarchy/Hierarchy.cs         | 50 +++++++++++++++++++++++++--
 tests/src/packages.config                |  5 +--
 6 files changed, 91 insertions(+), 33 deletions(-)
----------------------------------------------------------------------

[42/50] logging-log4net git commit: Replace single quote with double quot to make variables work

Posted by dp...@apache.org.

Replace single quote with double quot to make variables work


Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/dac03426
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/dac03426
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/dac03426

Branch: refs/heads/feature/RollingFileAppender-NG
Commit: dac034262b79122475fa52b48cf76ad6c9e8bfc2
Parents: dcaca5a
Author: Dominik Psenner <dp...@apache.org>
Authored: Thu May 10 11:45:55 2018 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Thu May 10 11:45:55 2018 +0200

----------------------------------------------------------------------
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/dac03426/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index 29f4a51..55318ac 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -162,7 +162,7 @@ pipeline {
 					def builder_dir = "buildtools/docker/builder-$builder_target"
 
 					// build docker container
-					def builder = docker.build 'builder-$builder_target:latest', "--file $builder_dir/Dockerfile $builder_dir"
+					def builder = docker.build "builder-$builder_target:latest", "--file $builder_dir/Dockerfile $builder_dir"
 
 					// run docker container
 					builder.inside {

[12/50] logging-log4net git commit: add license headers

Posted by dp...@apache.org.

add license headers


Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/1d3afc1b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/1d3afc1b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/1d3afc1b

Branch: refs/heads/feature/RollingFileAppender-NG
Commit: 1d3afc1bac4d1808cd1a69e25193893bc0ed11d0
Parents: 35c8ac8
Author: Stefan Bodewig <st...@innoq.com>
Authored: Mon Jan 15 10:19:34 2018 +0100
Committer: Stefan Bodewig <st...@innoq.com>
Committed: Mon Jan 15 10:19:34 2018 +0100

----------------------------------------------------------------------
 netstandard/log4net.netstandard.sln            | 18 ++++++++++++++++++
 netstandard/log4net.tests/log4net.tests.csproj | 17 +++++++++++++++++
 netstandard/log4net/log4net.csproj             | 17 +++++++++++++++++
 3 files changed, 52 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/1d3afc1b/netstandard/log4net.netstandard.sln
----------------------------------------------------------------------
diff --git a/netstandard/log4net.netstandard.sln b/netstandard/log4net.netstandard.sln
index c578a2e..f811388 100644
--- a/netstandard/log4net.netstandard.sln
+++ b/netstandard/log4net.netstandard.sln
@@ -1,6 +1,24 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
+#
+# 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.  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 obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
 VisualStudioVersion = 15.0.26114.2
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "log4net", "log4net\log4net.csproj", "{00764202-B361-4BC8-A1B9-01D87F9D2D51}"

http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/1d3afc1b/netstandard/log4net.tests/log4net.tests.csproj
----------------------------------------------------------------------
diff --git a/netstandard/log4net.tests/log4net.tests.csproj b/netstandard/log4net.tests/log4net.tests.csproj
index 8a185ce..fd57f3e 100755
--- a/netstandard/log4net.tests/log4net.tests.csproj
+++ b/netstandard/log4net.tests/log4net.tests.csproj
@@ -1,3 +1,20 @@
+<?xml version="1.0"?>
+<!--
+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.
+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 obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>

http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/1d3afc1b/netstandard/log4net/log4net.csproj
----------------------------------------------------------------------
diff --git a/netstandard/log4net/log4net.csproj b/netstandard/log4net/log4net.csproj
index 8c69a9a..f4817e7 100755
--- a/netstandard/log4net/log4net.csproj
+++ b/netstandard/log4net/log4net.csproj
@@ -1,3 +1,20 @@
+<?xml version="1.0"?>
+<!--
+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.
+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 obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>

[15/50] logging-log4net git commit: add .NET 2.0 build to Jenkins build

Posted by dp...@apache.org.

add .NET 2.0 build to Jenkins build


Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/57647e30
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/57647e30
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/57647e30

Branch: refs/heads/feature/RollingFileAppender-NG
Commit: 57647e30042c366dc63a38adfc3e1dd612ed9e41
Parents: 1d3afc1
Author: Stefan Bodewig <st...@innoq.com>
Authored: Sat Jan 20 21:25:58 2018 +0100
Committer: Stefan Bodewig <st...@innoq.com>
Committed: Sat Jan 20 21:25:58 2018 +0100

----------------------------------------------------------------------
 Jenkinsfile | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/57647e30/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index a13b52b..8bc0602 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -76,6 +76,20 @@ pipeline {
 			steps {
 				deleteDir()
 				checkout scm
+				bat "${NANT_BIN} -t:net-2.0 -buildfile:log4net.build compile-net-2.0"
+				stash includes: 'bin/**/*.*', name: 'net-2.0-assemblies'
+				bat "${NANT_BIN} -t:net-2.0 -buildfile:tests/nant.build runtests-net-2.0"
+				stash includes: 'tests/bin/**/*.nunit.xml', name: 'net-2.0-testresults'
+			}
+		}
+		stage('build net-3.5') {
+			agent { label 'Windows' }
+			environment {
+				NANT_BIN = 'F:\\jenkins\\tools\\nant\\nant-0.92\\bin\\NAnt.exe'
+			}
+			steps {
+				deleteDir()
+				checkout scm
 				bat "${NANT_BIN} -t:net-3.5 -buildfile:log4net.build compile-net-3.5"
 				stash includes: 'bin/**/*.*', name: 'net-3.5-assemblies'
 				bat "${NANT_BIN} -t:net-3.5 -buildfile:tests/nant.build runtests-net-3.5"
@@ -289,4 +303,3 @@ pipeline {
 		}
 	}
 }
-

[13/50] logging-log4net git commit: Add diagnostics to the runtests-netstandard-1.3 target to allow troubleshooting why the test run fails

Posted by dp...@apache.org.

Add diagnostics to the runtests-netstandard-1.3 target to allow troubleshooting why the test run fails


Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/9f7118c5
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/9f7118c5
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/9f7118c5

Branch: refs/heads/feature/RollingFileAppender-NG
Commit: 9f7118c5962cd2ab6304a789e2567e7224a216d5
Parents: c4bcd6e
Author: Dominik Psenner <dp...@apache.org>
Authored: Thu Jan 18 19:33:50 2018 +0100
Committer: Dominik Psenner <dp...@apache.org>
Committed: Thu Jan 18 19:33:50 2018 +0100

----------------------------------------------------------------------
 Jenkinsfile      | 2 ++
 tests/nant.build | 8 +++++---
 2 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/9f7118c5/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index ffea54a..7ebb98a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -65,6 +65,7 @@ pipeline {
 						// test
 						sh "nant -buildfile:tests/nant.build runtests-netstandard-1.3"
 						stash includes: '**/*.trx', name: 'netstandard-1.3-testresults'
+						stash includes: '**/*.log', name: 'netstandard-1.3-testlogs'
 					}
 				}
 			}
@@ -233,6 +234,7 @@ pipeline {
 					unstash 'mono-3.5-testresults'
 					unstash 'mono-4.0-testresults'
 					unstash 'netstandard-1.3-testresults'
+					unstash 'netstandard-1.3-testlogs'
 
 					// unstash site
 					unstash 'site'

http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/9f7118c5/tests/nant.build
----------------------------------------------------------------------
diff --git a/tests/nant.build b/tests/nant.build
index 4c6536f..dabbf5d 100644
--- a/tests/nant.build
+++ b/tests/nant.build
@@ -866,10 +866,12 @@ limitations under the License.
     </target>
 
     <target name="runtests-netstandard-1.3" description="Runs log4net tests on .NET Standard 1.3">
-		<exec program="dotnet" workingdir="${log4net.basedir}/netstandard/1.3" failonerror="false">
+        <exec program="dotnet" workingdir="${log4net.basedir}/netstandard/1.3" failonerror="false">
             <arg value="test"/>
-			<arg value="--logger:trx"/>
-			<arg value="log4net.tests/log4net.tests.csproj" />
+            <arg value="--logger:trx"/>
+            <arg value="-d"/>
+            <arg value="test.diagnostics.log"/>
+            <arg value="log4net.tests/log4net.tests.csproj" />
         </exec>
     </target>

[32/50] logging-log4net git commit: Use nunit 2.6.4 because 2.6.5 obsoletes attributes and this causes build warnings to show up as errors

Posted by dp...@apache.org.

Use nunit 2.6.4 because 2.6.5 obsoletes attributes and this causes build warnings to show up as errors


Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/382561fa
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/382561fa
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/382561fa

Branch: refs/heads/feature/RollingFileAppender-NG
Commit: 382561fac26a9bf77bb99cf7bc72e2a82a5c0e6e
Parents: 7f68939
Author: Dominik Psenner <dp...@apache.org>
Authored: Wed May 9 10:18:51 2018 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Wed May 9 10:20:57 2018 +0200

----------------------------------------------------------------------
 tests/nant.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/382561fa/tests/nant.build
----------------------------------------------------------------------
diff --git a/tests/nant.build b/tests/nant.build
index f25dc1b..914e7b2 100644
--- a/tests/nant.build
+++ b/tests/nant.build
@@ -26,7 +26,7 @@ limitations under the License.
 
     <target name="install-nunit">
         <if test="${not file::exists('lib/${current.build.configuration.dir}/nunit.framework.dll')}">
-			<get src="https://www.nuget.org/api/v2/package/NUnit/2.6.5"
+			<get src="https://www.nuget.org/api/v2/package/NUnit/2.6.4"
                  dest=".tmp-nunit.zip"/>
             <unzip zipfile=".tmp-nunit.zip"
                    todir=".tmp-nunit"/>

[49/50] logging-log4net git commit: netstandard-1.3: add basedir to path and replace tabs with spaces

Posted by dp...@apache.org.

netstandard-1.3: add basedir to path and replace tabs with spaces


Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/48f69016
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/48f69016
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/48f69016

Branch: refs/heads/feature/RollingFileAppender-NG
Commit: 48f6901632f00b99fa38b344a939189159d1d101
Parents: b402cc8
Author: Dominik Psenner <dp...@apache.org>
Authored: Sun May 20 13:45:04 2018 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Sun May 20 13:45:04 2018 +0200

----------------------------------------------------------------------
 tests/nant.build | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/48f69016/tests/nant.build
----------------------------------------------------------------------
diff --git a/tests/nant.build b/tests/nant.build
index 346ebca..9530685 100644
--- a/tests/nant.build
+++ b/tests/nant.build
@@ -26,7 +26,7 @@ limitations under the License.
 
     <target name="install-nunit">
         <if test="${not file::exists('lib/${current.build.configuration.dir}/nunit.framework.dll')}">
-			<get src="https://www.nuget.org/api/v2/package/NUnit/2.6.4"
+            <get src="https://www.nuget.org/api/v2/package/NUnit/2.6.4"
                  dest=".tmp-nunit.zip"/>
             <unzip zipfile=".tmp-nunit.zip"
                    todir=".tmp-nunit"/>
@@ -872,15 +872,15 @@ limitations under the License.
             <arg value="-d"/>
             <arg value="test.diagnostics.log"/>
             <arg value="log4net.tests/log4net.tests.csproj" />
-		</exec>
-		<!-- move netstandard/1.3 to tests/bin/netstandard/1.3 -->
-		<move todir="tests/bin/netstandard/1.3/"
-			  failonerror="false">
-			<fileset basedir="netstandard/1.3">
-				<include name="**/*.log" />
-				<include name="**/*.trx" />
-			</fileset>
-		</move>
+        </exec>
+        <!-- move netstandard/1.3 to tests/bin/netstandard/1.3 -->
+        <move todir="${log4net.basedir}/tests/bin/netstandard/1.3/"
+              failonerror="false">
+              <fileset basedir="${log4net.basedir}/netstandard/1.3">
+                <include name="**/*.log" />
+                <include name="**/*.trx" />
+            </fileset>
+        </move>
     </target>
 
 </project>

[47/50] logging-log4net git commit: Use ubuntu:16.04 for mono-3.5 and mono-4.0 too

Posted by dp...@apache.org.

Use ubuntu:16.04 for mono-3.5 and mono-4.0 too


Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/cd9866d6
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/cd9866d6
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/cd9866d6

Branch: refs/heads/feature/RollingFileAppender-NG
Commit: cd9866d66d3e6f769b4aafc9fc4d64b88079d7d0
Parents: da0cbcf
Author: Dominik Psenner <dp...@apache.org>
Authored: Sun May 13 08:36:53 2018 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Sun May 13 08:36:53 2018 +0200

----------------------------------------------------------------------
 buildtools/docker/builder-mono-3.5/Dockerfile | 2 +-
 buildtools/docker/builder-mono-4.0/Dockerfile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/cd9866d6/buildtools/docker/builder-mono-3.5/Dockerfile
----------------------------------------------------------------------
diff --git a/buildtools/docker/builder-mono-3.5/Dockerfile b/buildtools/docker/builder-mono-3.5/Dockerfile
index 3dd081f..adecc33 100644
--- a/buildtools/docker/builder-mono-3.5/Dockerfile
+++ b/buildtools/docker/builder-mono-3.5/Dockerfile
@@ -1,5 +1,5 @@
 # Name of container: docker-ubuntu-latest-nant
-FROM ubuntu:latest
+FROM ubuntu:16.04
 
 # set the maintainer of this docker image
 MAINTAINER "dev@logging.apache.org"

http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/cd9866d6/buildtools/docker/builder-mono-4.0/Dockerfile
----------------------------------------------------------------------
diff --git a/buildtools/docker/builder-mono-4.0/Dockerfile b/buildtools/docker/builder-mono-4.0/Dockerfile
index 9c26bbf..8de952c 100644
--- a/buildtools/docker/builder-mono-4.0/Dockerfile
+++ b/buildtools/docker/builder-mono-4.0/Dockerfile
@@ -1,5 +1,5 @@
 # Name of container: docker-ubuntu-latest-nant
-FROM ubuntu:latest
+FROM ubuntu:16.04
 
 # set the maintainer of this docker image
 MAINTAINER "dev@logging.apache.org"

[48/50] logging-log4net git commit: netstandard-1.3: align test results and log locations with the pattern of other targets

Posted by dp...@apache.org.

netstandard-1.3: align test results and log locations with the pattern of other 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/b402cc85
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/b402cc85
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/b402cc85

Branch: refs/heads/feature/RollingFileAppender-NG
Commit: b402cc856d783f520febe601533430f9233ffee2
Parents: cd9866d
Author: Dominik Psenner <dp...@apache.org>
Authored: Sun May 20 12:38:11 2018 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Sun May 20 12:38:11 2018 +0200

----------------------------------------------------------------------
 Jenkinsfile      |  4 ++--
 tests/nant.build | 10 +++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/b402cc85/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index d4bf538..9d53023 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -64,8 +64,8 @@ pipeline {
 
 						// test
 						sh "nant -buildfile:tests/nant.build runtests-netstandard-1.3"
-						stash includes: '**/*.trx', name: 'netstandard-1.3-testresults', allowEmpty: true
-						stash includes: '**/*.log', name: 'netstandard-1.3-testlogs', allowEmpty: true
+						stash includes: 'tests/bin/**/*.trx', name: 'netstandard-1.3-testresults', allowEmpty: true
+						stash includes: 'tests/bin/**/*.log', name: 'netstandard-1.3-testlogs', allowEmpty: true
 					}
 				}
 			}

http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/b402cc85/tests/nant.build
----------------------------------------------------------------------
diff --git a/tests/nant.build b/tests/nant.build
index 914e7b2..346ebca 100644
--- a/tests/nant.build
+++ b/tests/nant.build
@@ -872,7 +872,15 @@ limitations under the License.
             <arg value="-d"/>
             <arg value="test.diagnostics.log"/>
             <arg value="log4net.tests/log4net.tests.csproj" />
-        </exec>
+		</exec>
+		<!-- move netstandard/1.3 to tests/bin/netstandard/1.3 -->
+		<move todir="tests/bin/netstandard/1.3/"
+			  failonerror="false">
+			<fileset basedir="netstandard/1.3">
+				<include name="**/*.log" />
+				<include name="**/*.trx" />
+			</fileset>
+		</move>
     </target>
 
 </project>

[20/50] logging-log4net git commit: Merge branch 'develop' into feature/cd-pipeline

Posted by dp...@apache.org.

Merge branch 'develop' into feature/cd-pipeline


Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/933cf8a9
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/933cf8a9
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/933cf8a9

Branch: refs/heads/feature/RollingFileAppender-NG
Commit: 933cf8a9705884b53bcf84b836917d270ffdd5c8
Parents: bc53a4f 24a9c08
Author: Stefan Bodewig <st...@innoq.com>
Authored: Sat Jan 20 22:20:19 2018 +0100
Committer: Stefan Bodewig <st...@innoq.com>
Committed: Sat Jan 20 22:20:19 2018 +0100

----------------------------------------------------------------------
 Jenkinsfile                                          | 15 ++++++++++++++-
 buildtools/docker/builder-netstandard-1.3/Dockerfile |  3 +--
 netstandard/1.3/log4net.tests/log4net.tests.csproj   |  4 ++++
 tests/src/Appender/RollingFileAppenderTest.cs        |  2 ++
 4 files changed, 21 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/933cf8a9/Jenkinsfile
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/933cf8a9/netstandard/1.3/log4net.tests/log4net.tests.csproj
----------------------------------------------------------------------
diff --cc netstandard/1.3/log4net.tests/log4net.tests.csproj
index f2b8843,0000000..d389e82
mode 100755,000000..100755
--- a/netstandard/1.3/log4net.tests/log4net.tests.csproj
+++ b/netstandard/1.3/log4net.tests/log4net.tests.csproj
@@@ -1,49 -1,0 +1,53 @@@
 +<?xml version="1.0"?>
 +<!--
 +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.
 +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 obtain a copy of the License at
 +
 +http://www.apache.org/licenses/LICENSE-2.0
 +
 +Unless required by applicable law or agreed to in writing, software
 +distributed under the License is distributed on an "AS IS" BASIS,
 +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 +See the License for the specific language governing permissions and
 +limitations under the License.
 +-->
 +<Project Sdk="Microsoft.NET.Sdk">
 +
 +  <PropertyGroup>
 +    <VersionPrefix>2.0.9</VersionPrefix>
 +    <TargetFramework>netcoreapp1.0</TargetFramework>
 +    <DefineConstants>$(DefineConstants);NETSTANDARD1_3</DefineConstants>
 +    <AssemblyName>log4net.tests</AssemblyName>
 +    <PackageId>log4net.tests</PackageId>
 +    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
 +    <PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8</PackageTargetFallback>
 +    <RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
 +    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
 +    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
 +    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
 +    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
 +  </PropertyGroup>
 +
++  <PropertyGroup Condition="'$(OS)' != 'Windows_NT'">
++    <DefineConstants>$(DefineConstants);NET_STANDARD_1_ON_LINUX</DefineConstants>
++  </PropertyGroup>
++
 +  <ItemGroup>
 +    <Compile Include="../../../tests/src/*.cs;../../../tests/src/Appender/AppenderCollectionTest.cs;../../../tests/src/Appender/BufferingAppenderTest.cs;../../../tests/src/Appender/CountingAppender.cs;../../../tests/src/Appender/MemoryAppenderTest.cs;../../../tests/src/Appender/RollingFileAppenderTest.cs;../../../tests/src/Appender/SmtpPickupDirAppenderTest.cs;../../../tests/src/Appender/StringAppender.cs;../../../tests/src/Appender/TraceAppenderTest.cs;../../../tests/src/Context/LogicalThreadContextTest.cs;../../../tests/src/Context/ThreadContextTest.cs;../../../tests/src/Co../../../*.cs;../../../tests/src/DateFormatt../../../*.cs;../../../tests/src/Hierarc../../../*.cs;../../../tests/src/Layo../../../*.cs;../../../tests/src/LoggerReposito../../../*.cs;../../../tests/src/Util/CyclicBufferTest.cs;../../../tests/src/Util/LogLogTest.cs;../../../tests/src/Util/PatternConverterTest.cs;../../../tests/src/Util/RandomStringPatternConverterTest.cs;../../../tests/src/Util/SystemInfoTest.cs;
 ../../../tests/src/Util/TransformTest.cs" Exclude="bin/**;obj/**;**/*.xproj;packages/**" />
 +  </ItemGroup>
 +
 +  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
 +    <ProjectReference Include="../log4net/log4net.csproj" />
 +    <PackageReference Include="NUnit" Version="3.9.0" />
 +  </ItemGroup>
 +
 +  <ItemGroup>
 +    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
 +    <PackageReference Include="NUnit3TestAdapter" Version="3.9.0" />
 +  </ItemGroup>
 +
 +</Project>

[45/50] logging-log4net git commit: Attempt to publish a timezone so that dpkg-reconfigure tzdata does work without user input

Posted by dp...@apache.org.

Attempt to publish a timezone so that dpkg-reconfigure tzdata does work without user input


Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/3223ccb2
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/3223ccb2
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/3223ccb2

Branch: refs/heads/feature/RollingFileAppender-NG
Commit: 3223ccb22e214336bd6a233d1d1296be9aaa5643
Parents: 8f28eb2
Author: Dominik Psenner <dp...@apache.org>
Authored: Fri May 11 21:04:41 2018 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Fri May 11 21:04:41 2018 +0200

----------------------------------------------------------------------
 buildtools/docker/builder-mono-2.0/Dockerfile | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/3223ccb2/buildtools/docker/builder-mono-2.0/Dockerfile
----------------------------------------------------------------------
diff --git a/buildtools/docker/builder-mono-2.0/Dockerfile b/buildtools/docker/builder-mono-2.0/Dockerfile
index 2afed9f..39014e2 100644
--- a/buildtools/docker/builder-mono-2.0/Dockerfile
+++ b/buildtools/docker/builder-mono-2.0/Dockerfile
@@ -6,6 +6,7 @@ MAINTAINER "dev@logging.apache.org"
 
 # set the timezone
 RUN ln -fs /usr/share/zoneinfo/Universal /etc/localtime
+RUN echo "Universal" > /etc/timezone
 
 # install dependencies
 RUN apt-get update && apt-get install -y nant git mono-complete mono-reference-assemblies-2.0

[09/50] logging-log4net git commit: happy new year

Posted by dp...@apache.org.

happy new year


Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/978db279
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/978db279
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/978db279

Branch: refs/heads/feature/RollingFileAppender-NG
Commit: 978db2796944ea27ea71ac37ce8d376bef94c0bf
Parents: 68aaff9
Author: Stefan Bodewig <st...@innoq.com>
Authored: Mon Jan 15 09:18:54 2018 +0100
Committer: Stefan Bodewig <st...@innoq.com>
Committed: Mon Jan 15 09:18:54 2018 +0100

----------------------------------------------------------------------
 NOTICE                             |  2 +-
 log4net.nuspec                     |  6 +++---
 log4net.shfbproj                   |  8 ++++----
 netstandard/log4net/log4net.csproj |  4 ++--
 src/AssemblyVersionInfo.cpp        | 12 ++++++------
 src/AssemblyVersionInfo.cs         |  2 +-
 src/AssemblyVersionInfo.js         | 12 ++++++------
 src/AssemblyVersionInfo.vb         | 14 +++++++-------
 8 files changed, 30 insertions(+), 30 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/978db279/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 86d4dfe..d6ed9b6 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
    Apache log4net
-   Copyright 2004-2017 The Apache Software Foundation
+   Copyright 2004-2018 The Apache Software Foundation
 
    This product includes software developed at
    The Apache Software Foundation (http://www.apache.org/).

http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/978db279/log4net.nuspec
----------------------------------------------------------------------
diff --git a/log4net.nuspec b/log4net.nuspec
index ea0a9f0..19bbc64 100644
--- a/log4net.nuspec
+++ b/log4net.nuspec
@@ -25,9 +25,9 @@
     <version>2.0.9</version>
     <title>Apache log4net</title>
     <summary>The Apache log4net library is a tool to help the programmer output log statements to a variety of output targets.</summary>
-    <description>log4net is a tool to help the programmer output log statements to a variety of output targets. In case of problems with an application, it is helpful to enable logging so that the problem can be located. With log4net it is possible to enable logging at runtime without modifying the application binary. The log4net package is designed so that log statements can remain in shipped code without incurring a high performance cost. It follows that the speed of logging (or rather not logging) is crucial. 
+    <description>log4net is a tool to help the programmer output log statements to a variety of output targets. In case of problems with an application, it is helpful to enable logging so that the problem can be located. With log4net it is possible to enable logging at runtime without modifying the application binary. The log4net package is designed so that log statements can remain in shipped code without incurring a high performance cost. It follows that the speed of logging (or rather not logging) is crucial.
 
-At the same time, log output can be so voluminous that it quickly becomes overwhelming. One of the distinctive features of log4net is the notion of hierarchical loggers. Using these loggers it is possible to selectively control which log statements are output at arbitrary granularity. 
+At the same time, log output can be so voluminous that it quickly becomes overwhelming. One of the distinctive features of log4net is the notion of hierarchical loggers. Using these loggers it is possible to selectively control which log statements are output at arbitrary granularity.
 
 log4net is designed with two distinct goals in mind: speed and flexibility</description>
     <authors>The Apache Software Foundation</authors>
@@ -35,7 +35,7 @@ log4net is designed with two distinct goals in mind: speed and flexibility</desc
     <licenseUrl>http://logging.apache.org/log4net/license.html</licenseUrl>
     <projectUrl>http://logging.apache.org/log4net/</projectUrl>
     <iconUrl>https://www.apache.org/images/feather.png</iconUrl>
-    <copyright>Copyright 2004-2017 The Apache Software Foundation</copyright>
+    <copyright>Copyright 2004-2018 The Apache Software Foundation</copyright>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <tags>logging log tracing logfiles</tags>
     <dependencies>

http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/978db279/log4net.shfbproj
----------------------------------------------------------------------
diff --git a/log4net.shfbproj b/log4net.shfbproj
index 7f91938..393a7b3 100644
--- a/log4net.shfbproj
+++ b/log4net.shfbproj
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-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
@@ -42,7 +42,7 @@ limitations under the License.
     <Preliminary>False</Preliminary>
     <NamingMethod>MemberName</NamingMethod>
     <HelpTitle>Apache log4net™ SDK Documentation</HelpTitle>
-    <CopyrightText>Copyright 2004-2017 The Apache Software Foundation</CopyrightText>
+    <CopyrightText>Copyright 2004-2018 The Apache Software Foundation</CopyrightText>
     <CopyrightHref>http://logging.apache.org/log4net/</CopyrightHref>
     <ContentPlacement>AboveNamespaces</ContentPlacement>
     <DocumentationSources>

http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/978db279/netstandard/log4net/log4net.csproj
----------------------------------------------------------------------
diff --git a/netstandard/log4net/log4net.csproj b/netstandard/log4net/log4net.csproj
index 05171e7..712f8fc 100755
--- a/netstandard/log4net/log4net.csproj
+++ b/netstandard/log4net/log4net.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Copyright>Copyright 2004-2017 The Apache Software Foundation.</Copyright>
+    <Copyright>Copyright 2004-2018 The Apache Software Foundation.</Copyright>
     <AssemblyTitle>Apache log4net for .NET Core</AssemblyTitle>
     <VersionPrefix>2.0.9</VersionPrefix>
     <TargetFramework>netstandard1.3</TargetFramework>

http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/978db279/src/AssemblyVersionInfo.cpp
----------------------------------------------------------------------
diff --git a/src/AssemblyVersionInfo.cpp b/src/AssemblyVersionInfo.cpp
index 8e1dede..55e1062 100644
--- a/src/AssemblyVersionInfo.cpp
+++ b/src/AssemblyVersionInfo.cpp
@@ -1,9 +1,9 @@
 //
-// 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
@@ -24,11 +24,11 @@ using namespace System::Runtime::CompilerServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
-// You can specify all the value or you can default the Revision and Build Numbers 
+// You can specify all the value or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
 
 [assembly: AssemblyVersionAttribute("2.0.9.0")];
@@ -44,5 +44,5 @@ using namespace System::Runtime::CompilerServices;
 //
 
 [assembly: AssemblyCompany("The Apache Software Foundation")];
-[assembly: AssemblyCopyright("Copyright 2004-2017 The Apache Software Foundation.")];
+[assembly: AssemblyCopyright("Copyright 2004-2018 The Apache Software Foundation.")];
 [assembly: AssemblyTrademark("Apache and Apache log4net are trademarks of The Apache Software Foundation")];

http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/978db279/src/AssemblyVersionInfo.cs
----------------------------------------------------------------------
diff --git a/src/AssemblyVersionInfo.cs b/src/AssemblyVersionInfo.cs
index 0ed9380..31b6356 100644
--- a/src/AssemblyVersionInfo.cs
+++ b/src/AssemblyVersionInfo.cs
@@ -41,5 +41,5 @@
 //
 
 [assembly: System.Reflection.AssemblyCompany("The Apache Software Foundation")]
-[assembly: System.Reflection.AssemblyCopyright("Copyright 2004-2017 The Apache Software Foundation.")]
+[assembly: System.Reflection.AssemblyCopyright("Copyright 2004-2018 The Apache Software Foundation.")]
 [assembly: System.Reflection.AssemblyTrademark("Apache and Apache log4net are trademarks of The Apache Software Foundation")]

http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/978db279/src/AssemblyVersionInfo.js
----------------------------------------------------------------------
diff --git a/src/AssemblyVersionInfo.js b/src/AssemblyVersionInfo.js
index ed81785..4b14bf8 100644
--- a/src/AssemblyVersionInfo.js
+++ b/src/AssemblyVersionInfo.js
@@ -1,9 +1,9 @@
 //
-// 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
@@ -20,11 +20,11 @@
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
-// You can specify all the values or you can default the Revision and Build Numbers 
+// You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
 
 // JScript.NET doesn't handle files with only custom attributes very well, adding
@@ -45,5 +45,5 @@ import System.Reflection;
 //
 
 [assembly: AssemblyCompany("The Apache Software Foundation")]
-[assembly: AssemblyCopyright("Copyright 2004-2017 The Apache Software Foundation.")]
+[assembly: AssemblyCopyright("Copyright 2004-2018 The Apache Software Foundation.")]
 [assembly: AssemblyTrademark("Apache and Apache log4net are trademarks of The Apache Software Foundation")]

http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/978db279/src/AssemblyVersionInfo.vb
----------------------------------------------------------------------
diff --git a/src/AssemblyVersionInfo.vb b/src/AssemblyVersionInfo.vb
index 8e6709e..656bade 100644
--- a/src/AssemblyVersionInfo.vb
+++ b/src/AssemblyVersionInfo.vb
@@ -1,10 +1,10 @@
 #Region "Apache License"
 '
-' 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
@@ -21,11 +21,11 @@
 ' Version information for an assembly consists of the following four values:
 '
 '      Major Version
-'      Minor Version 
+'      Minor Version
 '      Build Number
 '      Revision
 '
-' You can specify all the values or you can default the Revision and Build Numbers 
+' You can specify all the values or you can default the Revision and Build Numbers
 ' by using the '*' as shown below:
 
 <Assembly: System.Reflection.AssemblyVersion("2.0.9.0")>
@@ -42,5 +42,5 @@
 '
 
 <Assembly: System.Reflection.AssemblyCompany("The Apache Software Foundation")>
-<Assembly: System.Reflection.AssemblyCopyright("Copyright 2004-2017 The Apache Software Foundation.")> 
-<Assembly: System.Reflection.AssemblyTrademark("Apache and Apache log4net are trademarks of The Apache Software Foundation")> 
+<Assembly: System.Reflection.AssemblyCopyright("Copyright 2004-2018 The Apache Software Foundation.")>
+<Assembly: System.Reflection.AssemblyTrademark("Apache and Apache log4net are trademarks of The Apache Software Foundation")>

[39/50] logging-log4net git commit: Make the timezone setting easier, hopefully not needing dpkg-reconfigure tzdata

Posted by dp...@apache.org.

Make the timezone setting easier, hopefully not needing dpkg-reconfigure tzdata


Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/26afadb8
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/26afadb8
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/26afadb8

Branch: refs/heads/feature/RollingFileAppender-NG
Commit: 26afadb8e65d8ae895ff54e46141e11195c1dede
Parents: 547d7a7
Author: Dominik Psenner <dp...@apache.org>
Authored: Wed May 9 21:49:28 2018 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Wed May 9 21:49:28 2018 +0200

----------------------------------------------------------------------
 buildtools/docker/builder-mono-2.0/Dockerfile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/26afadb8/buildtools/docker/builder-mono-2.0/Dockerfile
----------------------------------------------------------------------
diff --git a/buildtools/docker/builder-mono-2.0/Dockerfile b/buildtools/docker/builder-mono-2.0/Dockerfile
index 6f7c6d4..180990b 100644
--- a/buildtools/docker/builder-mono-2.0/Dockerfile
+++ b/buildtools/docker/builder-mono-2.0/Dockerfile
@@ -4,10 +4,8 @@ FROM ubuntu:latest
 # set the maintainer of this docker image
 MAINTAINER "dev@logging.apache.org"
 
-# prepare tz
-RUN apt-get install tzdata
+# set the timezone
 RUN ln -fs /usr/share/zoneinfo/Universal /etc/localtime
-RUN dpkg-reconfigure -f noninteractive tzdata
 
 # install dependencies
 RUN apt-get update && apt-get install -y nant git mono-complete mono-reference-assemblies-2.0

[37/50] logging-log4net git commit: Let it be an ubuntu node but not H26 which is somehow broken currently

Posted by dp...@apache.org.

Let it be an ubuntu node but not H26 which is somehow broken currently


Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/758d9c68
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/758d9c68
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/758d9c68

Branch: refs/heads/feature/RollingFileAppender-NG
Commit: 758d9c687bf5e4021dd7606fc4222d002c5d9f5a
Parents: d8deee9
Author: Dominik Psenner <dp...@apache.org>
Authored: Wed May 9 21:20:34 2018 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Wed May 9 21:20:34 2018 +0200

----------------------------------------------------------------------
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/758d9c68/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index f0c5ab4..ed54f8b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -25,7 +25,7 @@ pipeline {
 		disableConcurrentBuilds()
 	}
 	agent {
-		label 'H20'
+		label 'ubuntu&&!H26'
 	}
 	stages {
 		// prepare node for builds

[43/50] logging-log4net git commit: mono-2.0: attempt to build with ubuntu:16.04

Posted by dp...@apache.org.

mono-2.0: attempt to build with ubuntu:16.04


Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/9839767e
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/9839767e
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/9839767e

Branch: refs/heads/feature/RollingFileAppender-NG
Commit: 9839767e0acd1e67eb459e048868712e1aa2a958
Parents: dac0342
Author: Dominik Psenner <dp...@apache.org>
Authored: Thu May 10 20:33:51 2018 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Thu May 10 20:33:51 2018 +0200

----------------------------------------------------------------------
 buildtools/docker/builder-mono-2.0/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/9839767e/buildtools/docker/builder-mono-2.0/Dockerfile
----------------------------------------------------------------------
diff --git a/buildtools/docker/builder-mono-2.0/Dockerfile b/buildtools/docker/builder-mono-2.0/Dockerfile
index 180990b..2afed9f 100644
--- a/buildtools/docker/builder-mono-2.0/Dockerfile
+++ b/buildtools/docker/builder-mono-2.0/Dockerfile
@@ -1,5 +1,5 @@
-# Name of container: docker-ubuntu-latest-nant
-FROM ubuntu:latest
+# Name of container
+FROM ubuntu:16.04
 
 # set the maintainer of this docker image
 MAINTAINER "dev@logging.apache.org"

[17/50] logging-log4net git commit: update .NET Standard SDK Docker image to .NET Core 1.1.7

Posted by dp...@apache.org.

update .NET Standard SDK Docker image to .NET Core 1.1.7


Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/354074b1
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/354074b1
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/354074b1

Branch: refs/heads/feature/RollingFileAppender-NG
Commit: 354074b177e2cd0067bcb33e58bbbb9bd6e19573
Parents: c7e5895
Author: Stefan Bodewig <st...@innoq.com>
Authored: Sat Jan 20 21:35:43 2018 +0100
Committer: Stefan Bodewig <st...@innoq.com>
Committed: Sat Jan 20 21:35:43 2018 +0100

----------------------------------------------------------------------
 buildtools/docker/builder-netstandard-1.3/Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/354074b1/buildtools/docker/builder-netstandard-1.3/Dockerfile
----------------------------------------------------------------------
diff --git a/buildtools/docker/builder-netstandard-1.3/Dockerfile b/buildtools/docker/builder-netstandard-1.3/Dockerfile
index 6fd683a..b0f4892 100644
--- a/buildtools/docker/builder-netstandard-1.3/Dockerfile
+++ b/buildtools/docker/builder-netstandard-1.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM microsoft/dotnet:1.1.2-sdk-jessie
+FROM microsoft/dotnet:1.1-sdk
 
 # define arguments passed in as environment variables
 ARG JENKINS_UID
@@ -16,4 +16,3 @@ RUN useradd --base-dir /var/workspaces --create-home --shell /bin/bash --uid $JE
 
 # install dependencies
 RUN apt-get update && apt-get install -y nant git
-

[46/50] logging-log4net git commit: Set the timezone also for the mono-3.5 and mono-4.0 builders

Posted by dp...@apache.org.

Set the timezone also for the mono-3.5 and mono-4.0 builders


Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/da0cbcf3
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/da0cbcf3
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/da0cbcf3

Branch: refs/heads/feature/RollingFileAppender-NG
Commit: da0cbcf3508bcfb190f4aa9d74c5c8bf9a6d07d2
Parents: 3223ccb
Author: Dominik Psenner <dp...@apache.org>
Authored: Fri May 11 22:22:09 2018 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Fri May 11 22:22:09 2018 +0200

----------------------------------------------------------------------
 buildtools/docker/builder-mono-3.5/Dockerfile | 4 ++++
 buildtools/docker/builder-mono-4.0/Dockerfile | 4 ++++
 2 files changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/da0cbcf3/buildtools/docker/builder-mono-3.5/Dockerfile
----------------------------------------------------------------------
diff --git a/buildtools/docker/builder-mono-3.5/Dockerfile b/buildtools/docker/builder-mono-3.5/Dockerfile
index 709f0fd..3dd081f 100644
--- a/buildtools/docker/builder-mono-3.5/Dockerfile
+++ b/buildtools/docker/builder-mono-3.5/Dockerfile
@@ -4,6 +4,10 @@ FROM ubuntu:latest
 # set the maintainer of this docker image
 MAINTAINER "dev@logging.apache.org"
 
+# set the timezone
+RUN ln -fs /usr/share/zoneinfo/Universal /etc/localtime
+RUN echo "Universal" > /etc/timezone
+
 # install nant
 RUN apt-get update && apt-get install -y nant git mono-complete mono-reference-assemblies-2.0 mono-reference-assemblies-3.5
 

http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/da0cbcf3/buildtools/docker/builder-mono-4.0/Dockerfile
----------------------------------------------------------------------
diff --git a/buildtools/docker/builder-mono-4.0/Dockerfile b/buildtools/docker/builder-mono-4.0/Dockerfile
index 28bd0e0..9c26bbf 100644
--- a/buildtools/docker/builder-mono-4.0/Dockerfile
+++ b/buildtools/docker/builder-mono-4.0/Dockerfile
@@ -4,6 +4,10 @@ FROM ubuntu:latest
 # set the maintainer of this docker image
 MAINTAINER "dev@logging.apache.org"
 
+# set the timezone
+RUN ln -fs /usr/share/zoneinfo/Universal /etc/localtime
+RUN echo "Universal" > /etc/timezone
+
 # install nant
 RUN apt-get update && apt-get install -y nant git mono-complete mono-reference-assemblies-4.0

[23/50] logging-log4net git commit: Merge branch 'develop' into feature/cd-pipeline

Posted by dp...@apache.org.

Merge branch 'develop' into feature/cd-pipeline


Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/0db7c586
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/0db7c586
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/0db7c586

Branch: refs/heads/feature/RollingFileAppender-NG
Commit: 0db7c586abf621efa3fd7d970b7fc01386321466
Parents: 933cf8a 44a62bd
Author: Dominik Psenner <dp...@apache.org>
Authored: Tue May 8 19:02:15 2018 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Tue May 8 19:02:15 2018 +0200

----------------------------------------------------------------------
 .gitignore                                 |  4 +-
 src/site/site.xml                          |  5 +-
 src/site/xdoc/release/security-reports.xml | 64 +++++++++++++++++++++++++
 3 files changed, 69 insertions(+), 4 deletions(-)
----------------------------------------------------------------------

[04/50] logging-log4net git commit: netstandard-1.3: fix build include in csproj

Posted by dp...@apache.org.

netstandard-1.3: fix build include in csproj


Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/8595af68
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/8595af68
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/8595af68

Branch: refs/heads/feature/RollingFileAppender-NG
Commit: 8595af68a16232a100550e626c8336e80beca96f
Parents: 9bbb658
Author: Dominik Psenner <dp...@apache.org>
Authored: Tue Nov 28 21:44:49 2017 +0100
Committer: Dominik Psenner <dp...@apache.org>
Committed: Tue Nov 28 21:44:49 2017 +0100

----------------------------------------------------------------------
 netstandard/1.3/log4net/log4net.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8595af68/netstandard/1.3/log4net/log4net.csproj
----------------------------------------------------------------------
diff --git a/netstandard/1.3/log4net/log4net.csproj b/netstandard/1.3/log4net/log4net.csproj
index fc61eac..a90bafa 100755
--- a/netstandard/1.3/log4net/log4net.csproj
+++ b/netstandard/1.3/log4net/log4net.csproj
@@ -27,7 +27,7 @@
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
 	  <Compile Remove="../../../src/Appender/AdoNetAppender.cs;../../../src/Appender/AspNetTraceAppender.cs;../../../src/Appender/ColoredConsoleAppender.cs;../../../src/Appender/EventLogAppender.cs;../../../src/Appender/NetSendAppender.cs;../../../src/Appender/RemotingAppender.cs;../../../src/Appender/SmtpAppender.cs;../../../src/Config/DOMConfigurator.cs;../../../src/Config/DOMConfiguratorAttribute.cs;../../../src/Config/Log4NetConfigurationSectionHandler.cs;../../../src/Layout/Pattern/AspNetCachePatternConverter.cs;../../../src/Layout/Pattern/AspNetContextPatternConverter.cs;../../../src/Layout/Pattern/AspNetPatternConverter.cs;../../../src/Layout/Pattern/AspNetRequestPatternConverter.cs;../../../src/Layout/Pattern/AspNetSessionPatternConverter.cs;../../../src/Layout/Pattern/StackTraceDetailPatternConverter.cs;../../../src/Layout/Pattern/StackTracePatternConverter.cs;../../../src/Plugin/RemoteLoggingServerPlugin.cs;../../../src/Util/PatternStringConverters/AppSettingPatternConverter.
 cs;../../../src/Util/PatternStringConverters/EnvironmentFolderPathPatternConverter.cs;../../../src/Util/NativeError.cs;../../../src/Util/WindowsSecurityContext.cs" />
-    <Compile Include="../../../s../../../*.cs" Exclude="../../../src/Appender/AdoNetAppender.cs;../../../src/Appender/AspNetTraceAppender.cs;../../../src/Appender/ColoredConsoleAppender.cs;../../../src/Appender/EventLogAppender.cs;../../../src/Appender/NetSendAppender.cs;../../../src/Appender/RemotingAppender.cs;../../../src/Appender/SmtpAppender.cs;../../../src/Config/DOMConfigurator.cs;../../../src/Config/DOMConfiguratorAttribute.cs;../../../src/Config/Log4NetConfigurationSectionHandler.cs;../../../src/Layout/Pattern/AspNetCachePatternConverter.cs;../../../src/Layout/Pattern/AspNetContextPatternConverter.cs;../../../src/Layout/Pattern/AspNetPatternConverter.cs;../../../src/Layout/Pattern/AspNetRequestPatternConverter.cs;../../../src/Layout/Pattern/AspNetSessionPatternConverter.cs;../../../src/Layout/Pattern/StackTraceDetailPatternConverter.cs;../../../src/Layout/Pattern/StackTracePatternConverter.cs;../../../src/Plugin/RemoteLoggingServerPlugin.cs;../../../src/Util/PatternStringCo
 nverters/AppSettingPatternConverter.cs;../../../src/Util/PatternStringConverters/EnvironmentFolderPathPatternConverter.cs;../../../src/Util/NativeError.cs;../../../src/Util/WindowsSecurityContext.cs;bin/**;obj/**;**/*.xproj;packages/**" />
+    <Compile Include="../../../*.cs" Exclude="../../../src/Appender/AdoNetAppender.cs;../../../src/Appender/AspNetTraceAppender.cs;../../../src/Appender/ColoredConsoleAppender.cs;../../../src/Appender/EventLogAppender.cs;../../../src/Appender/NetSendAppender.cs;../../../src/Appender/RemotingAppender.cs;../../../src/Appender/SmtpAppender.cs;../../../src/Config/DOMConfigurator.cs;../../../src/Config/DOMConfiguratorAttribute.cs;../../../src/Config/Log4NetConfigurationSectionHandler.cs;../../../src/Layout/Pattern/AspNetCachePatternConverter.cs;../../../src/Layout/Pattern/AspNetContextPatternConverter.cs;../../../src/Layout/Pattern/AspNetPatternConverter.cs;../../../src/Layout/Pattern/AspNetRequestPatternConverter.cs;../../../src/Layout/Pattern/AspNetSessionPatternConverter.cs;../../../src/Layout/Pattern/StackTraceDetailPatternConverter.cs;../../../src/Layout/Pattern/StackTracePatternConverter.cs;../../../src/Plugin/RemoteLoggingServerPlugin.cs;../../../src/Util/PatternStringConverters/A
 ppSettingPatternConverter.cs;../../../src/Util/PatternStringConverters/EnvironmentFolderPathPatternConverter.cs;../../../src/Util/NativeError.cs;../../../src/Util/WindowsSecurityContext.cs;bin/**;obj/**;**/*.xproj;packages/**" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">

[07/50] logging-log4net git commit: Fix nant warning about deprecated ifnot usage

Posted by dp...@apache.org.

Fix nant warning about deprecated ifnot usage


Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/feef693a
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/feef693a
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/feef693a

Branch: refs/heads/feature/RollingFileAppender-NG
Commit: feef693a2ead6b78796f16854d943b826ea99cd4
Parents: af5562e
Author: Dominik Psenner <dp...@apache.org>
Authored: Tue Nov 28 22:22:53 2017 +0100
Committer: Dominik Psenner <dp...@apache.org>
Committed: Tue Nov 28 22:22:53 2017 +0100

----------------------------------------------------------------------
 log4net.build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/feef693a/log4net.build
----------------------------------------------------------------------
diff --git a/log4net.build b/log4net.build
index cd24957..28dc2e4 100644
--- a/log4net.build
+++ b/log4net.build
@@ -1787,11 +1787,11 @@ limitations under the License.
           <fileset basedir="netstandard/1.3/log4net/bin/Release/netstandard1.3"/>
         </move>
       </if>
-      <ifnot test="${current.build.config.release}">
+      <if test="${current.build.config.debug}">
         <move todir="${log4net.basedir}/bin/netstandard/1.3/debug">
           <fileset basedir="netstandard/1.3/log4net/bin/Debug/netstandard1.3"/>
         </move>
-      </ifnot>
+      </if>
     </if>
   </target>
   <!-- Target for generating docs for all runtime configurations -->

[18/50] logging-log4net git commit: it looks as if exclusive locking didn't work on Linux/.NET Core 1.x

Posted by dp...@apache.org.

it looks as if exclusive locking didn't work on Linux/.NET Core 1.x


Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/3a2e0a91
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/3a2e0a91
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/3a2e0a91

Branch: refs/heads/feature/RollingFileAppender-NG
Commit: 3a2e0a913face48abfec270bd1d8af9d3cd06b83
Parents: 354074b
Author: Stefan Bodewig <st...@innoq.com>
Authored: Sat Jan 20 22:11:18 2018 +0100
Committer: Stefan Bodewig <st...@innoq.com>
Committed: Sat Jan 20 22:11:18 2018 +0100

----------------------------------------------------------------------
 netstandard/log4net.tests/log4net.tests.csproj | 4 ++++
 tests/src/Appender/RollingFileAppenderTest.cs  | 2 ++
 2 files changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/3a2e0a91/netstandard/log4net.tests/log4net.tests.csproj
----------------------------------------------------------------------
diff --git a/netstandard/log4net.tests/log4net.tests.csproj b/netstandard/log4net.tests/log4net.tests.csproj
index fd57f3e..a168cdb 100755
--- a/netstandard/log4net.tests/log4net.tests.csproj
+++ b/netstandard/log4net.tests/log4net.tests.csproj
@@ -32,6 +32,10 @@ limitations under the License.
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(OS)' != 'Windows_NT'">
+    <DefineConstants>$(DefineConstants);NET_STANDARD_1_ON_LINUX</DefineConstants>
+  </PropertyGroup>
+
   <ItemGroup>
     <Compile Include="..\..\tests\src\*.cs;..\..\tests\src\Appender\AppenderCollectionTest.cs;..\..\tests\src\Appender\BufferingAppenderTest.cs;..\..\tests\src\Appender\CountingAppender.cs;..\..\tests\src\Appender\MemoryAppenderTest.cs;..\..\tests\src\Appender\RollingFileAppenderTest.cs;..\..\tests\src\Appender\SmtpPickupDirAppenderTest.cs;..\..\tests\src\Appender\StringAppender.cs;..\..\tests\src\Appender\TraceAppenderTest.cs;..\..\tests\src\Context\LogicalThreadContextTest.cs;..\..\tests\src\Context\ThreadContextTest.cs;..\..\tests\src\Core\**\*.cs;..\..\tests\src\DateFormatter\**\*.cs;..\..\tests\src\Hierarchy\**\*.cs;..\..\tests\src\Layout\**\*.cs;..\..\tests\src\LoggerRepository\**\*.cs;..\..\tests\src\Util\CyclicBufferTest.cs;..\..\tests\src\Util\LogLogTest.cs;..\..\tests\src\Util\PatternConverterTest.cs;..\..\tests\src\Util\RandomStringPatternConverterTest.cs;..\..\tests\src\Util\SystemInfoTest.cs;..\..\tests\src\Util\TransformTest.cs" Exclude="bin\**;obj\**;**\*.xproj;packag
 es\**" />
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/3a2e0a91/tests/src/Appender/RollingFileAppenderTest.cs
----------------------------------------------------------------------
diff --git a/tests/src/Appender/RollingFileAppenderTest.cs b/tests/src/Appender/RollingFileAppenderTest.cs
index 07ebfec..c9d92e9 100644
--- a/tests/src/Appender/RollingFileAppenderTest.cs
+++ b/tests/src/Appender/RollingFileAppenderTest.cs
@@ -1561,8 +1561,10 @@ namespace log4net.Tests.Appender
 
 			Assert.IsTrue(locked, "File was not locked");
 #if !MONO || MONO_3_5 || MONO_4_0 // at least on Linux with Mono 2.4 exclusive locking doesn't work as one would expect
+#if !NET_STANDARD_1_ON_LINUX // exclusive locking doesn't seem to work properly on .NET Core 1.x on Linux
 			AssertFileEquals(filename, "This is a message" + Environment.NewLine + "This is a message 2" + Environment.NewLine);
 #endif
+#endif
 			Assert.AreEqual("", sh.Message, "Unexpected error message");
 		}

[22/50] logging-log4net git commit: add a project specific (mostly empty) security page

Posted by dp...@apache.org.

add a project specific (mostly empty) security page


Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/44a62bdb
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/44a62bdb
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/44a62bdb

Branch: refs/heads/feature/RollingFileAppender-NG
Commit: 44a62bdba9fe737c16056e4b34cbee72718edf95
Parents: a0329e0
Author: Stefan Bodewig <bo...@apache.org>
Authored: Wed Jan 31 16:51:55 2018 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Wed Jan 31 16:51:55 2018 +0100

----------------------------------------------------------------------
 src/site/site.xml                          |  5 +-
 src/site/xdoc/release/security-reports.xml | 64 +++++++++++++++++++++++++
 2 files changed, 67 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/44a62bdb/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index aefdd5c..aa20cb6 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -30,6 +30,7 @@
 		<menu name="Apache log4net" inherit="top" img="icon-home">
 			<item name="About" href="/index.html"/>
 			<item name="Download" href="/download_log4net.cgi"/>
+			<item name="Security Reports" href="/release/security-reports.html"/>
 			<item name="Release Notes" href="/release/release-notes.html"/>
 			<item name="License" href="/license.html"/>
 		</menu>
@@ -66,8 +67,8 @@
                 </menu>
 
 		<menu name="Apache" inherit="top" img="icon-info-sign">
-			<item name="Home" href="http://www.apache.org/"/>	
-			<item name="License" href="http://www.apache.org/licenses/"/>	
+			<item name="Home" href="http://www.apache.org/"/>
+			<item name="License" href="http://www.apache.org/licenses/"/>
 			<item name="Sponsorship" href="http://www.apache.org/foundation/sponsorship.html"/>
 			<item name="Thanks" href="http://www.apache.org/foundation/thanks.html"/>
 			<item name="Security" href="http://www.apache.org/security/"/>

http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/44a62bdb/src/site/xdoc/release/security-reports.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/release/security-reports.xml b/src/site/xdoc/release/security-reports.xml
new file mode 100644
index 0000000..30c57bd
--- /dev/null
+++ b/src/site/xdoc/release/security-reports.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0"?>
+<!--
+
+   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.
+   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 obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<document>
+    <properties>
+        <title>Apache log4net: Security Reports</title>
+        <author email="dev@logging.apache.org">Logging Documentation Team</author>
+    </properties>
+    <body>
+      <section name="General Information">
+        <p>For information about reporting or asking questions about
+        security problems, please see the <a
+        href="https://logging.apache.org/security.html">security page
+        of the Logging project</a>.</p>
+      </section>
+
+      <section name="Apache log4net Security Vulnerabilities">
+        <p>This page lists all security vulnerabilities fixed in
+        released versions of Apache log4net. Each
+        vulnerability is given a security impact rating by the
+        development team - please note that this rating may vary from
+        platform to platform. We also list the versions of log4net the
+		flaw is known to affect, and where a flaw has not
+        been verified list the version with a question mark.</p>
+
+        <p>Please note that binary patches are never provided. If you
+        need to apply a source code patch, use the building
+        instructions for the log4net version that you are
+        using.</p>
+
+        <p>If you need help on building log4net or other help
+        on following the instructions to mitigate the known
+        vulnerabilities listed here, please send your questions to the
+        public <a href="../mail-lists.html">Logging Users mailing
+        list</a>.</p>
+
+        <p>If you have encountered an unlisted security vulnerability
+        or other unexpected behaviour that has security impact, or if
+        the descriptions here are incomplete, please report them
+        privately to the Apache Security Team. Thank you.</p>
+
+	  </section>
+
+      <section name="Errors and Ommissions">
+        <p>Please report any errors or omissions to <a
+        href="../mail-lists.html">the dev mailing list</a>.</p>
+      </section>
+    </body>
+</document>