:construction: preparing a release (need to pick up from step 5 of the release guide)
diff --git a/doc/sign-log4net-libraries.sh b/doc/sign-log4net-libraries.sh
index 55d5767..59702f7 100644
--- a/doc/sign-log4net-libraries.sh
+++ b/doc/sign-log4net-libraries.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# see https://infra.apache.org/release-signing#openpgp-ascii-detach-sig
DID_SOMETHING=0
-for f in log4net*.nupkg log4net*.zip; do
+for f in *log4net*.nupkg *log4net*.zip; do
DID_SOMETHING=1
echo "signing: $f"
gpg --armor --output $f.asc --detach-sig $f
diff --git a/local-tasks/build-site.js b/local-tasks/build-site.js
index f87fe82..8e27cf0 100644
--- a/local-tasks/build-site.js
+++ b/local-tasks/build-site.js
@@ -13,7 +13,7 @@
let extra;
switch (os.platform()) {
case "win32":
- extra = "You may install maven via scoop (https://scoop.sh/)";
+ extra = "You may install maven via chocolatey (https://chocolatey.org)";
break;
case "darwin":
extra = "You may install maven via homebrew";
diff --git a/src/integration-testing/log4net-672/log4net.config b/src/integration-testing/log4net-672/log4net.config
index 0e685d6..42ed1b6 100644
--- a/src/integration-testing/log4net-672/log4net.config
+++ b/src/integration-testing/log4net-672/log4net.config
@@ -10,9 +10,22 @@
<preserveLogFileNameExtension value="true" />
<staticLogFileName value="false" />
<layout type="log4net.Layout.XmlLayout"/>
+ <fix value="Partial" />
+ </appender>
+ <appender name="BufferingForwardingAppender" type="log4net.APpender.BufferingForwardingAppender">
+ <bufferSize value="100" />
+ <fix value="Partial" />
+ <appender-ref ref="ConsoleAppender"/>
+ </appender>
+ <appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
+ <target value="Console.Out" />
+ <layout type="log4net.Layout.PatternLayout">
+ <conversionPattern value="[console] %message%newline" />
+ </layout>
</appender>
<root>
<level value="ALL"/>
<appender-ref ref="LogFileAppenderXML" />
+ <appender-ref ref="BufferingForwardingAppender" />
</root>
</log4net>
\ No newline at end of file
diff --git a/src/log4net/Core/LoggingEvent.cs b/src/log4net/Core/LoggingEvent.cs
index cf228a7..9dd9a12 100644
--- a/src/log4net/Core/LoggingEvent.cs
+++ b/src/log4net/Core/LoggingEvent.cs
@@ -200,106 +200,6 @@
}
/// <summary>
- /// Flags passed to the <see cref="LoggingEvent.Fix"/> property
- /// </summary>
- /// <remarks>
- /// <para>
- /// Flags passed to the <see cref="LoggingEvent.Fix"/> property
- /// </para>
- /// </remarks>
- /// <author>Nicko Cadell</author>
- [Flags]
- public enum FixFlags
- {
- /// <summary>
- /// Fix the MDC
- /// </summary>
- [Obsolete("Replaced by composite Properties")]
- Mdc = 0x01,
-
- /// <summary>
- /// Fix the NDC
- /// </summary>
- Ndc = 0x02,
-
- /// <summary>
- /// Fix the rendered message
- /// </summary>
- Message = 0x04,
-
- /// <summary>
- /// Fix the thread name
- /// </summary>
- ThreadName = 0x08,
-
- /// <summary>
- /// Fix the callers location information
- /// </summary>
- /// <remarks>
- /// CAUTION: Very slow to generate
- /// </remarks>
- LocationInfo = 0x10,
-
- /// <summary>
- /// Fix the callers windows user name
- /// </summary>
- /// <remarks>
- /// CAUTION: Slow to generate
- /// </remarks>
- UserName = 0x20,
-
- /// <summary>
- /// Fix the domain friendly name
- /// </summary>
- Domain = 0x40,
-
- /// <summary>
- /// Fix the callers principal name
- /// </summary>
- /// <remarks>
- /// CAUTION: May be slow to generate
- /// </remarks>
- Identity = 0x80,
-
- /// <summary>
- /// Fix the exception text
- /// </summary>
- Exception = 0x100,
-
- /// <summary>
- /// Fix the event properties. Active properties must implement <see cref="IFixingRequired"/> in order to be eligible for fixing.
- /// </summary>
- Properties = 0x200,
-
- /// <summary>
- /// No fields fixed
- /// </summary>
- None = 0x0,
-
- /// <summary>
- /// All fields fixed
- /// </summary>
- All = 0xFFFFFFF,
-
- /// <summary>
- /// Partial fields fixed
- /// </summary>
- /// <remarks>
- /// <para>
- /// This set of partial fields gives good performance. The following fields are fixed:
- /// </para>
- /// <list type="bullet">
- /// <item><description><see cref="Message"/></description></item>
- /// <item><description><see cref="ThreadName"/></description></item>
- /// <item><description><see cref="Exception"/></description></item>
- /// <item><description><see cref="Domain"/></description></item>
- /// <item><description><see cref="Properties"/></description></item>
- /// </list>
- /// </remarks>
- Partial = Message | ThreadName | Exception | Domain | Properties,
- }
-
- /// <summary>
/// The internal representation of logging events.
/// </summary>
/// <remarks>
diff --git a/src/log4net/log4net.csproj b/src/log4net/log4net.csproj
index 27707b6..e034b6a 100644
--- a/src/log4net/log4net.csproj
+++ b/src/log4net/log4net.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<PackageId>log4net</PackageId>
- <Version>2.0.14</Version>
+ <Version>2.0.15</Version>
<Title>Apache log4net</Title>
<Product>Apache log4net</Product>
<Description>
diff --git a/src/site/xdoc/download_log4net.xml b/src/site/xdoc/download_log4net.xml
index 0ce3852..1ae3e4e 100644
--- a/src/site/xdoc/download_log4net.xml
+++ b/src/site/xdoc/download_log4net.xml
@@ -36,14 +36,14 @@
</section>
- <section name="log4net 2.0.14">
+ <section name="log4net 2.0.15">
<subsection name="Source">
<table>
<tr>
- <td><a href="https://downloads.apache.org/logging/log4net/source/apache-log4net-source-2.0.14.zip">apache-log4net-source-2.0.14.zip</a></td>
- <td><a href="https://downloads.apache.org/logging/log4net/source/apache-log4net-source-2.0.14.zip.sha512">sha512</a></td>
- <td><a href="https://downloads.apache.org/logging/log4net/source/apache-log4net-source-2.0.14.zip.asc">pgp</a></td>
+ <td><a href="https://downloads.apache.org/logging/log4net/source/apache-log4net-source-2.0.15.zip">apache-log4net-source-2.0.15.zip</a></td>
+ <td><a href="https://downloads.apache.org/logging/log4net/source/apache-log4net-source-2.0.15.zip.sha512">sha512</a></td>
+ <td><a href="https://downloads.apache.org/logging/log4net/source/apache-log4net-source-2.0.15.zip.asc">pgp</a></td>
</tr>
</table>
</subsection>
@@ -52,14 +52,14 @@
<p>Binaries are available in a zip file or nupkg, which is also available from <a href="https://www.nuget.org/packages/log4net/">nuget.org</a></p>
<table>
<tr>
- <td><a href="https://downloads.apache.org/logging/log4net/binaries/apache-log4net-binaries-2.0.14.zip">log4net-binaries-2.0.14.zip</a></td>
- <td><a href="https://downloads.apache.org/logging/log4net/binaries/apache-log4net-binaries-2.0.14.zip.sha512">sha512</a></td>
- <td><a href="https://downloads.apache.org/logging/log4net/binaries/apache-log4net-binaries-2.0.14.zip.asc">pgp</a></td>
+ <td><a href="https://downloads.apache.org/logging/log4net/binaries/apache-log4net-binaries-2.0.15.zip">log4net-binaries-2.0.15.zip</a></td>
+ <td><a href="https://downloads.apache.org/logging/log4net/binaries/apache-log4net-binaries-2.0.15.zip.sha512">sha512</a></td>
+ <td><a href="https://downloads.apache.org/logging/log4net/binaries/apache-log4net-binaries-2.0.15.zip.asc">pgp</a></td>
</tr>
<tr>
- <td><a href="https://downloads.apache.org/logging/log4net/binaries/apache-log4net.2.0.14.nupkg">log4net-2.0.14.nupkg</a></td>
- <td><a href="https://downloads.apache.org/logging/log4net/binaries/apache-log4net.2.0.14.nupkg.sha512">sha512</a></td>
- <td><a href="https://downloads.apache.org/logging/log4net/binaries/apache-log4net.2.0.14.nupkg.asc">pgp</a></td>
+ <td><a href="https://downloads.apache.org/logging/log4net/binaries/apache-log4net.2.0.15.nupkg">log4net-2.0.15.nupkg</a></td>
+ <td><a href="https://downloads.apache.org/logging/log4net/binaries/apache-log4net.2.0.15.nupkg.sha512">sha512</a></td>
+ <td><a href="https://downloads.apache.org/logging/log4net/binaries/apache-log4net.2.0.15.nupkg.asc">pgp</a></td>
</tr>
</table>
</subsection>
diff --git a/src/site/xdoc/release/config-examples.xml b/src/site/xdoc/release/config-examples.xml
index 9d62879..c5a2ec3 100644
--- a/src/site/xdoc/release/config-examples.xml
+++ b/src/site/xdoc/release/config-examples.xml
@@ -44,6 +44,7 @@
<section id="adonetappender" name="AdoNetAppender">
<p>
For full details see the SDK Reference entry: <a href="sdk/html/T_log4net_Appender_AdoNetAppender.htm">log4net.Appender.AdoNetAppender</a>.
+ <u>Please see notes on the <a href="#bufferingforwardingappender">BufferingForwardingAppender</a> about performance and data fixing</u>
</p>
<p>
The configuration of the <span class="code">AdoNetAppender</span> depends on the
@@ -476,6 +477,17 @@
<source language="xml"><![CDATA[
<appender name="BufferingForwardingAppender" type="log4net.Appender.BufferingForwardingAppender" >
<bufferSize value="100"/>
+ <!--
+ The value here may be an enum name or a number which can be
+ cast to the required set of flags.
+
+ The default value is All, which may negatively impact performance enough to warrant
+ changing it to fix less data.
+
+ More information can be found at
+ https://github.com/apache/logging-log4net/blob/master/src/log4net/Core/FixFlags.cs
+ -->
+ <fix value="All"/>
<appender-ref ref="ConsoleAppender" />
</appender>
]]></source>
@@ -572,6 +584,10 @@
<section id="eventlogappender" name="EventLogAppender">
<p>
For full details see the SDK Reference entry: <a href="sdk/html/T_log4net_Appender_EventLogAppender.htm">log4net.Appender.EventLogAppender</a>.
+ Please note that this appender is not natively available in log4net for dotnet standard, as
+ it would bring in windows dependencies for non-windows consumers. Please see
+ <a href="https://www.nuget.org/packages/log4net.appenders.netcore">https://www.nuget.org/packages/log4net.appenders.netcore</a>
+ for an alternative if you still require EventLog logging for netstandard targets.
</p>
<p>
The following example shows how to configure the <span class="code">EventLogAppender</span> to log
@@ -805,6 +821,7 @@
<section id="remotingappender" name="RemotingAppender">
<p>
For full details see the SDK Reference entry: <a href="sdk/html/T_log4net_Appender_RemotingAppender.htm">log4net.Appender.RemotingAppender</a>.
+ <u>Please see notes on the <a href="#bufferingforwardingappender">BufferingForwardingAppender</a> about performance and data fixing</u>
</p>
<p>
The following example shows how to configure the <span class="code">RemotingAppender</span>
@@ -935,6 +952,7 @@
<section id="smtpappender" name="SmtpAppender">
<p>
For full details see the SDK Reference entry: <a href="sdk/html/T_log4net_Appender_SmtpAppender.htm">log4net.Appender.SmtpAppender</a>.
+ <u>Please see notes on the <a href="#bufferingforwardingappender">BufferingForwardingAppender</a> about performance and data fixing</u>
</p>
<p>
The following example shows how to configure the <span class="code">SmtpAppender</span>
@@ -1004,6 +1022,7 @@
<section id="smtppickupdirappender" name="SmtpPickupDirAppender">
<p>
For full details see the SDK Reference entry: <a href="sdk/html/T_log4net_Appender_SmtpPickupDirAppender.htm">log4net.Appender.SmtpPickupDirAppender</a>.
+ <u>Please see notes on the <a href="#bufferingforwardingappender">BufferingForwardingAppender</a> about performance and data fixing</u>
</p>
<p>
The <span class="code">SmtpPickupDirAppender</span> is configured similarly
diff --git a/src/site/xdoc/release/release-notes.xml b/src/site/xdoc/release/release-notes.xml
index fe410ce..08018c7 100644
--- a/src/site/xdoc/release/release-notes.xml
+++ b/src/site/xdoc/release/release-notes.xml
@@ -27,6 +27,33 @@
<body>
<section id="main" name="Apache log4net™ Release Notes">
+ <section id="2.0.15" name="2.0.15">
+ Attention: .NET 3.5 Client Profile is <i>no longer supported</i>. I'm really sorry, I've tried
+ to keep as many of the legacy targets available as possible, but after spending another 4 or so
+ hours trying to get net35-client to build on any machine, I've given up - as far as I'm aware,
+ this should only affect Windows XP clients. I'm afraid 2.0.14 was the end of the road for you.
+
+ Apache log4net 2.0.15 addresses reported issues:
+ <section id="2.0.15-bug" name="Bug fixes">
+ <ul>
+ <li>Improper usage of xml namespacing for netfx targets after a netstandard update (
+ <a href="https://issues.apache.org/jira/projects/LOG4NET/issues/LOG4NET-685">LOG4NET-685</a>,
+ related <a href="https://issues.apache.org/jira/projects/LOG4NET/issues/LOG4NET-683">LOG4NET-683</a>)</li>
+ <li>Locking hashtables during write in RenderMap calls to make them thread-safe (
+ <a href="https://issues.apache.org/jira/projects/LOG4NET/issues/LOG4NET-646">LOG4NET-646</a>)</li>
+ <li>An issue where RollingFilAppender would sometimes overwrite files instead of rolling them (
+ <a href="https://issues.apache.org/jira/projects/LOG4NET/issues/LOG4NET-672">LOG4NET-672</a>)</li>
+ </ul>
+ </section>
+ <section id="2.0.15-enhancements" name="Enhancements">
+ <ul>
+ <li><a href="https://github.com/apache/logging-log4net/pull/81">Enforce TLS1.2 in the ps1 scripts provided for dev use</a></li>
+ <li><a href="https://github.com/apache/logging-log4net/pull/80">Corrected links in README</a></li>
+ <li><a href="https://github.com/apache/logging-log4net/pull/89">Open up the internals of LogEvent a bit for extension purposes</a></li>
+ <li>Add information about FixFlags and performance to the BufferingAppender (and derivative) documentation</li>
+ </ul>
+ </section>
+ </section>
<section id="2.0.14" name="2.0.14">
Apache log4net 2.0.14 is a minor release to address some reported issues
and accept a pull request provided by a community member:
