Codestin Search App

Binaries are available in a zip file or nupkg, which is also available from nuget.org

+ Apache log4net 2.0.12 is a minor fix release to address reported issues on + non-windows platforms. +

Addresses the issues reported in LOG4NET-652 and LOG4NET-653 whereby + logging could throw a PlatformNotSupported exception when the username + is required within logs on non-Windows platforms. The implemented + behavior is to fall back, where possible, on Environment.UserName + or provide text that the facility is not supported. +

- Apachhe log4net 2.0.11 fixes incorrect version strings within the released + Apache log4net 2.0.11 fixes incorrect version strings within the released binaries and contains some minor fixes to correctly dispose of StreamWriters used during log flushing, thanks to community member @NicholasNoise

From ea3535a7fa31181a6d7bd74786ba03d9ac8ec7f8 Mon Sep 17 00:00:00 2001 From: Davyd McColl Date: Sun, 18 Oct 2020 17:53:48 +0200 Subject: [PATCH 019/122] :memo: update references to jira issues to be links --- src/site/xdoc/release/release-notes.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/site/xdoc/release/release-notes.xml b/src/site/xdoc/release/release-notes.xml index 87b199f5c..f6e28e4de 100644 --- a/src/site/xdoc/release/release-notes.xml +++ b/src/site/xdoc/release/release-notes.xml @@ -34,7 +34,9 @@ limitations under the License.

Addresses the issues reported in LOG4NET-652 and LOG4NET-653 whereby +

Addresses the issues reported in + [LOG4NET-652] + and [LOG4NET-653] whereby logging could throw a PlatformNotSupported exception when the username is required within logs on non-Windows platforms. The implemented behavior is to fall back, where possible, on Environment.UserName From dbad144815221ffe4ed85efa73134583253dc75b Mon Sep 17 00:00:00 2001 From: Davyd McColl Date: Mon, 19 Oct 2020 08:45:12 +0200 Subject: [PATCH 020/122] :arrow_up: upgrade gulp-zip so that generated zip artifacts are properly unzippable on !win32 --- package-lock.json | 21 +++++++++++---------- package.json | 2 +- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5368c2fd6..e02ddb9ee 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "log4net", - "version": "2.0.9", + "version": "2.0.12", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -2623,9 +2623,9 @@ } }, "gulp-zip": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/gulp-zip/-/gulp-zip-5.0.1.tgz", - "integrity": "sha512-M/IWLh9RvOpuofDZkgDirtiyz9J3yIqnDOJ3muzk2D/XnZ1ruqPlPLRIpXnl/aZU+xXwKPdOIxjRzkUcVEQyZQ==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/gulp-zip/-/gulp-zip-5.0.2.tgz", + "integrity": "sha512-rZd0Ppuc8Bf7J2/WzcdNaeb+lcEXf1R8mV/PJ9Kdu7PmnInWVeLSmiXIka/2QSe6uhAsGVFAMffWSaMzAPGTBg==", "dev": true, "requires": { "get-stream": "^5.1.0", @@ -2636,9 +2636,9 @@ }, "dependencies": { "get-stream": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz", - "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", + "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", "dev": true, "requires": { "pump": "^3.0.0" @@ -5488,11 +5488,12 @@ "dev": true }, "through2": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz", - "integrity": "sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz", + "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==", "dev": true, "requires": { + "inherits": "^2.0.4", "readable-stream": "2 || 3" } }, diff --git a/package.json b/package.json index 26b60ccda..b535be677 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "homepage": "https://github.com/fluffynuts/logging-log4net#readme", "devDependencies": { "cross-env": "^7.0.2", - "gulp-zip": "^5.0.1", + "gulp-zip": "^5.0.2", "npm-run-all": "^4.1.5", "rimraf": "^3.0.2", "simple-git": "^2.20.1", From 634ffca956045cc25a8f072ca0fd05c49228a70a Mon Sep 17 00:00:00 2001 From: Tsar Nikolay Date: Mon, 7 Dec 2020 19:28:08 +0500 Subject: [PATCH 021/122] Fix AdoNetAppender using npgsql --- src/log4net/Appender/AdoNetAppender.cs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/log4net/Appender/AdoNetAppender.cs b/src/log4net/Appender/AdoNetAppender.cs index dd9939ba9..2f6edfbb0 100644 --- a/src/log4net/Appender/AdoNetAppender.cs +++ b/src/log4net/Appender/AdoNetAppender.cs @@ -553,8 +553,17 @@ protected virtual void SendBuffer(IDbTransaction dbTran, LoggingEvent[] events) { dbCmd.Transaction = dbTran; } - // prepare the command, which is significantly faster - dbCmd.Prepare(); + + try + { + // prepare the command, which is significantly faster + dbCmd.Prepare(); + } + catch (Exception) + { + // ignore prepare exceptions as they can happen without affecting actual logging, eg on npgsql + } + // run for all events foreach (LoggingEvent e in events) { From fb7096905b93b83590bac3e88bc0e806af94a093 Mon Sep 17 00:00:00 2001 From: David Schwartz Date: Wed, 18 Aug 2021 17:44:33 +0300 Subject: [PATCH 022/122] Update AssemblyInfo to allow net472 web projects use the netstandard2.0 library --- src/log4net/AssemblyInfo.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/log4net/AssemblyInfo.cs b/src/log4net/AssemblyInfo.cs index 9539a78e7..21b94e5bf 100644 --- a/src/log4net/AssemblyInfo.cs +++ b/src/log4net/AssemblyInfo.cs @@ -39,14 +39,13 @@ [assembly: System.Security.AllowPartiallyTrustedCallers] #endif -#if (NET_4_0) +#if (NET_4_0 || NETSTANDARD2_0) // // Allows partial trust applications (e.g. ASP.NET shared hosting) on .NET 4.0 to work // given our implementation of ISerializable. // [assembly: System.Security.SecurityRules(System.Security.SecurityRuleSet.Level1)] #endif - // // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information From 318448ef199412cb8f4ce6873b1b8e0eb67be490 Mon Sep 17 00:00:00 2001 From: Davyd McColl Date: Mon, 25 Oct 2021 15:19:30 +0200 Subject: [PATCH 023/122] :zap: don't attempt to read WindowsIdentity after PlatformNotSupportedException is caught --- src/log4net/Core/LoggingEvent.cs | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/src/log4net/Core/LoggingEvent.cs b/src/log4net/Core/LoggingEvent.cs index 878fbf7f7..72d0c3c82 100644 --- a/src/log4net/Core/LoggingEvent.cs +++ b/src/log4net/Core/LoggingEvent.cs @@ -497,15 +497,15 @@ protected LoggingEvent(SerializationInfo info, StreamingContext context) // hierarchy but may not be for the target hierarchy that this // event may be re-logged into. If it is to be re-logged it may // be necessary to re-lookup the level based only on the name. - m_data.Level = (Level) info.GetValue("Level", typeof(Level)); + m_data.Level = (Level)info.GetValue("Level", typeof(Level)); m_data.Message = info.GetString("Message"); m_data.ThreadName = info.GetString("ThreadName"); m_data.TimeStampUtc = info.GetDateTime("TimeStamp").ToUniversalTime(); - m_data.LocationInfo = (LocationInfo) info.GetValue("LocationInfo", typeof(LocationInfo)); + m_data.LocationInfo = (LocationInfo)info.GetValue("LocationInfo", typeof(LocationInfo)); m_data.UserName = info.GetString("UserName"); m_data.ExceptionString = info.GetString("ExceptionString"); - m_data.Properties = (PropertiesDictionary) info.GetValue("Properties", typeof(PropertiesDictionary)); + m_data.Properties = (PropertiesDictionary)info.GetValue("Properties", typeof(PropertiesDictionary)); m_data.Domain = info.GetString("Domain"); m_data.Identity = info.GetString("Identity"); @@ -914,7 +914,7 @@ public string ThreadName /// /// public string UserName => - m_data.UserName ??= TryGetCurrentUserName() ?? SystemInfo.NotAvailableText; + m_data.UserName ??= TryGetCurrentUserName() ?? SystemInfo.NotAvailableText; private static string TryGetCurrentUserName() { @@ -922,6 +922,13 @@ private static string TryGetCurrentUserName() // On compact framework there's no notion of current Windows user return SystemInfo.NotAvailableText; #else + if (_platformDoesNotSupportWindowsIdentity) + { + // we've already received one PlatformNotSupportedException + // and it's highly unlikely that will change + return Environment.UserName; + } + try { var windowsIdentity = WindowsIdentity.GetCurrent(); @@ -929,6 +936,7 @@ private static string TryGetCurrentUserName() } catch (PlatformNotSupportedException) { + _platformDoesNotSupportWindowsIdentity = true; return Environment.UserName; } catch (SecurityException) @@ -947,7 +955,9 @@ private static string TryGetCurrentUserName() } #endif } - + + private static bool _platformDoesNotSupportWindowsIdentity; + ///

/// Gets the identity of the current thread principal. ///

@@ -1338,7 +1348,7 @@ protected void FixVolatileData(FixFlags flags) m_cacheUpdatable = true; // determine the flags that we are actually fixing - var updateFlags = (FixFlags) ((flags ^ m_fixFlags) & flags); + var updateFlags = (FixFlags)((flags ^ m_fixFlags) & flags); if (updateFlags > 0) { From 63dd5cb9eb2408e21c45ffb91180500e307999be Mon Sep 17 00:00:00 2001 From: Dariel Marlow Date: Mon, 16 Apr 2018 12:45:04 -0700 Subject: [PATCH 024/122] Update XmlLayoutSchemaLog4j.cs Use prefix and ns to play nice with XmlWriter --- src/log4net/Layout/XmlLayoutSchemaLog4j.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/log4net/Layout/XmlLayoutSchemaLog4j.cs b/src/log4net/Layout/XmlLayoutSchemaLog4j.cs index fe66d5974..19dde79db 100644 --- a/src/log4net/Layout/XmlLayoutSchemaLog4j.cs +++ b/src/log4net/Layout/XmlLayoutSchemaLog4j.cs @@ -172,7 +172,7 @@ protected override void FormatXml(XmlWriter writer, LoggingEvent loggingEvent) } // Write the start element - writer.WriteStartElement("log4j:event"); + writer.WriteStartElement("log4j", "event", "log4net"); writer.WriteAttributeString("logger", loggingEvent.LoggerName); // Calculate the timestamp as the number of milliseconds since january 1970 @@ -187,7 +187,7 @@ protected override void FormatXml(XmlWriter writer, LoggingEvent loggingEvent) writer.WriteAttributeString("thread", loggingEvent.ThreadName); // Append the message text - writer.WriteStartElement("log4j:message"); + writer.WriteStartElement("log4j", "message", "log4net"); Transform.WriteEscapedXmlString(writer, loggingEvent.RenderedMessage,this.InvalidCharReplacement); writer.WriteEndElement(); @@ -199,7 +199,7 @@ protected override void FormatXml(XmlWriter writer, LoggingEvent loggingEvent) if (valueStr != null && valueStr.Length > 0) { // Append the NDC text - writer.WriteStartElement("log4j:NDC"); + writer.WriteStartElement("log4j", "NDC", "log4net"); Transform.WriteEscapedXmlString(writer, valueStr,this.InvalidCharReplacement); writer.WriteEndElement(); } @@ -209,10 +209,10 @@ protected override void FormatXml(XmlWriter writer, LoggingEvent loggingEvent) PropertiesDictionary properties = loggingEvent.GetProperties(); if (properties.Count > 0) { - writer.WriteStartElement("log4j:properties"); + writer.WriteStartElement("log4j", "properties", "log4net"); foreach(System.Collections.DictionaryEntry entry in properties) { - writer.WriteStartElement("log4j:data"); + writer.WriteStartElement("log4j", "data", "log4net"); writer.WriteAttributeString("name", (string)entry.Key); // Use an ObjectRenderer to convert the object to a string @@ -228,7 +228,7 @@ protected override void FormatXml(XmlWriter writer, LoggingEvent loggingEvent) if (exceptionStr != null && exceptionStr.Length > 0) { // Append the stack trace line - writer.WriteStartElement("log4j:throwable"); + writer.WriteStartElement("log4j", "throwable", "log4net"); Transform.WriteEscapedXmlString(writer, exceptionStr,this.InvalidCharReplacement); writer.WriteEndElement(); } @@ -237,7 +237,7 @@ protected override void FormatXml(XmlWriter writer, LoggingEvent loggingEvent) { LocationInfo locationInfo = loggingEvent.LocationInformation; - writer.WriteStartElement("log4j:locationInfo"); + writer.WriteStartElement("log4j", "locationInfo", "log4net"); writer.WriteAttributeString("class", locationInfo.ClassName); writer.WriteAttributeString("method", locationInfo.MethodName); writer.WriteAttributeString("file", locationInfo.FileName); From afaa96819eba0f93038e5397b5a4529d19a7be17 Mon Sep 17 00:00:00 2001 From: Davyd McColl Date: Mon, 25 Oct 2021 15:52:56 +0200 Subject: [PATCH 025/122] :wrench: provide different name for rolling mutex from file mutex (LOG4NET-583) --- src/log4net/Appender/RollingFileAppender.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/log4net/Appender/RollingFileAppender.cs b/src/log4net/Appender/RollingFileAppender.cs index b5bf2532e..f53dd7888 100644 --- a/src/log4net/Appender/RollingFileAppender.cs +++ b/src/log4net/Appender/RollingFileAppender.cs @@ -1160,7 +1160,11 @@ public override void ActivateOptions() #if !NETCF // initialize the mutex that is used to lock rolling - m_mutexForRolling = new Mutex(false, m_baseFileName.Replace("\\", "_").Replace(":", "_").Replace("/", "_")); + m_mutexForRolling = new Mutex(false, m_baseFileName + .Replace("\\", "_") + .Replace(":", "_") + .Replace("/", "_") + "_rolling" + ); #endif if (m_rollDate && File != null && m_scheduledFilename == null) From 26841fdd2c550a5202c38fdf02b75c7207401268 Mon Sep 17 00:00:00 2001 From: Davyd McColl Date: Mon, 25 Oct 2021 16:00:46 +0200 Subject: [PATCH 026/122] :memo: add docs on 2.0.13 release --- src/site/xdoc/release/release-notes.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/site/xdoc/release/release-notes.xml b/src/site/xdoc/release/release-notes.xml index f6e28e4de..9b2a57ce5 100644 --- a/src/site/xdoc/release/release-notes.xml +++ b/src/site/xdoc/release/release-notes.xml @@ -27,6 +27,20 @@ limitations under the License.

+ Apache log4net 2.0.13 is a minor release to address some reported issues + and accept some pull requests provided by community members: +

Addresses issue [LOG4NET-583] with proposed solution by Emmo Emminghaus, + namely to provide an unique mutex identifier for the file rolling logic.
Accepts pull request 76 by @dschwartzni + to allow the netstandard2.0 library to be used within net472 web services
Accepts pull request 18 by @dmarlow + to update the xml layout mimicking log4j

Apache log4net 2.0.12 is a minor fix release to address reported issues on From 92267c9447a3bb6bb749253428294e2d655970ec Mon Sep 17 00:00:00 2001 From: Davyd McColl Date: Mon, 25 Oct 2021 16:05:46 +0200 Subject: [PATCH 027/122] :bookmark: update versioning to 2.0.13.0 --- src/log4net/AssemblyInfo.cs | 46 +++++++++++++++--------------- src/log4net/AssemblyVersionInfo.cs | 4 +-- src/log4net/Core/LoggingEvent.cs | 3 ++ src/log4net/log4net.csproj | 2 +- 4 files changed, 29 insertions(+), 26 deletions(-) diff --git a/src/log4net/AssemblyInfo.cs b/src/log4net/AssemblyInfo.cs index 21b94e5bf..f7f47aab0 100644 --- a/src/log4net/AssemblyInfo.cs +++ b/src/log4net/AssemblyInfo.cs @@ -53,77 +53,77 @@ // #if (CLI_1_0) -[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-.CLI 1.0")] +[assembly: AssemblyInformationalVersionAttribute("2.0.13.0-.CLI 1.0")] [assembly: AssemblyTitle("Apache log4net for CLI 1.0 Compatible Frameworks")] #elif (NET_1_0) -[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-.NET 1.0")] +[assembly: AssemblyInformationalVersionAttribute("2.0.13.0-.NET 1.0")] [assembly: AssemblyTitle("Apache log4net for .NET Framework 1.0")] #elif (NET_1_1) -[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-.NET 1.1")] +[assembly: AssemblyInformationalVersionAttribute("2.0.13.0-.NET 1.1")] [assembly: AssemblyTitle("Apache log4net for .NET Framework 1.1")] #elif (NET_4_5) -[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-.NET 4.5")] +[assembly: AssemblyInformationalVersionAttribute("2.0.13.0-.NET 4.5")] [assembly: AssemblyTitle("Apache log4net for .NET Framework 4.5")] #elif (NET_4_0) #if CLIENT_PROFILE -[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-.NET 4.0 CP")] +[assembly: AssemblyInformationalVersionAttribute("2.0.13.0-.NET 4.0 CP")] [assembly: AssemblyTitle("Apache log4net for .NET Framework 4.0 Client Profile")] #else -[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-.NET 4.0")] +[assembly: AssemblyInformationalVersionAttribute("2.0.13.0-.NET 4.0")] [assembly: AssemblyTitle("Apache log4net for .NET Framework 4.0")] #endif // Client Profile #elif (NET_3_5) #if CLIENT_PROFILE -[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-.NET 3.5 CP")] +[assembly: AssemblyInformationalVersionAttribute("2.0.13.0-.NET 3.5 CP")] [assembly: AssemblyTitle("Apache log4net for .NET Framework 3.5 Client Profile")] #else -[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-.NET 3.5")] +[assembly: AssemblyInformationalVersionAttribute("2.0.13.0-.NET 3.5")] [assembly: AssemblyTitle("Apache log4net for .NET Framework 3.5")] #endif // Client Profile #elif (NET_2_0) -[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-.NET 2.0")] +[assembly: AssemblyInformationalVersionAttribute("2.0.13.0-.NET 2.0")] [assembly: AssemblyTitle("Apache log4net for .NET Framework 2.0")] #elif (NETCF_1_0) -[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-.NETCF 1.0")] +[assembly: AssemblyInformationalVersionAttribute("2.0.13.0-.NETCF 1.0")] [assembly: AssemblyTitle("Apache log4net for .NET Compact Framework 1.0")] #elif (NETCF_2_0) -[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-.NETCF 2.0")] +[assembly: AssemblyInformationalVersionAttribute("2.0.13.0-.NETCF 2.0")] [assembly: AssemblyTitle("Apache log4net for .NET Compact Framework 2.0")] #elif (MONO_1_0) -[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-Mono 1.0")] +[assembly: AssemblyInformationalVersionAttribute("2.0.13.0-Mono 1.0")] [assembly: AssemblyTitle("Apache log4net for Mono 1.0")] #elif (MONO_2_0) -[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-Mono 2.0")] +[assembly: AssemblyInformationalVersionAttribute("2.0.13.0-Mono 2.0")] [assembly: AssemblyTitle("Apache log4net for Mono 2.0")] #elif (MONO_3_5) -[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-Mono 3.5")] +[assembly: AssemblyInformationalVersionAttribute("2.0.13.0-Mono 3.5")] [assembly: AssemblyTitle("Apache log4net for Mono 3.5")] #elif (MONO_4_0) -[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-Mono 4.0")] +[assembly: AssemblyInformationalVersionAttribute("2.0.13.0-Mono 4.0")] [assembly: AssemblyTitle("Apache log4net for Mono 4.0")] #elif (SSCLI_1_0) -[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-SSCLI 1.0")] +[assembly: AssemblyInformationalVersionAttribute("2.0.13.0-SSCLI 1.0")] [assembly: AssemblyTitle("Apache log4net for Shared Source CLI 1.0")] #elif (NET) -[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-.NET")] +[assembly: AssemblyInformationalVersionAttribute("2.0.13.0-.NET")] [assembly: AssemblyTitle("Apache log4net for .NET Framework")] #elif (NETSTANDARD1_3) -[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-.NET Standard 1.3")] +[assembly: AssemblyInformationalVersionAttribute("2.0.13.0-.NET Standard 1.3")] [assembly: AssemblyTitle("Apache log4net for .NET Standard 1.3")] #elif (NETSTANDARD2_0) -[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-.NET Standard 2.0")] +[assembly: AssemblyInformationalVersionAttribute("2.0.13.0-.NET Standard 2.0")] [assembly: AssemblyTitle("Apache log4net for .NET Standard 2.0")] #elif (NETCF) -[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-.NETCF")] +[assembly: AssemblyInformationalVersionAttribute("2.0.13.0-.NETCF")] [assembly: AssemblyTitle("Apache log4net for .NET Compact Framework")] #elif (MONO) -[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-Mono")] +[assembly: AssemblyInformationalVersionAttribute("2.0.13.0-Mono")] [assembly: AssemblyTitle("Apache log4net for Mono")] #elif (SSCLI) -[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-SSCLI")] +[assembly: AssemblyInformationalVersionAttribute("2.0.13.0-SSCLI")] [assembly: AssemblyTitle("Apache log4net for Shared Source CLI")] #else -[assembly: AssemblyInformationalVersionAttribute("2.0.12.0")] +[assembly: AssemblyInformationalVersionAttribute("2.0.13.0")] [assembly: AssemblyTitle("Apache log4net")] #endif diff --git a/src/log4net/AssemblyVersionInfo.cs b/src/log4net/AssemblyVersionInfo.cs index 1bde4670e..c10b79027 100644 --- a/src/log4net/AssemblyVersionInfo.cs +++ b/src/log4net/AssemblyVersionInfo.cs @@ -28,11 +28,11 @@ // 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.12.0")] +[assembly: System.Reflection.AssemblyVersion("2.0.13.0")] #if !NETCF #if !SSCLI -[assembly: System.Reflection.AssemblyFileVersion("2.0.12.0")] +[assembly: System.Reflection.AssemblyFileVersion("2.0.13.0")] #endif #endif diff --git a/src/log4net/Core/LoggingEvent.cs b/src/log4net/Core/LoggingEvent.cs index 72d0c3c82..4ad16f147 100644 --- a/src/log4net/Core/LoggingEvent.cs +++ b/src/log4net/Core/LoggingEvent.cs @@ -956,7 +956,10 @@ private static string TryGetCurrentUserName() #endif } +#if (NETCF || SSCLI || NETSTANDARD1_3) +#else private static bool _platformDoesNotSupportWindowsIdentity; +#endif ///

/// Gets the identity of the current thread principal. diff --git a/src/log4net/log4net.csproj b/src/log4net/log4net.csproj index 263ed6505..04bd9e2bd 100644 --- a/src/log4net/log4net.csproj +++ b/src/log4net/log4net.csproj @@ -1,7 +1,7 @@ log4net - 2.0.12 + 2.0.13 Codestin Search App Apache log4net From 2323519abdb9aba7f106e4ad11bba34cc6f18805 Mon Sep 17 00:00:00 2001 From: Davyd McColl Date: Tue, 26 Oct 2021 09:33:20 +0200 Subject: [PATCH 028/122] :memo: update downloads page --- src/site/xdoc/download_log4net.xml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/site/xdoc/download_log4net.xml b/src/site/xdoc/download_log4net.xml index a669bda90..da0b91efe 100644 --- a/src/site/xdoc/download_log4net.xml +++ b/src/site/xdoc/download_log4net.xml @@ -36,14 +36,14 @@ limitations under the License.

- - - + + +

apache-log4net-source-2.0.12.zip

sha512

pgp

apache-log4net-source-2.0.13.zip

sha512

pgp

@@ -52,14 +52,14 @@ limitations under the License.

Binaries are available in a zip file or nupkg, which is also available from nuget.org

- - - + + + - - - + + +

log4net-binaries-2.0.12.zip	sha512	pgp	log4net-binaries-2.0.13.zip	sha512	pgp
log4net-2.0.12.nupkg	sha512	pgp	log4net-2.0.13.nupkg	sha512	pgp

From 1cb560cc444e8685a270fe0a2b33c7be1f2947ed Mon Sep 17 00:00:00 2001 From: Davyd McColl Date: Tue, 26 Oct 2021 11:14:12 +0200 Subject: [PATCH 029/122] :memo: add release docs, move sub-docs to docs folder --- README.md | 6 ++- BUILDING.md => doc/BUILDING.md | 0 CONTRIBUTING.md => doc/CONTRIBUTING.md | 0 doc/RELEASING.md | 60 ++++++++++++++++++++++++++ doc/sign-log4net-libraries.sh | 13 ++++++ 5 files changed, 77 insertions(+), 2 deletions(-) rename BUILDING.md => doc/BUILDING.md (100%) rename CONTRIBUTING.md => doc/CONTRIBUTING.md (100%) create mode 100644 doc/RELEASING.md create mode 100644 doc/sign-log4net-libraries.sh diff --git a/README.md b/README.md index df840235c..85e2fdbfb 100644 --- a/README.md +++ b/README.md @@ -42,5 +42,7 @@ may be installed by using the bundled helper scripts: These scripts download the relevant installers from Microsoft servers, but you run them at your own risk. -Please see [CONTRIBUTING.md](CONTRIBUTING.md) and -[BUILDING.md](BUILDING.md) +Please see +- [CONTRIBUTING.md](doc/CONTRIBUTING.md) +- [BUILDING.md](doc/BUILDING.md) +- [RELEASING.md](doc/RELEASING.md) diff --git a/BUILDING.md b/doc/BUILDING.md similarity index 100% rename from BUILDING.md rename to doc/BUILDING.md diff --git a/CONTRIBUTING.md b/doc/CONTRIBUTING.md similarity index 100% rename from CONTRIBUTING.md rename to doc/CONTRIBUTING.md diff --git a/doc/RELEASING.md b/doc/RELEASING.md new file mode 100644 index 000000000..a38fd4786 --- /dev/null +++ b/doc/RELEASING.md @@ -0,0 +1,60 @@ +Log4Net Release procedure +--- + +This serves to document the release procedure for log4net, which is probably +more of interest to maintainers than anyone else, but I've found that there +are enough moving parts and time between releases to make the process more +difficult than it needs to be. Some parts are automated and others can be in +the future. + +Assuming the code is in a place where a release can be made, for the imagined +release version 2.0.123: + +1. Update the documentation under `src/site` + - minimally, this means at least: + - `src/site/xdoc/release/release-notes.xml` + - copy an existing release section & think about: + - what does this release change? + - bug fixes? + - enhancements + - don't forget to mention contributors + - people who reported issues + - people who created pull requests + - people who suggested code that was implemented + - `src/site/xdoc/download_log4net.xml` + - you should be able to search & replace on the prior version + for the new one you're about to create +2. Update the log4net.csproj file with this new version +3. Build release artifacts with `npm run release` + - if this doesn't work, you may need to `npm ci` first! + - currently, this _must_ happen on a windows machine because of older + .net framework requirements which cannot be met on a Linux machine + (or at least, I haven't figured out how - in particular CF) +4. Sign release artifacts (zips & nupkg) under `build/artifacts` + - eg `gpg --argmor --output log4net-2.0.123.nupkg.asc --detach-sig log4net-2.0.123.nupkg` + - there is an accompanying `sign-log4net-libraries.sh` which you could invoke if you cd + into the `build/artifacts` folder + - I build on Windows and sign on Linux as my build machine belongs to my company + and I don't want to store keys there. Always protect your keys fervently! +5. Clone out the log4net doc repo (https://github.com/apache/logging-log4net-site) + - check out the `asf-staging` branch + - create a folder which includes the version, eg `log4net-2.0.123` +6. Copy the contents of `target/site` from this repo into the folder created in (5) +7. Update the symlinks in the base of the docs repo, ie: + - 2.0.x -> 2.0.123 + - 2.x -> 2.0.123 +8. update the `doap_log4net.rdf` to point to the new release + - (copy-paste-modify an existing release) +9. update the `.htaccess` file + - the trailing RewriteRule should point to the new log4net-2.0.123 folder +10. push the `asf-staging` branch to github and wait a bit + - after a minute or two, check the updates at https://logging.staged.apache.org/log4net + - are you seeing the correct releases page? + - are you seeing the correct downloads page? + - download links should (at this point) not work +11. create an rc-releasd at GitHub with a tag like `rc/2.0.123` + - attach all the files from the build/artifacts folder, _including signatures_ +12. get the artifacts in build/artifacts up to https://downloads.apache.org/logging/log4net/ + - currently, I have to as another ASF member for help with this + - I also see release notes there - which are out of date (don't know how to update) + diff --git a/doc/sign-log4net-libraries.sh b/doc/sign-log4net-libraries.sh new file mode 100644 index 000000000..55d5767b0 --- /dev/null +++ b/doc/sign-log4net-libraries.sh @@ -0,0 +1,13 @@ +#!/bin/bash +# see https://infra.apache.org/release-signing#openpgp-ascii-detach-sig +DID_SOMETHING=0 +for f in log4net*.nupkg log4net*.zip; do + DID_SOMETHING=1 + echo "signing: $f" + gpg --armor --output $f.asc --detach-sig $f +done + +if test "$DID_SOMETHING" = "0"; then + echo "No log4net artifacts found - are you sure you're in the right directory?" + exit 2 +fi From 9d039a84e2bc6308771136e9530e7eba94083db6 Mon Sep 17 00:00:00 2001 From: Davyd McColl Date: Thu, 28 Oct 2021 09:30:57 +0200 Subject: [PATCH 030/122] :package: build zip artifacts with containing folder --- local-tasks/zip.js | 25 +++++++++++++++++++------ package-lock.json | 6 ++++++ package.json | 2 ++ 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/local-tasks/zip.js b/local-tasks/zip.js index cbfce84d8..1225a21c1 100644 --- a/local-tasks/zip.js +++ b/local-tasks/zip.js @@ -3,21 +3,31 @@ const promisify = requireModule("promisify-stream"), readCsProjVersion = requireModule("read-csproj-version"), target = "build/artifacts", + debug = require("gulp-debug"), + rename = require("gulp-rename"), zip = require("gulp-zip"); -gulp.task("zip", [ "zip-binaries", "zip-source"], () => Promise.resolve()); +gulp.task("zip", ["zip-binaries", "zip-source"], () => Promise.resolve()); gulp.task("zip-binaries", async () => { - const version = await readVersion(); + const + version = await readVersion(), + baseDir = `apache-log4net-binaries-${version}`; return promisify( gulp.src(["build/Release/**/*", "LICENSE", "NOTICE"]) - .pipe(zip(`log4net-binaries-${version}.zip`)) + .pipe(rename(path => { + path.dirname = `${baseDir}/${path.dirname}` + })) + .pipe(zip(`${baseDir}.zip`)) .pipe(gulp.dest(target)) ); }); gulp.task("zip-source", async () => { - const version = await readVersion(); + const + version = await readVersion(), + baseDir = `apache-log4net-source-${version}`; + return promisify( gulp.src([ "**/*", @@ -32,8 +42,11 @@ gulp.task("zip-source", async () => { "!.idea", "!.idea/**/*" ]) - .pipe(zip(`log4net-source-${version}.zip`)) - .pipe(gulp.dest(target)) + .pipe(rename(path => { + path.dirname = `${baseDir}/${path.dirname}` + })) + .pipe(zip(`${baseDir}.zip`)) + .pipe(gulp.dest(target)) ); }); diff --git a/package-lock.json b/package-lock.json index e02ddb9ee..0062e1cbb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2622,6 +2622,12 @@ } } }, + "gulp-rename": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-2.0.0.tgz", + "integrity": "sha512-97Vba4KBzbYmR5VBs9mWmK+HwIf5mj+/zioxfZhOKeXtx5ZjBk57KFlePf5nxq9QsTtFl0ejnHE3zTC9MHXqyQ==", + "dev": true + }, "gulp-zip": { "version": "5.0.2", "resolved": "https://registry.npmjs.org/gulp-zip/-/gulp-zip-5.0.2.tgz", diff --git a/package.json b/package.json index b535be677..5523fe717 100644 --- a/package.json +++ b/package.json @@ -29,6 +29,8 @@ "homepage": "https://github.com/fluffynuts/logging-log4net#readme", "devDependencies": { "cross-env": "^7.0.2", + "gulp-debug": "^4.0.0", + "gulp-rename": "^2.0.0", "gulp-zip": "^5.0.2", "npm-run-all": "^4.1.5", "rimraf": "^3.0.2", From d880d946f2c7a7350566f682576958e831c4eb83 Mon Sep 17 00:00:00 2001 From: Davyd McColl Date: Fri, 5 Nov 2021 16:43:31 +0200 Subject: [PATCH 031/122] :memo: add reminders to release nupkg & update live docs --- doc/RELEASING.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/doc/RELEASING.md b/doc/RELEASING.md index a38fd4786..5a46eb5c1 100644 --- a/doc/RELEASING.md +++ b/doc/RELEASING.md @@ -57,4 +57,12 @@ release version 2.0.123: 12. get the artifacts in build/artifacts up to https://downloads.apache.org/logging/log4net/ - currently, I have to as another ASF member for help with this - I also see release notes there - which are out of date (don't know how to update) +13. raise a vote on the log4net mailing list (dev@logging.apache.org) +14. wait +15. when the vote has 3 or more +1's, it's time to go live! +16. push the .nupkg to nuget.org +17. don't forget to make the docs live: in the logging-log4net-site folder: + - `git checkout asf-site` + - `git pull --rebase` + - `git merge asf-staging` From 0c4e916693456d541b6ed327123d3a832419bfa5 Mon Sep 17 00:00:00 2001 From: Tsar Nikolay Date: Tue, 23 Nov 2021 12:58:31 +0500 Subject: [PATCH 032/122] Fix AdoNetAppender using npgsql once again. --- src/log4net/Appender/AdoNetAppender.cs | 28 +++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/src/log4net/Appender/AdoNetAppender.cs b/src/log4net/Appender/AdoNetAppender.cs index 2f6edfbb0..b5d05842d 100644 --- a/src/log4net/Appender/AdoNetAppender.cs +++ b/src/log4net/Appender/AdoNetAppender.cs @@ -557,23 +557,26 @@ protected virtual void SendBuffer(IDbTransaction dbTran, LoggingEvent[] events) try { // prepare the command, which is significantly faster - dbCmd.Prepare(); + Prepare(dbCmd); } catch (Exception) { + if (dbTran != null) + { + // rethrow exception in transaction mode, cuz now transaction is in failed state + throw; + } + // ignore prepare exceptions as they can happen without affecting actual logging, eg on npgsql } // run for all events foreach (LoggingEvent e in events) { - // clear parameters that have been set - dbCmd.Parameters.Clear(); - + // No need to clear dbCmd.Parameters, just use existing. // Set the parameter values foreach (AdoNetAppenderParameter param in m_parameters) { - param.Prepare(dbCmd); param.FormatValue(dbCmd, e); } @@ -606,6 +609,21 @@ protected virtual void SendBuffer(IDbTransaction dbTran, LoggingEvent[] events) } } + ///

+ /// Prepare entire database command object to be executed. + ///

+ /// The command to prepare. + protected virtual void Prepare(IDbCommand dbCmd) + { + // npgsql require parameters to prepare command + foreach (AdoNetAppenderParameter parameter in m_parameters) + { + parameter.Prepare(dbCmd); + } + + dbCmd.Prepare(); + } + ///

/// Formats the log message into database statement text. ///

From a17282a45509cd8d23695ded3938958cfe21ccd0 Mon Sep 17 00:00:00 2001 From: Erik Mavrinac Date: Wed, 1 Dec 2021 11:29:29 -0800 Subject: [PATCH 033/122] For %thread/%t, use the numeric thread ID for .NET worker pool threads --- src/log4net/Core/LoggingEvent.cs | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/log4net/Core/LoggingEvent.cs b/src/log4net/Core/LoggingEvent.cs index 4ad16f147..678e62ece 100644 --- a/src/log4net/Core/LoggingEvent.cs +++ b/src/log4net/Core/LoggingEvent.cs @@ -835,10 +835,16 @@ public string ThreadName m_data.ThreadName = SystemInfo.CurrentThreadId.ToString(System.Globalization.NumberFormatInfo.InvariantInfo); #else - m_data.ThreadName = System.Threading.Thread.CurrentThread.Name; - if (m_data.ThreadName == null || m_data.ThreadName.Length == 0) + // '.NET ThreadPool Worker' appears as a default thread pool name in .NET 6+. + // Prefer the numeric thread ID instead. + string threadName = System.Threading.Thread.CurrentThread.Name; + if (!string.IsNullOrEmpty(threadName) && threadName != ".NET ThreadPool Worker") { - // The thread name is not available. Therefore we + m_data.ThreadName = threadName; + } + else + { + // The thread name is not available or unsuitable. Therefore we // go the the AppDomain to get the ID of the // current thread. (Why don't Threads know their own ID?) try @@ -847,7 +853,7 @@ public string ThreadName SystemInfo.CurrentThreadId.ToString(System.Globalization.NumberFormatInfo .InvariantInfo); } - catch (System.Security.SecurityException) + catch (SecurityException) { // This security exception will occur if the caller does not have // some undefined set of SecurityPermission flags. From 6ad127beb564d4381af634f495df2c14d55d7213 Mon Sep 17 00:00:00 2001 From: Erik Mavrinac Date: Wed, 1 Dec 2021 13:46:33 -0800 Subject: [PATCH 034/122] (LOG4NET-671) Dispose WindowsIdentity in TryGetCurrentUserName() --- src/log4net/Core/LoggingEvent.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/log4net/Core/LoggingEvent.cs b/src/log4net/Core/LoggingEvent.cs index 4ad16f147..d7fd3987a 100644 --- a/src/log4net/Core/LoggingEvent.cs +++ b/src/log4net/Core/LoggingEvent.cs @@ -931,8 +931,10 @@ private static string TryGetCurrentUserName() try { - var windowsIdentity = WindowsIdentity.GetCurrent(); - return windowsIdentity?.Name ?? ""; + using (WindowsIdentity windowsIdentity = WindowsIdentity.GetCurrent()) + { + return windowsIdentity?.Name ?? ""; + } } catch (PlatformNotSupportedException) { From 94103257c8909af4926ac3c732a6aba46e166351 Mon Sep 17 00:00:00 2001 From: Davyd McColl Date: Wed, 15 Dec 2021 07:54:54 +0200 Subject: [PATCH 035/122] :memo: add doc about creating rel tag at release --- doc/RELEASING.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/RELEASING.md b/doc/RELEASING.md index 5a46eb5c1..584bf5cca 100644 --- a/doc/RELEASING.md +++ b/doc/RELEASING.md @@ -52,11 +52,11 @@ release version 2.0.123: - are you seeing the correct releases page? - are you seeing the correct downloads page? - download links should (at this point) not work -11. create an rc-releasd at GitHub with a tag like `rc/2.0.123` +11. create an rc-releasd at GitHub with a tag like `rc/2.0.123-rc1` - attach all the files from the build/artifacts folder, _including signatures_ 12. get the artifacts in build/artifacts up to https://downloads.apache.org/logging/log4net/ - currently, I have to as another ASF member for help with this - - I also see release notes there - which are out of date (don't know how to update) + - I also see release notes there - which are out of date (don't know how to update) 13. raise a vote on the log4net mailing list (dev@logging.apache.org) 14. wait 15. when the vote has 3 or more +1's, it's time to go live! @@ -65,4 +65,6 @@ release version 2.0.123: - `git checkout asf-site` - `git pull --rebase` - `git merge asf-staging` +18. rename the release at github, eg to `rel/2.0.123` + - double-check that the `rel` tag is created From 1a9c7579201cf5c0fec6725c9ee1fd8edc0c9819 Mon Sep 17 00:00:00 2001 From: Davyd McColl Date: Wed, 24 Nov 2021 13:12:38 +0200 Subject: [PATCH 036/122] :bug: should not attempt to reference into null value to get type --- src/log4net.Tests/log4net.Tests.csproj | 3 +- .../Util/ReadOnlyPropertiesDictionary.cs | 35 ++++++++++++------- src/log4net/log4net.csproj | 2 +- 3 files changed, 26 insertions(+), 14 deletions(-) diff --git a/src/log4net.Tests/log4net.Tests.csproj b/src/log4net.Tests/log4net.Tests.csproj index 7da2aaf42..58e1b90c4 100644 --- a/src/log4net.Tests/log4net.Tests.csproj +++ b/src/log4net.Tests/log4net.Tests.csproj @@ -1,6 +1,7 @@ net462;netcoreapp1.0;netcoreapp2.1;netcoreapp3.1 + NETSDK1138;CS1701 Local JScript Grid @@ -62,7 +63,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/log4net/Util/ReadOnlyPropertiesDictionary.cs b/src/log4net/Util/ReadOnlyPropertiesDictionary.cs index 0d51fc939..be37baf04 100644 --- a/src/log4net/Util/ReadOnlyPropertiesDictionary.cs +++ b/src/log4net/Util/ReadOnlyPropertiesDictionary.cs @@ -106,7 +106,7 @@ public ReadOnlyPropertiesDictionary(ReadOnlyPropertiesDictionary propertiesDicti /// protected ReadOnlyPropertiesDictionary(SerializationInfo info, StreamingContext context) { - foreach(SerializationEntry entry in info) + foreach(var entry in info) { // The keys are stored as Xml encoded names InnerHashtable[XmlConvert.DecodeName(entry.Name)] = entry.Value; @@ -129,7 +129,7 @@ protected ReadOnlyPropertiesDictionary(SerializationInfo info, StreamingContext /// public string[] GetKeys() { - string[] keys = new String[InnerHashtable.Count]; + var keys = new String[InnerHashtable.Count]; InnerHashtable.Keys.CopyTo(keys, 0); return keys; } @@ -214,22 +214,33 @@ public virtual void GetObjectData(SerializationInfo info, StreamingContext conte { foreach(DictionaryEntry entry in InnerHashtable.Clone() as IDictionary) { - string entryKey = entry.Key as string; - object entryValue = entry.Value; + var entryKey = entry.Key as string; + if (entryKey is null) + { + continue; + } + + var entryValue = entry.Value; // If value is serializable then we add it to the list #if NETSTANDARD1_3 - bool isSerializable = entryValue.GetType().GetTypeInfo().IsSerializable; + var isSerializable = entryValue?.GetType().GetTypeInfo().IsSerializable ?? false; #else - bool isSerializable = entryValue.GetType().IsSerializable; + var isSerializable = entryValue?.GetType().IsSerializable ?? false; #endif - if (entryKey != null && entryValue != null && isSerializable) + if (!isSerializable) + { + continue; + } + + // Store the keys as an Xml encoded local name as it may contain colons (':') + // which are NOT escaped by the Xml Serialization framework. + // This must be a bug in the serialization framework as we cannot be expected + // to know the implementation details of all the possible transport layers. + var localKeyName = XmlConvert.EncodeLocalName(entryKey); + if (localKeyName is not null) { - // Store the keys as an Xml encoded local name as it may contain colons (':') - // which are NOT escaped by the Xml Serialization framework. - // This must be a bug in the serialization framework as we cannot be expected - // to know the implementation details of all the possible transport layers. - info.AddValue(XmlConvert.EncodeLocalName(entryKey), entryValue); + info.AddValue(localKeyName, entryValue); } } } diff --git a/src/log4net/log4net.csproj b/src/log4net/log4net.csproj index 04bd9e2bd..4115607ec 100644 --- a/src/log4net/log4net.csproj +++ b/src/log4net/log4net.csproj @@ -191,7 +191,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive From 0cace90781ee3c648f6cbd88fe6140d1839f3351 Mon Sep 17 00:00:00 2001 From: Davyd McColl Date: Thu, 16 Dec 2021 10:09:39 +0200 Subject: [PATCH 037/122] :construction: prepare for 2.0.14 release --- STATUS.txt | 4 +- doc/BUILDING.md | 3 + install-net-framework-sdk-3.5.ps1 | 27 +- package-lock.json | 1010 +++++++++++++++-------- package.json | 2 +- src/log4net/AssemblyInfo.cs | 46 +- src/log4net/log4net.csproj | 14 +- src/site/xdoc/download_log4net.xml | 18 +- src/site/xdoc/release/release-notes.xml | 14 + 9 files changed, 746 insertions(+), 392 deletions(-) diff --git a/STATUS.txt b/STATUS.txt index a4ba7b62d..f9e0e9d82 100644 --- a/STATUS.txt +++ b/STATUS.txt @@ -4,7 +4,7 @@ APACHE LOG4NET PROJECT STATUS Project Status ============== -Apache log4net is a dormant sub project of the Apache Logging Services project. +Apache log4net is a sub project of the Apache Logging Services project. Apache log4net graduated from the Apache Incubator in February 2007. @@ -21,7 +21,7 @@ Mailing Lists: Active Committers ================= -None +* Davyd McColl (davydm) Former Committers ================ diff --git a/doc/BUILDING.md b/doc/BUILDING.md index 2330e8cfb..597aafaf1 100644 --- a/doc/BUILDING.md +++ b/doc/BUILDING.md @@ -14,6 +14,9 @@ Options: - include desktop targets at least - include dotnet core targets or download and install the latest dotnet sdk (you will need at least v2.1) + - note that build is possible with VS2022 build tools, but I had to + install VS2019 build tools _as well_ to get msbuild to recognise + the legacy net35-profile target - Ensure you have .NET Framework 3.5 SP1 installed - on Win10+, this can only be installed via Add/Remove Windows Components - on other platforms, see https://dotnet.microsoft.com/download/dotnet-framework/net35-sp1 diff --git a/install-net-framework-sdk-3.5.ps1 b/install-net-framework-sdk-3.5.ps1 index f2b010819..e78fa37f2 100644 --- a/install-net-framework-sdk-3.5.ps1 +++ b/install-net-framework-sdk-3.5.ps1 @@ -1,6 +1,25 @@ -Write-Host "Downloading dotnetfx35.exe" -Invoke-WebRequest -Uri "https://download.microsoft.com/download/2/0/E/20E90413-712F-438C-988E-FDAA79A8AC3D/dotnetfx35.exe" -OutFile dotnetfx35.exe +if (-not (Test-Path dotnetfx35.exe)) { + Write-Host "Downloading dotnetfx35.exe" + Invoke-WebRequest -Uri "https://download.microsoft.com/download/2/0/E/20E90413-712F-438C-988E-FDAA79A8AC3D/dotnetfx35.exe" -OutFile dotnetfx35.exe +} + Write-Host "Running dotnetfx35.exe" -Start-Process -FilePath dotnetfx35.exe -ArgumentList "/wait","/passive" -Wait -Write-Host "dotnetfx35 installed" +$process = Start-Process -FilePath dotnetfx35.exe -ArgumentList "/wait","/passive" -Wait -PassThru +if ($process.ExitCode -eq 0) { + Write-Host "dotnetfx35 installed" +} else { + Write-Host "dotnetfx35 installer returned exit code ${process.ExitCode}" +} + +if (-not (Test-Path dotnetfx35client.exe)) { + Write-host "Downloading dotnetfx35client.exe" + Invoke-WebRequest -Uri "https://download.microsoft.com/download/c/d/c/cdc0f321-4f72-4a08-9bac-082f3692ecd9/DotNetFx35Client.exe" -OutFile dotnetfx35client.exe +} +Write-Host "Running dotnetfx35client.exe" +$process = Start-Process -FilePath dotnetfx35client.exe -ArgumentList "/quiet","/passive" -Wait -PassThru +if ($process.ExitCode -eq 0) { + Write-Host "dotnetfx35client installed" +} else { + Write-Host "dotnetfx35client installer returned exit code ${process.ExitCode}" +} diff --git a/package-lock.json b/package-lock.json index 0062e1cbb..0af47db34 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,28 +20,28 @@ "dev": true }, "@nodelib/fs.scandir": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz", - "integrity": "sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==", + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", "dev": true, "requires": { - "@nodelib/fs.stat": "2.0.3", + "@nodelib/fs.stat": "2.0.5", "run-parallel": "^1.1.9" } }, "@nodelib/fs.stat": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz", - "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", "dev": true }, "@nodelib/fs.walk": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz", - "integrity": "sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==", + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", "dev": true, "requires": { - "@nodelib/fs.scandir": "2.1.3", + "@nodelib/fs.scandir": "2.1.5", "fastq": "^1.6.0" } }, @@ -60,16 +60,10 @@ "defer-to-connect": "^1.0.1" } }, - "@types/color-name": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz", - "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==", - "dev": true - }, "@types/glob": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz", - "integrity": "sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz", + "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==", "dev": true, "requires": { "@types/minimatch": "*", @@ -77,21 +71,21 @@ } }, "@types/minimatch": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz", - "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz", + "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==", "dev": true }, "@types/node": { - "version": "14.6.4", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.6.4.tgz", - "integrity": "sha512-Wk7nG1JSaMfMpoMJDKUsWYugliB2Vy55pdjLpmLixeyMi7HizW2I/9QoxsPCkXl3dO+ZOVqPumKaDUv5zJu2uQ==", + "version": "17.0.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.0.tgz", + "integrity": "sha512-eMhwJXc931Ihh4tkU+Y7GiLzT/y/DBNpNtr4yU9O2w3SYBsr9NaOPhQlLKRmoWtI54uNwuo0IOUFQjVOTZYRvw==", "dev": true }, "@types/xml2js": { - "version": "0.4.5", - "resolved": "https://registry.npmjs.org/@types/xml2js/-/xml2js-0.4.5.tgz", - "integrity": "sha512-yohU3zMn0fkhlape1nxXG2bLEGZRc1FeqF80RoHaYXJN7uibaauXfhzhOJr1Xh36sn+/tx21QAOf07b/xYVk1w==", + "version": "0.4.9", + "resolved": "https://registry.npmjs.org/@types/xml2js/-/xml2js-0.4.9.tgz", + "integrity": "sha512-CHiCKIihl1pychwR2RNX5mAYmJDACgFVCMT5OArMaO3erzwXVcBqPcusr+Vl8yeeXukxZqtF8mZioqX+mpjjdw==", "dev": true, "requires": { "@types/node": "*" @@ -114,9 +108,9 @@ } }, "ajv": { - "version": "6.12.4", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.4.tgz", - "integrity": "sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==", + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", @@ -126,44 +120,44 @@ } }, "ansi-align": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz", - "integrity": "sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz", + "integrity": "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==", "dev": true, "requires": { - "string-width": "^3.0.0" + "string-width": "^4.1.0" }, "dependencies": { "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true }, "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "dev": true }, "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" } }, "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, "requires": { - "ansi-regex": "^4.1.0" + "ansi-regex": "^5.0.1" } } } @@ -482,14 +476,104 @@ "dev": true }, "array.prototype.flatmap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.2.3.tgz", - "integrity": "sha512-OOEk+lkePcg+ODXIpvuU9PAryCikCJyo7GlDG1upleEpQRx6mzL9puEBkozQ5iAx20KV0l3DbyQwqciJtqe5Pg==", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.2.5.tgz", + "integrity": "sha512-08u6rVyi1Lj7oqWbS9nUxliETrtIROT4XGTA4D/LWGten6E3ocm7cy9SIrmNHOL5XVbVuckUp3X6Xyg8/zpvHA==", "dev": true, "requires": { + "call-bind": "^1.0.0", "define-properties": "^1.1.3", - "es-abstract": "^1.17.0-next.1", - "function-bind": "^1.1.1" + "es-abstract": "^1.19.0" + }, + "dependencies": { + "es-abstract": { + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz", + "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "get-intrinsic": "^1.1.1", + "get-symbol-description": "^1.0.0", + "has": "^1.0.3", + "has-symbols": "^1.0.2", + "internal-slot": "^1.0.3", + "is-callable": "^1.2.4", + "is-negative-zero": "^2.0.1", + "is-regex": "^1.1.4", + "is-shared-array-buffer": "^1.0.1", + "is-string": "^1.0.7", + "is-weakref": "^1.0.1", + "object-inspect": "^1.11.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.2", + "string.prototype.trimend": "^1.0.4", + "string.prototype.trimstart": "^1.0.4", + "unbox-primitive": "^1.0.1" + } + }, + "has-symbols": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz", + "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==", + "dev": true + }, + "is-callable": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz", + "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==", + "dev": true + }, + "is-regex": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", + "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" + } + }, + "object-inspect": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.1.tgz", + "integrity": "sha512-If7BjFlpkzzBeV1cqgT3OSWT3azyoxDGajR+iGnFBfVV2EWyDyWaZZW2ERDjUaY2QM8i5jI3Sj7mhsM4DDAqWA==", + "dev": true + }, + "object.assign": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz", + "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==", + "dev": true, + "requires": { + "call-bind": "^1.0.0", + "define-properties": "^1.1.3", + "has-symbols": "^1.0.1", + "object-keys": "^1.1.1" + } + }, + "string.prototype.trimend": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz", + "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.3" + } + }, + "string.prototype.trimstart": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz", + "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.3" + } + } } }, "arrify": { @@ -499,9 +583,9 @@ "dev": true }, "asn1": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", - "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", + "version": "0.2.6", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz", + "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==", "dev": true, "requires": { "safer-buffer": "~2.1.0" @@ -565,9 +649,9 @@ "dev": true }, "aws4": { - "version": "1.10.1", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.1.tgz", - "integrity": "sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz", + "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==", "dev": true }, "bach": { @@ -674,47 +758,46 @@ } }, "boxen": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/boxen/-/boxen-4.2.0.tgz", - "integrity": "sha512-eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/boxen/-/boxen-5.1.2.tgz", + "integrity": "sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ==", "dev": true, "requires": { "ansi-align": "^3.0.0", - "camelcase": "^5.3.1", - "chalk": "^3.0.0", - "cli-boxes": "^2.2.0", - "string-width": "^4.1.0", - "term-size": "^2.1.0", - "type-fest": "^0.8.1", - "widest-line": "^3.1.0" + "camelcase": "^6.2.0", + "chalk": "^4.1.0", + "cli-boxes": "^2.2.1", + "string-width": "^4.2.2", + "type-fest": "^0.20.2", + "widest-line": "^3.1.0", + "wrap-ansi": "^7.0.0" }, "dependencies": { "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true }, "ansi-styles": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", - "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, "requires": { - "@types/color-name": "^1.1.1", "color-convert": "^2.0.1" } }, "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.1.tgz", + "integrity": "sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA==", "dev": true }, "chalk": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", - "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, "requires": { "ansi-styles": "^4.1.0", @@ -736,12 +819,6 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -755,23 +832,23 @@ "dev": true }, "string-width": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", - "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, "requires": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" + "strip-ansi": "^6.0.1" } }, "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, "requires": { - "ansi-regex": "^5.0.0" + "ansi-regex": "^5.0.1" } }, "supports-color": { @@ -782,6 +859,17 @@ "requires": { "has-flag": "^4.0.0" } + }, + "wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + } } } }, @@ -817,9 +905,9 @@ "dev": true }, "buffer-from": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", - "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", "dev": true }, "cache-base": { @@ -881,6 +969,16 @@ } } }, + "call-bind": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", + "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "dev": true, + "requires": { + "function-bind": "^1.1.1", + "get-intrinsic": "^1.0.2" + } + }, "camelcase": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", @@ -1232,9 +1330,9 @@ } }, "convert-source-map": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", - "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==", + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz", + "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==", "dev": true, "requires": { "safe-buffer": "~5.1.1" @@ -1247,13 +1345,21 @@ "dev": true }, "copy-props": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.4.tgz", - "integrity": "sha512-7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.5.tgz", + "integrity": "sha512-XBlx8HSqrT0ObQwmSzM7WE5k8FxTV75h1DX1Z3n6NhQ/UYYAvInWYmG06vFt7hQZArE2fuO62aihiWIVQwh1sw==", "dev": true, "requires": { - "each-props": "^1.3.0", - "is-plain-object": "^2.0.1" + "each-props": "^1.3.2", + "is-plain-object": "^5.0.0" + }, + "dependencies": { + "is-plain-object": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz", + "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==", + "dev": true + } } }, "core-util-is": { @@ -1451,9 +1557,9 @@ "dev": true }, "didyoumean": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.1.tgz", - "integrity": "sha1-6S7f2tplN9SE1zwBcv0eugxJdv8=", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz", + "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==", "dev": true }, "dir-glob": { @@ -1535,9 +1641,9 @@ } }, "emoji-regex": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", "dev": true }, "end-of-stream": { @@ -1719,18 +1825,18 @@ } }, "ext": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz", - "integrity": "sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/ext/-/ext-1.6.0.tgz", + "integrity": "sha512-sdBImtzkq2HpkdRLtlLWDa6w4DX22ijZLKx8BMPUuKe1c5lbN6xwQDQCxSfxBQnHZ13ls/FH0MQZx/q/gr6FQg==", "dev": true, "requires": { - "type": "^2.0.0" + "type": "^2.5.0" }, "dependencies": { "type": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/type/-/type-2.1.0.tgz", - "integrity": "sha512-G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/type/-/type-2.5.0.tgz", + "integrity": "sha512-180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw==", "dev": true } } @@ -1852,17 +1958,16 @@ "dev": true }, "fast-glob": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz", - "integrity": "sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==", + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz", + "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==", "dev": true, "requires": { "@nodelib/fs.stat": "^2.0.2", "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.0", + "glob-parent": "^5.1.2", "merge2": "^1.3.0", - "micromatch": "^4.0.2", - "picomatch": "^2.2.1" + "micromatch": "^4.0.4" } }, "fast-json-stable-stringify": { @@ -1878,9 +1983,9 @@ "dev": true }, "fastq": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz", - "integrity": "sha512-SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==", + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz", + "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==", "dev": true, "requires": { "reusify": "^1.0.4" @@ -2156,6 +2261,17 @@ "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==", "dev": true }, + "get-intrinsic": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", + "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", + "dev": true, + "requires": { + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1" + } + }, "get-own-enumerable-property-symbols": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz", @@ -2183,6 +2299,16 @@ } } }, + "get-symbol-description": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz", + "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.1.1" + } + }, "get-value": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", @@ -2213,9 +2339,9 @@ } }, "glob-parent": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", - "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "dev": true, "requires": { "is-glob": "^4.0.1" @@ -2276,12 +2402,20 @@ } }, "global-dirs": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-2.0.1.tgz", - "integrity": "sha512-5HqUqdhkEovj2Of/ms3IeS/EekcO54ytHRLV4PEY2rhRwrHXLQjeVEES0Lhka0xwNDtGYn58wyC4s5+MHsOO6A==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.0.tgz", + "integrity": "sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA==", "dev": true, "requires": { - "ini": "^1.3.5" + "ini": "2.0.0" + }, + "dependencies": { + "ini": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz", + "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==", + "dev": true + } } }, "global-modules": { @@ -2543,9 +2677,9 @@ } }, "gulp-msbuild": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/gulp-msbuild/-/gulp-msbuild-0.8.0.tgz", - "integrity": "sha512-WL50GRrbD3BEJ8Hjhgpgv6iA4ST9swVFF4RZD5db0RYt0umlre0+FA8HBFo0Rpqze8/Opcn6A+kvpgx8125j1w==", + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/gulp-msbuild/-/gulp-msbuild-0.9.0.tgz", + "integrity": "sha512-N2kP0wkxBf5JXmgvjQhQAZiroPEqA7Y6I9mtVP5viRbuovSsvO+cJYS+lkNx5Zp8W1vTvEW7p1CUQ/YjicI4+w==", "dev": true, "requires": { "chalk": "^4.0.0", @@ -2561,19 +2695,18 @@ }, "dependencies": { "ansi-styles": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", - "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, "requires": { - "@types/color-name": "^1.1.1", "color-convert": "^2.0.1" } }, "chalk": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", - "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, "requires": { "ansi-styles": "^4.1.0", @@ -2705,6 +2838,12 @@ "ansi-regex": "^2.0.0" } }, + "has-bigints": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz", + "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==", + "dev": true + }, "has-flag": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", @@ -2717,6 +2856,23 @@ "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", "dev": true }, + "has-tostringtag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", + "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", + "dev": true, + "requires": { + "has-symbols": "^1.0.2" + }, + "dependencies": { + "has-symbols": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz", + "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==", + "dev": true + } + } + }, "has-value": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz", @@ -2808,9 +2964,9 @@ } }, "ignore": { - "version": "5.1.8", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", - "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==", + "version": "5.1.9", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.9.tgz", + "integrity": "sha512-2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ==", "dev": true }, "ignore-by-default": { @@ -2854,11 +3010,22 @@ "dev": true }, "ini": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", - "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", "dev": true }, + "internal-slot": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz", + "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==", + "dev": true, + "requires": { + "get-intrinsic": "^1.1.0", + "has": "^1.0.3", + "side-channel": "^1.0.4" + } + }, "interpret": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz", @@ -2913,6 +3080,15 @@ "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", "dev": true }, + "is-bigint": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", + "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", + "dev": true, + "requires": { + "has-bigints": "^1.0.1" + } + }, "is-binary-path": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", @@ -2922,6 +3098,16 @@ "binary-extensions": "^1.0.0" } }, + "is-boolean-object": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", + "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" + } + }, "is-buffer": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", @@ -3010,22 +3196,22 @@ } }, "is-glob": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", - "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", "dev": true, "requires": { "is-extglob": "^2.1.1" } }, "is-installed-globally": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.3.2.tgz", - "integrity": "sha512-wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g==", + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz", + "integrity": "sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==", "dev": true, "requires": { - "global-dirs": "^2.0.1", - "is-path-inside": "^3.0.1" + "global-dirs": "^3.0.0", + "is-path-inside": "^3.0.2" } }, "is-negated-glob": { @@ -3034,10 +3220,16 @@ "integrity": "sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=", "dev": true }, + "is-negative-zero": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", + "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==", + "dev": true + }, "is-npm": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-4.0.0.tgz", - "integrity": "sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-5.0.0.tgz", + "integrity": "sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA==", "dev": true }, "is-number": { @@ -3046,6 +3238,15 @@ "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "dev": true }, + "is-number-object": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz", + "integrity": "sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==", + "dev": true, + "requires": { + "has-tostringtag": "^1.0.0" + } + }, "is-obj": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", @@ -3059,9 +3260,9 @@ "dev": true }, "is-path-inside": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.2.tgz", - "integrity": "sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", + "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", "dev": true }, "is-plain-object": { @@ -3097,6 +3298,21 @@ "is-unc-path": "^1.0.0" } }, + "is-shared-array-buffer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz", + "integrity": "sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==", + "dev": true + }, + "is-string": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", + "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", + "dev": true, + "requires": { + "has-tostringtag": "^1.0.0" + } + }, "is-symbol": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz", @@ -3133,6 +3349,15 @@ "integrity": "sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=", "dev": true }, + "is-weakref": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", + "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==", + "dev": true, + "requires": { + "call-bind": "^1.0.2" + } + }, "is-windows": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", @@ -3188,9 +3413,9 @@ "dev": true }, "json-schema": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", - "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz", + "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==", "dev": true }, "json-schema-traverse": { @@ -3212,21 +3437,21 @@ "dev": true }, "jsprim": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", - "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz", + "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==", "dev": true, "requires": { "assert-plus": "1.0.0", "extsprintf": "1.3.0", - "json-schema": "0.2.3", + "json-schema": "0.4.0", "verror": "1.10.0" } }, "just-debounce": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.0.0.tgz", - "integrity": "sha1-h/zPrv/AtozRnVX2cilD+SnqNeo=", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.1.0.tgz", + "integrity": "sha512-qpcRocdkUmf+UTNBYx5w6dexX5J31AKK1OmPwH630a83DdVVUIngk55RSAiIGpQyoH0dlr872VHfPjnQnK1qDQ==", "dev": true }, "keyv": { @@ -3264,9 +3489,9 @@ } }, "lazystream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz", - "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz", + "integrity": "sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==", "dev": true, "requires": { "readable-stream": "^2.0.5" @@ -3587,28 +3812,28 @@ "dev": true }, "micromatch": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz", - "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz", + "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==", "dev": true, "requires": { "braces": "^3.0.1", - "picomatch": "^2.0.5" + "picomatch": "^2.2.3" } }, "mime-db": { - "version": "1.44.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz", - "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==", + "version": "1.51.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz", + "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==", "dev": true }, "mime-types": { - "version": "2.1.27", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz", - "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==", + "version": "2.1.34", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz", + "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==", "dev": true, "requires": { - "mime-db": "1.44.0" + "mime-db": "1.51.0" } }, "mimic-response": { @@ -3685,9 +3910,9 @@ "dev": true }, "nan": { - "version": "2.14.1", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz", - "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==", + "version": "2.15.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz", + "integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==", "dev": true, "optional": true }, @@ -3729,27 +3954,27 @@ "dev": true }, "nodemon": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.4.tgz", - "integrity": "sha512-Ltced+hIfTmaS28Zjv1BM552oQ3dbwPqI4+zI0SLgq+wpJhSyqgYude/aZa/3i31VCQWMfXJVxvu86abcam3uQ==", + "version": "2.0.15", + "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.15.tgz", + "integrity": "sha512-gdHMNx47Gw7b3kWxJV64NI+Q5nfl0y5DgDbiVtShiwa7Z0IZ07Ll4RLFo6AjrhzMtoEZn5PDE3/c2AbVsiCkpA==", "dev": true, "requires": { - "chokidar": "^3.2.2", - "debug": "^3.2.6", + "chokidar": "^3.5.2", + "debug": "^3.2.7", "ignore-by-default": "^1.0.1", "minimatch": "^3.0.4", - "pstree.remy": "^1.1.7", + "pstree.remy": "^1.1.8", "semver": "^5.7.1", "supports-color": "^5.5.0", "touch": "^3.1.0", - "undefsafe": "^2.0.2", - "update-notifier": "^4.0.0" + "undefsafe": "^2.0.5", + "update-notifier": "^5.1.0" }, "dependencies": { "anymatch": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", - "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", + "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", "dev": true, "requires": { "normalize-path": "^3.0.0", @@ -3757,40 +3982,40 @@ } }, "binary-extensions": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz", - "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", "dev": true }, "chokidar": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz", - "integrity": "sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==", + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz", + "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==", "dev": true, "requires": { - "anymatch": "~3.1.1", + "anymatch": "~3.1.2", "braces": "~3.0.2", - "fsevents": "~2.1.2", - "glob-parent": "~5.1.0", + "fsevents": "~2.3.2", + "glob-parent": "~5.1.2", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", "normalize-path": "~3.0.0", - "readdirp": "~3.4.0" + "readdirp": "~3.6.0" } }, "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dev": true, "requires": { "ms": "^2.1.1" } }, "fsevents": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz", - "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", "dev": true, "optional": true }, @@ -3804,9 +4029,9 @@ } }, "readdirp": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz", - "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", "dev": true, "requires": { "picomatch": "^2.2.1" @@ -3842,9 +4067,9 @@ "dev": true }, "normalize-url": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz", - "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==", + "version": "4.5.1", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz", + "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==", "dev": true }, "now-and-later": { @@ -4215,9 +4440,9 @@ "dev": true }, "picomatch": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", - "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz", + "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==", "dev": true }, "pidtree": { @@ -4355,9 +4580,9 @@ "dev": true }, "pupa": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pupa/-/pupa-2.0.1.tgz", - "integrity": "sha512-hEJH0s8PXLY/cdXh66tNEQGndDrIKNqNC5xmrysZy3i5C3oEoLna7YAOad+7u125+zH1HNXUmGEkrhb3c2VriA==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/pupa/-/pupa-2.1.1.tgz", + "integrity": "sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==", "dev": true, "requires": { "escape-goat": "^2.0.0" @@ -4369,6 +4594,12 @@ "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", "dev": true }, + "queue-microtask": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "dev": true + }, "rc": { "version": "1.2.8", "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", @@ -4620,9 +4851,9 @@ } }, "registry-auth-token": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.0.tgz", - "integrity": "sha512-P+lWzPrsgfN+UEpDS3U8AQKg/UjZX6mQSJueZj3EK+vNESoqBSpBUD3gmu4sF9lOsjXWjF11dQKUqemf3veq1w==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.1.tgz", + "integrity": "sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw==", "dev": true, "requires": { "rc": "^1.2.8" @@ -4677,9 +4908,9 @@ "dev": true }, "repeat-element": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz", - "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz", + "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==", "dev": true }, "repeat-string": { @@ -4822,10 +5053,13 @@ } }, "run-parallel": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz", - "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==", - "dev": true + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "dev": true, + "requires": { + "queue-microtask": "^1.2.2" + } }, "run-sequence": { "version": "2.2.1", @@ -5024,10 +5258,29 @@ "integrity": "sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==", "dev": true }, + "side-channel": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", + "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", + "dev": true, + "requires": { + "call-bind": "^1.0.0", + "get-intrinsic": "^1.0.2", + "object-inspect": "^1.9.0" + }, + "dependencies": { + "object-inspect": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.1.tgz", + "integrity": "sha512-If7BjFlpkzzBeV1cqgT3OSWT3azyoxDGajR+iGnFBfVV2EWyDyWaZZW2ERDjUaY2QM8i5jI3Sj7mhsM4DDAqWA==", + "dev": true + } + } + }, "signal-exit": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", - "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==", + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz", + "integrity": "sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==", "dev": true }, "simple-git": { @@ -5189,9 +5442,9 @@ } }, "source-map-url": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", - "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=", + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz", + "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==", "dev": true }, "sparkles": { @@ -5462,14 +5715,24 @@ } }, "temp": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/temp/-/temp-0.9.1.tgz", - "integrity": "sha512-WMuOgiua1xb5R56lE0eH6ivpVmg/lq2OHm4+LtT/xtEtPQ+sz6N3bBM6WZ5FvO1lO4IKIOb43qnhoc4qxP5OeA==", + "version": "0.9.4", + "resolved": "https://registry.npmjs.org/temp/-/temp-0.9.4.tgz", + "integrity": "sha512-yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA==", "dev": true, "requires": { + "mkdirp": "^0.5.1", "rimraf": "~2.6.2" }, "dependencies": { + "mkdirp": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", + "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", + "dev": true, + "requires": { + "minimist": "^1.2.5" + } + }, "rimraf": { "version": "2.6.3", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", @@ -5481,12 +5744,6 @@ } } }, - "term-size": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.0.tgz", - "integrity": "sha512-a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw==", - "dev": true - }, "through": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", @@ -5659,9 +5916,9 @@ "dev": true }, "type-fest": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", - "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", "dev": true }, "typedarray": { @@ -5679,38 +5936,38 @@ "is-typedarray": "^1.0.0" } }, - "unc-path-regex": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz", - "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=", - "dev": true - }, - "undefsafe": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.3.tgz", - "integrity": "sha512-nrXZwwXrD/T/JXeygJqdCO6NZZ1L66HrxM/Z7mIq2oPanoN0F1nLx3lwJMu6AwJY69hdixaFQOuoYsMjE5/C2A==", + "unbox-primitive": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz", + "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==", "dev": true, "requires": { - "debug": "^2.2.0" + "function-bind": "^1.1.1", + "has-bigints": "^1.0.1", + "has-symbols": "^1.0.2", + "which-boxed-primitive": "^1.0.2" }, "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "has-symbols": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz", + "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==", "dev": true } } }, + "unc-path-regex": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz", + "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=", + "dev": true + }, + "undefsafe": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz", + "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==", + "dev": true + }, "undertaker": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-1.3.0.tgz", @@ -5822,40 +6079,40 @@ "dev": true }, "update-notifier": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.1.tgz", - "integrity": "sha512-9y+Kds0+LoLG6yN802wVXoIfxYEwh3FlZwzMwpCZp62S2i1/Jzeqb9Eeeju3NSHccGGasfGlK5/vEHbAifYRDg==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-5.1.0.tgz", + "integrity": "sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw==", "dev": true, "requires": { - "boxen": "^4.2.0", - "chalk": "^3.0.0", + "boxen": "^5.0.0", + "chalk": "^4.1.0", "configstore": "^5.0.1", "has-yarn": "^2.1.0", "import-lazy": "^2.1.0", "is-ci": "^2.0.0", - "is-installed-globally": "^0.3.1", - "is-npm": "^4.0.0", + "is-installed-globally": "^0.4.0", + "is-npm": "^5.0.0", "is-yarn-global": "^0.3.0", - "latest-version": "^5.0.0", - "pupa": "^2.0.1", + "latest-version": "^5.1.0", + "pupa": "^2.1.1", + "semver": "^7.3.4", "semver-diff": "^3.1.1", "xdg-basedir": "^4.0.0" }, "dependencies": { "ansi-styles": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", - "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, "requires": { - "@types/color-name": "^1.1.1", "color-convert": "^2.0.1" } }, "chalk": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", - "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, "requires": { "ansi-styles": "^4.1.0", @@ -5883,6 +6140,24 @@ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true }, + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "requires": { + "yallist": "^4.0.0" + } + }, + "semver": { + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "dev": true, + "requires": { + "lru-cache": "^6.0.0" + } + }, "supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -5891,13 +6166,19 @@ "requires": { "has-flag": "^4.0.0" } + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true } } }, "uri-js": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz", - "integrity": "sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", "dev": true, "requires": { "punycode": "^2.1.0" @@ -6058,6 +6339,19 @@ "isexe": "^2.0.0" } }, + "which-boxed-primitive": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", + "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", + "dev": true, + "requires": { + "is-bigint": "^1.0.1", + "is-boolean-object": "^1.1.0", + "is-number-object": "^1.0.4", + "is-string": "^1.0.5", + "is-symbol": "^1.0.3" + } + }, "which-module": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", @@ -6074,15 +6368,9 @@ }, "dependencies": { "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", - "dev": true - }, - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true }, "is-fullwidth-code-point": { @@ -6092,23 +6380,23 @@ "dev": true }, "string-width": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", - "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, "requires": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" + "strip-ansi": "^6.0.1" } }, "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, "requires": { - "ansi-regex": "^5.0.0" + "ansi-regex": "^5.0.1" } } } @@ -6170,9 +6458,9 @@ "dev": true }, "y18n": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", - "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz", + "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==", "dev": true }, "yafs": { @@ -6188,9 +6476,9 @@ "dev": true }, "yargs": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.1.tgz", - "integrity": "sha512-huO4Fr1f9PmiJJdll5kwoS2e4GqzGSsMT3PPMpOwoVkOK8ckqAewMTZyA6LXVQWflleb/Z8oPBEvNsMft0XE+g==", + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.2.tgz", + "integrity": "sha512-ZEjj/dQYQy0Zx0lgLMLR8QuaqTihnxirir7EwUHp1Axq4e3+k8jXU5K0VLbNvedv1f4EWtBonDIZm0NUr+jCcA==", "dev": true, "requires": { "camelcase": "^3.0.0", @@ -6205,13 +6493,13 @@ "string-width": "^1.0.2", "which-module": "^1.0.0", "y18n": "^3.2.1", - "yargs-parser": "5.0.0-security.0" + "yargs-parser": "^5.0.1" } }, "yargs-parser": { - "version": "5.0.0-security.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0-security.0.tgz", - "integrity": "sha512-T69y4Ps64LNesYxeYGYPvfoMTt/7y1XtfpIslUeK4um+9Hu7hlGoRtaDLvdXb7+/tfq4opVa2HRY5xGip022rQ==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.1.tgz", + "integrity": "sha512-wpav5XYiddjXxirPoCTUPbqM0PXvJ9hiBMvuJgInvo4/lAOTZzUprArw17q2O1P2+GHhbBr18/iQwjL5Z9BqfA==", "dev": true, "requires": { "camelcase": "^3.0.0", @@ -6228,15 +6516,15 @@ } }, "zarro": { - "version": "1.78.0", - "resolved": "https://registry.npmjs.org/zarro/-/zarro-1.78.0.tgz", - "integrity": "sha512-lDpbakbZYnh9TtunnkQqANSaY0v7anNSb3MJyYSAC4HlR/ZpG8NdxzrVdPkLEproM110EkLAdilip4tgtQ72Ww==", + "version": "1.95.0", + "resolved": "https://registry.npmjs.org/zarro/-/zarro-1.95.0.tgz", + "integrity": "sha512-AqRGXmFvQrIix3ZcLs881pEkaIwa89X1JYMtn47ne1Ni4n6BwCexuvLJOJseClfS/XQs6Boesyf0ayP/sOtQYQ==", "dev": true, "requires": { "ansi-colors": "^4.1.1", - "array.prototype.flatmap": "^1.2.3", - "cross-env": "^7.0.2", - "debug": "^4.1.1", + "array.prototype.flatmap": "^1.2.4", + "cross-env": "^7.0.3", + "debug": "^4.3.1", "del": "^5.1.0", "event-stream": "^4.0.1", "fancy-log": "^1.3.3", @@ -6245,9 +6533,9 @@ "gulp-dotnet-cli": "^1.1.0", "gulp-edit-xml": "^3.1.1", "gulp-filter": "^6.0.0", - "gulp-msbuild": "^0.8.0", + "gulp-msbuild": "^0.9.0", "mkdirp": "^1.0.4", - "nodemon": "^2.0.4", + "nodemon": "^2.0.7", "npm-run-all": "^4.1.5", "plugin-error": "^1.0.1", "readline": "^1.3.0", @@ -6258,14 +6546,32 @@ "run-sequence": "^2.2.1", "sax": "^1.2.4", "simple-git": "^1.132.0", - "temp": "^0.9.1", + "temp": "^0.9.4", "through2": "^3.0.2", "undertaker-forward-reference": "^1.0.2", - "vinyl": "^2.2.0", + "vinyl": "^2.2.1", "which": "^2.0.2", "xml2js": "^0.4.23" }, "dependencies": { + "cross-env": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz", + "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==", + "dev": true, + "requires": { + "cross-spawn": "^7.0.1" + } + }, + "debug": { + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", + "dev": true, + "requires": { + "ms": "2.1.2" + } + }, "simple-git": { "version": "1.132.0", "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-1.132.0.tgz", @@ -6275,14 +6581,18 @@ "debug": "^4.0.1" } }, - "through2": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz", - "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==", + "vinyl": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz", + "integrity": "sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==", "dev": true, "requires": { - "inherits": "^2.0.4", - "readable-stream": "2 || 3" + "clone": "^2.1.1", + "clone-buffer": "^1.0.0", + "clone-stats": "^1.0.0", + "cloneable-readable": "^1.0.0", + "remove-trailing-separator": "^1.0.1", + "replace-ext": "^1.0.0" } } } diff --git a/package.json b/package.json index 5523fe717..96a46e6e3 100644 --- a/package.json +++ b/package.json @@ -37,6 +37,6 @@ "simple-git": "^2.20.1", "which": "^2.0.2", "yafs": "^1.5.0", - "zarro": "^1.78.0" + "zarro": "^1.95.0" } } diff --git a/src/log4net/AssemblyInfo.cs b/src/log4net/AssemblyInfo.cs index f7f47aab0..311d0c4ff 100644 --- a/src/log4net/AssemblyInfo.cs +++ b/src/log4net/AssemblyInfo.cs @@ -53,77 +53,77 @@ // #if (CLI_1_0) -[assembly: AssemblyInformationalVersionAttribute("2.0.13.0-.CLI 1.0")] +[assembly: AssemblyInformationalVersionAttribute("2.0.14.0-.CLI 1.0")] [assembly: AssemblyTitle("Apache log4net for CLI 1.0 Compatible Frameworks")] #elif (NET_1_0) -[assembly: AssemblyInformationalVersionAttribute("2.0.13.0-.NET 1.0")] +[assembly: AssemblyInformationalVersionAttribute("2.0.14.0-.NET 1.0")] [assembly: AssemblyTitle("Apache log4net for .NET Framework 1.0")] #elif (NET_1_1) -[assembly: AssemblyInformationalVersionAttribute("2.0.13.0-.NET 1.1")] +[assembly: AssemblyInformationalVersionAttribute("2.0.14.0-.NET 1.1")] [assembly: AssemblyTitle("Apache log4net for .NET Framework 1.1")] #elif (NET_4_5) -[assembly: AssemblyInformationalVersionAttribute("2.0.13.0-.NET 4.5")] +[assembly: AssemblyInformationalVersionAttribute("2.0.14.0-.NET 4.5")] [assembly: AssemblyTitle("Apache log4net for .NET Framework 4.5")] #elif (NET_4_0) #if CLIENT_PROFILE -[assembly: AssemblyInformationalVersionAttribute("2.0.13.0-.NET 4.0 CP")] +[assembly: AssemblyInformationalVersionAttribute("2.0.14.0-.NET 4.0 CP")] [assembly: AssemblyTitle("Apache log4net for .NET Framework 4.0 Client Profile")] #else -[assembly: AssemblyInformationalVersionAttribute("2.0.13.0-.NET 4.0")] +[assembly: AssemblyInformationalVersionAttribute("2.0.14.0-.NET 4.0")] [assembly: AssemblyTitle("Apache log4net for .NET Framework 4.0")] #endif // Client Profile #elif (NET_3_5) #if CLIENT_PROFILE -[assembly: AssemblyInformationalVersionAttribute("2.0.13.0-.NET 3.5 CP")] +[assembly: AssemblyInformationalVersionAttribute("2.0.14.0-.NET 3.5 CP")] [assembly: AssemblyTitle("Apache log4net for .NET Framework 3.5 Client Profile")] #else -[assembly: AssemblyInformationalVersionAttribute("2.0.13.0-.NET 3.5")] +[assembly: AssemblyInformationalVersionAttribute("2.0.14.0-.NET 3.5")] [assembly: AssemblyTitle("Apache log4net for .NET Framework 3.5")] #endif // Client Profile #elif (NET_2_0) -[assembly: AssemblyInformationalVersionAttribute("2.0.13.0-.NET 2.0")] +[assembly: AssemblyInformationalVersionAttribute("2.0.14.0-.NET 2.0")] [assembly: AssemblyTitle("Apache log4net for .NET Framework 2.0")] #elif (NETCF_1_0) -[assembly: AssemblyInformationalVersionAttribute("2.0.13.0-.NETCF 1.0")] +[assembly: AssemblyInformationalVersionAttribute("2.0.14.0-.NETCF 1.0")] [assembly: AssemblyTitle("Apache log4net for .NET Compact Framework 1.0")] #elif (NETCF_2_0) -[assembly: AssemblyInformationalVersionAttribute("2.0.13.0-.NETCF 2.0")] +[assembly: AssemblyInformationalVersionAttribute("2.0.14.0-.NETCF 2.0")] [assembly: AssemblyTitle("Apache log4net for .NET Compact Framework 2.0")] #elif (MONO_1_0) -[assembly: AssemblyInformationalVersionAttribute("2.0.13.0-Mono 1.0")] +[assembly: AssemblyInformationalVersionAttribute("2.0.14.0-Mono 1.0")] [assembly: AssemblyTitle("Apache log4net for Mono 1.0")] #elif (MONO_2_0) -[assembly: AssemblyInformationalVersionAttribute("2.0.13.0-Mono 2.0")] +[assembly: AssemblyInformationalVersionAttribute("2.0.14.0-Mono 2.0")] [assembly: AssemblyTitle("Apache log4net for Mono 2.0")] #elif (MONO_3_5) -[assembly: AssemblyInformationalVersionAttribute("2.0.13.0-Mono 3.5")] +[assembly: AssemblyInformationalVersionAttribute("2.0.14.0-Mono 3.5")] [assembly: AssemblyTitle("Apache log4net for Mono 3.5")] #elif (MONO_4_0) -[assembly: AssemblyInformationalVersionAttribute("2.0.13.0-Mono 4.0")] +[assembly: AssemblyInformationalVersionAttribute("2.0.14.0-Mono 4.0")] [assembly: AssemblyTitle("Apache log4net for Mono 4.0")] #elif (SSCLI_1_0) -[assembly: AssemblyInformationalVersionAttribute("2.0.13.0-SSCLI 1.0")] +[assembly: AssemblyInformationalVersionAttribute("2.0.14.0-SSCLI 1.0")] [assembly: AssemblyTitle("Apache log4net for Shared Source CLI 1.0")] #elif (NET) -[assembly: AssemblyInformationalVersionAttribute("2.0.13.0-.NET")] +[assembly: AssemblyInformationalVersionAttribute("2.0.14.0-.NET")] [assembly: AssemblyTitle("Apache log4net for .NET Framework")] #elif (NETSTANDARD1_3) -[assembly: AssemblyInformationalVersionAttribute("2.0.13.0-.NET Standard 1.3")] +[assembly: AssemblyInformationalVersionAttribute("2.0.14.0-.NET Standard 1.3")] [assembly: AssemblyTitle("Apache log4net for .NET Standard 1.3")] #elif (NETSTANDARD2_0) -[assembly: AssemblyInformationalVersionAttribute("2.0.13.0-.NET Standard 2.0")] +[assembly: AssemblyInformationalVersionAttribute("2.0.14.0-.NET Standard 2.0")] [assembly: AssemblyTitle("Apache log4net for .NET Standard 2.0")] #elif (NETCF) -[assembly: AssemblyInformationalVersionAttribute("2.0.13.0-.NETCF")] +[assembly: AssemblyInformationalVersionAttribute("2.0.14.0-.NETCF")] [assembly: AssemblyTitle("Apache log4net for .NET Compact Framework")] #elif (MONO) -[assembly: AssemblyInformationalVersionAttribute("2.0.13.0-Mono")] +[assembly: AssemblyInformationalVersionAttribute("2.0.14.0-Mono")] [assembly: AssemblyTitle("Apache log4net for Mono")] #elif (SSCLI) -[assembly: AssemblyInformationalVersionAttribute("2.0.13.0-SSCLI")] +[assembly: AssemblyInformationalVersionAttribute("2.0.14.0-SSCLI")] [assembly: AssemblyTitle("Apache log4net for Shared Source CLI")] #else -[assembly: AssemblyInformationalVersionAttribute("2.0.13.0")] +[assembly: AssemblyInformationalVersionAttribute("2.0.14.0")] [assembly: AssemblyTitle("Apache log4net")] #endif diff --git a/src/log4net/log4net.csproj b/src/log4net/log4net.csproj index 4115607ec..6de258f4d 100644 --- a/src/log4net/log4net.csproj +++ b/src/log4net/log4net.csproj @@ -1,13 +1,21 @@ log4net - 2.0.13 + 2.0.14 Codestin Search App Apache log4net - 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. + 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 diff --git a/src/site/xdoc/download_log4net.xml b/src/site/xdoc/download_log4net.xml index da0b91efe..ccc7f2fcf 100644 --- a/src/site/xdoc/download_log4net.xml +++ b/src/site/xdoc/download_log4net.xml @@ -41,9 +41,9 @@ limitations under the License. - - - + + +

apache-log4net-source-2.0.13.zip

sha512

pgp

apache-log4net-source-2.0.14.zip

sha512

pgp

@@ -52,14 +52,14 @@ limitations under the License.

Binaries are available in a zip file or nupkg, which is also available from nuget.org

- - - + + + - - - + + +

log4net-binaries-2.0.13.zip	sha512	pgp	log4net-binaries-2.0.14.zip	sha512	pgp
log4net-2.0.13.nupkg	sha512	pgp	log4net-2.0.14.nupkg	sha512	pgp

diff --git a/src/site/xdoc/release/release-notes.xml b/src/site/xdoc/release/release-notes.xml index 9b2a57ce5..fe410cef2 100644 --- a/src/site/xdoc/release/release-notes.xml +++ b/src/site/xdoc/release/release-notes.xml @@ -27,6 +27,20 @@ limitations under the License.

+ Apache log4net 2.0.14 is a minor release to address some reported issues + and accept a pull request provided by a community member: +

Pull request by @NicholasNoise to address issues with logging via ado appender to PostgreSQL
Community request to correctly handle null data in ReadOnlyPropertiesDictionary
Pull request by @erikma to use the numeric thread id for .net worker pool threads + (LOG4NET-680)
Pull request by @erikma to dispose of WindowsIdentity retrieved in TryGetCurrentUserName() + (LOG4NET-671)

Apache log4net 2.0.13 is a minor release to address some reported issues and accept some pull requests provided by community members: From a64d8848005efdff1de9ffaa8f7d0775b4371c1e Mon Sep 17 00:00:00 2001 From: Davyd McColl Date: Thu, 16 Dec 2021 10:09:48 +0200 Subject: [PATCH 038/122] :bookmark: update versioning to 2.0.14.0 --- src/log4net/AssemblyVersionInfo.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/log4net/AssemblyVersionInfo.cs b/src/log4net/AssemblyVersionInfo.cs index c10b79027..fd0b3defd 100644 --- a/src/log4net/AssemblyVersionInfo.cs +++ b/src/log4net/AssemblyVersionInfo.cs @@ -28,11 +28,11 @@ // 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.13.0")] +[assembly: System.Reflection.AssemblyVersion("2.0.14.0")] #if !NETCF #if !SSCLI -[assembly: System.Reflection.AssemblyFileVersion("2.0.13.0")] +[assembly: System.Reflection.AssemblyFileVersion("2.0.14.0")] #endif #endif From 107fbc0c8edb1d19b82d1cfe9deb37a84481133c Mon Sep 17 00:00:00 2001 From: Davyd McColl Date: Thu, 16 Dec 2021 10:23:25 +0200 Subject: [PATCH 039/122] :truck: move legacy release instructions; whilst perhaps outdated, there could still be usefulness in here --- ReleaseInstructions.txt => doc/ReleaseInstructions-legacy.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename ReleaseInstructions.txt => doc/ReleaseInstructions-legacy.txt (100%) diff --git a/ReleaseInstructions.txt b/doc/ReleaseInstructions-legacy.txt similarity index 100% rename from ReleaseInstructions.txt rename to doc/ReleaseInstructions-legacy.txt From dfe14c7c8dd344dae7e1136494fc51edba123ef2 Mon Sep 17 00:00:00 2001 From: Davyd McColl Date: Thu, 16 Dec 2021 10:27:42 +0200 Subject: [PATCH 040/122] :wrench: should exclude executables from source zip --- local-tasks/zip.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/local-tasks/zip.js b/local-tasks/zip.js index 1225a21c1..3876fb864 100644 --- a/local-tasks/zip.js +++ b/local-tasks/zip.js @@ -40,7 +40,8 @@ gulp.task("zip-source", async () => { "!build", "!build/**/*", "!.idea", - "!.idea/**/*" + "!.idea/**/*", + "!*.exe" ]) .pipe(rename(path => { path.dirname = `${baseDir}/${path.dirname}` From 3862b3fb61514dea00d2bae2aae78d8e82777557 Mon Sep 17 00:00:00 2001 From: Matt Sicker Date: Sun, 19 Dec 2021 15:40:16 -0600 Subject: [PATCH 041/122] Update copyright year and https url --- NOTICE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NOTICE b/NOTICE index 86d4dfedd..35c2b634c 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ Apache log4net - Copyright 2004-2017 The Apache Software Foundation + Copyright 2004-2021 The Apache Software Foundation This product includes software developed at - The Apache Software Foundation (http://www.apache.org/). + The Apache Software Foundation (https://www.apache.org/). From b154a78d9f977dbc7234e8619cebcef75ba3c443 Mon Sep 17 00:00:00 2001 From: Davyd McColl Date: Fri, 31 Dec 2021 15:39:54 +0200 Subject: [PATCH 042/122] :memo: update release docs for post-vote process --- doc/RELEASING.md | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/doc/RELEASING.md b/doc/RELEASING.md index 584bf5cca..4858d5217 100644 --- a/doc/RELEASING.md +++ b/doc/RELEASING.md @@ -55,11 +55,22 @@ release version 2.0.123: 11. create an rc-releasd at GitHub with a tag like `rc/2.0.123-rc1` - attach all the files from the build/artifacts folder, _including signatures_ 12. get the artifacts in build/artifacts up to https://downloads.apache.org/logging/log4net/ - - currently, I have to as another ASF member for help with this - - I also see release notes there - which are out of date (don't know how to update) + - `svn co https://dist.apache.org/repos/dist/dev/logging -N apache-dist-logging-dev` + - `cd apache-dist-logging-dev` + - `svn up log4net` + - copy in source & binary artifacts to respective locations + - `svn delete` old items + - `svn commit` 13. raise a vote on the log4net mailing list (dev@logging.apache.org) 14. wait 15. when the vote has 3 or more +1's, it's time to go live! +16. copy the apache artifacts (binary and source) to the release svn repo and commit + - `svn co https://dist.apache.org/repos/dist/release/logging -N apache-dist-logging-release` + - `cd apache-dist-logging-release` + - `svn up log4net` + - copy in source & binary artifacts to respective locations + - `svn delete` old items + - `svn commit` 16. push the .nupkg to nuget.org 17. don't forget to make the docs live: in the logging-log4net-site folder: - `git checkout asf-site` From e817e2a06ca8d7f738965b4804e22c2a7f874a31 Mon Sep 17 00:00:00 2001 From: Davyd McColl Date: Fri, 31 Dec 2021 15:52:52 +0200 Subject: [PATCH 043/122] :bug: :memo: should mention 2.0.14, not 2.0.13 --- src/site/xdoc/download_log4net.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/site/xdoc/download_log4net.xml b/src/site/xdoc/download_log4net.xml index ccc7f2fcf..0ce385268 100644 --- a/src/site/xdoc/download_log4net.xml +++ b/src/site/xdoc/download_log4net.xml @@ -36,7 +36,7 @@ limitations under the License.

From acc55ec1754824e385ad2812d936ecd43407e6e2 Mon Sep 17 00:00:00 2001 From: Davyd McColl Date: Fri, 21 Jan 2022 15:18:23 +0200 Subject: [PATCH 044/122] :fire: remove dead commented code --- src/log4net/Util/OptionConverter.cs | 103 ---------------------------- 1 file changed, 103 deletions(-) diff --git a/src/log4net/Util/OptionConverter.cs b/src/log4net/Util/OptionConverter.cs index 776bcc252..21eabfe59 100644 --- a/src/log4net/Util/OptionConverter.cs +++ b/src/log4net/Util/OptionConverter.cs @@ -18,7 +18,6 @@ #endregion using System; -using System.Collections; using System.Globalization; using System.Reflection; using System.Text; @@ -58,79 +57,6 @@ private OptionConverter() #region Public Static Methods -// ///

-// /// Concatenates two string arrays. -// ///

-// /// Left array. -// /// Right array. -// /// Array containing both left and right arrays. -// public static string[] ConcatenateArrays(string[] l, string[] r) -// { -// return (string[])ConcatenateArrays(l, r); -// } - -// ///

-// /// Concatenates two arrays. -// ///

-// /// Left array -// /// Right array -// /// Array containing both left and right arrays. -// public static Array ConcatenateArrays(Array l, Array r) -// { -// if (l == null) -// { -// throw new ArgumentNullException("l"); -// } -// if (r == null) -// { -// throw new ArgumentNullException("r"); -// } -// -// int len = l.Length + r.Length; -// Array a = Array.CreateInstance(l.GetType(), len); -// -// Array.Copy(l, 0, a, 0, l.Length); -// Array.Copy(r, 0, a, l.Length, r.Length); -// -// return a; -// } - -// ///

-// /// Converts string escape characters back to their correct values. -// ///

-// /// String to convert. -// /// Converted result. -// public static string ConvertSpecialChars(string s) -// { -// if (s == null) -// { -// throw new ArgumentNullException("s"); -// } -// char c; -// int len = s.Length; -// StringBuilder buf = new StringBuilder(len); -// -// int i = 0; -// while(i < len) -// { -// c = s[i++]; -// if (c == '\\') -// { -// c = s[i++]; -// if (c == 'n') c = '\n'; -// else if (c == 'r') c = '\r'; -// else if (c == 't') c = '\t'; -// else if (c == 'f') c = '\f'; -// else if (c == '\b') c = '\b'; -// else if (c == '\"') c = '\"'; -// else if (c == '\'') c = '\''; -// else if (c == '\\') c = '\\'; -// } -// buf.Append(c); -// } -// return buf.ToString(); -// } - ///

/// Converts a string to a value. ///

@@ -160,35 +86,6 @@ public static bool ToBoolean(string argValue, bool defaultValue) return defaultValue; } -// ///

-// /// Converts a string to an integer. -// ///

-// /// String to convert. -// /// The default value. -// /// The value of . -// /// -// /// -// /// is returned when -// /// cannot be converted to a value. -// /// -// /// -// public static int ToInt(string argValue, int defaultValue) -// { -// if (argValue != null) -// { -// string s = argValue.Trim(); -// try -// { -// return int.Parse(s, NumberFormatInfo.InvariantInfo); -// } -// catch (Exception e) -// { -// LogLog.Error(declaringType, "OptionConverter: [" + s + "] is not in proper int form.", e); -// } -// } -// return defaultValue; -// } - ///

/// Parses a file size into a number. ///

From 54ca7c355e6de708014d36303e29bb4e6a172a90 Mon Sep 17 00:00:00 2001 From: Davyd McColl Date: Mon, 24 Jan 2022 10:11:34 +0200 Subject: [PATCH 045/122] :alembic: provide "proper" namespacing on netstandard only, reverting to `log4net:event` and similar for .net framework --- .../log4net-672/Program.cs | 102 ++++++++++++++++++ .../log4net-672/log4net-672.csproj | 23 ++++ .../log4net-672/log4net.config | 18 ++++ src/log4net.sln | 13 +++ src/log4net/Layout/XmlLayout.cs | 28 ++++- src/log4net/Layout/XmlLayoutSchemaLog4j.cs | 28 +++++ 6 files changed, 210 insertions(+), 2 deletions(-) create mode 100644 src/integration-testing/log4net-672/Program.cs create mode 100644 src/integration-testing/log4net-672/log4net-672.csproj create mode 100644 src/integration-testing/log4net-672/log4net.config diff --git a/src/integration-testing/log4net-672/Program.cs b/src/integration-testing/log4net-672/Program.cs new file mode 100644 index 000000000..64be479b0 --- /dev/null +++ b/src/integration-testing/log4net-672/Program.cs @@ -0,0 +1,102 @@ +using System; +using System.IO; +using System.Reflection; +using System.Xml; +using log4net; +using log4net.Config; +using log4net.Core; + +if (true) +{ + var appPath = new Uri(Assembly.GetExecutingAssembly().Location).LocalPath; + var appFolder = Path.GetDirectoryName(appPath); + if (appFolder is null) + { + throw new InvalidOperationException( + $"Can't determine app folder for {appPath}" + ); + } + + var configFile = Path.Combine(appFolder, "log4net.config"); + if (!File.Exists(configFile)) + { + throw new InvalidOperationException($"log4net.config not found at {configFile}"); + } + + var info = new FileInfo(configFile); + + XmlConfigurator.Configure(info); + + var logger = LogManager.GetLogger("main"); + + for (var i = 0; i < 10; i++) + { + logger.Info($"test log {i}"); + } + + LogManager.Flush(int.MaxValue); +} + +// Sample.Main(); +// +// public class Sample +// { +// private const string filename = "sampledata.xml"; +// +// public static void Main() +// { +// +// XmlTextWriter writer = new XmlTextWriter (filename, null); +// //Use indenting for readability. +// writer.Formatting = Formatting.Indented; +// +// writer.WriteComment("sample XML fragment"); +// +// //Write an element (this one is the root). +// writer.WriteStartElement("bookstore"); +// +// //Write the namespace declaration. +// writer.WriteAttributeString("xmlns", "bk", null, "log4net"); +// +// writer.WriteStartElement("book"); +// +// //Lookup the prefix and then write the ISBN attribute. +// string prefix = writer.LookupPrefix("urn:samples"); +// writer.WriteStartAttribute(prefix, "ISBN", "urn:samples"); +// writer.WriteString("1-861003-78"); +// writer.WriteEndAttribute(); +// +// //Write the title. +// writer.WriteStartElement("title"); +// writer.WriteString("The Handmaid's Tale"); +// writer.WriteEndElement(); +// +// //Write the price. +// writer.WriteElementString("price", "19.95"); +// +// //Write the style element. +// writer.WriteStartElement(prefix, "style", "urn:samples"); +// writer.WriteString("hardcover"); +// writer.WriteEndElement(); +// +// //Write the end tag for the book element. +// writer.WriteEndElement(); +// +// //Write the close tag for the root element. +// writer.WriteEndElement(); +// +// //Write the XML to file and close the writer. +// writer.Flush(); +// writer.Close(); +// +// //Read the file back in and parse to ensure well formed XML. +// XmlDocument doc = new XmlDocument(); +// //Preserve white space for readability. +// doc.PreserveWhitespace = true; +// //Load the file +// doc.Load(filename); +// +// //Write the XML content to the console. +// Console.Write(doc.InnerXml); +// } +// } diff --git a/src/integration-testing/log4net-672/log4net-672.csproj b/src/integration-testing/log4net-672/log4net-672.csproj new file mode 100644 index 000000000..e0ac3505b --- /dev/null +++ b/src/integration-testing/log4net-672/log4net-672.csproj @@ -0,0 +1,23 @@ + + + + Exe + net6.0 + log4net_672 + disable + enable + preview + NETSTANDARD + + + + + + + + + Always + + + + diff --git a/src/integration-testing/log4net-672/log4net.config b/src/integration-testing/log4net-672/log4net.config new file mode 100644 index 000000000..0e685d603 --- /dev/null +++ b/src/integration-testing/log4net-672/log4net.config @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/log4net.sln b/src/log4net.sln index c08c55c2d..ae6d168ae 100644 --- a/src/log4net.sln +++ b/src/log4net.sln @@ -24,6 +24,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "log4net", "log4net\log4net. EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "log4net.Tests", "log4net.Tests\log4net.Tests.csproj", "{B0530F10-0238-49A9-93B0-8EF412E90BCF}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "integration-testing", "integration-testing", "{8953473C-EEE8-4740-993D-B8E10FA876CD}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "log4net-672", "integration-testing\log4net-672\log4net-672.csproj", "{9050922E-E22E-4FF5-A1B0-2F21745C6882}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -43,8 +47,17 @@ Global {B0530F10-0238-49A9-93B0-8EF412E90BCF}.Release|Any CPU.Build.0 = Release|Any CPU {B0530F10-0238-49A9-93B0-8EF412E90BCF}.CrossPlatform|Any CPU.ActiveCfg = CrossPlatform|Any CPU {B0530F10-0238-49A9-93B0-8EF412E90BCF}.CrossPlatform|Any CPU.Build.0 = CrossPlatform|Any CPU + {9050922E-E22E-4FF5-A1B0-2F21745C6882}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9050922E-E22E-4FF5-A1B0-2F21745C6882}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9050922E-E22E-4FF5-A1B0-2F21745C6882}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9050922E-E22E-4FF5-A1B0-2F21745C6882}.Release|Any CPU.Build.0 = Release|Any CPU + {9050922E-E22E-4FF5-A1B0-2F21745C6882}.CrossPlatform|Any CPU.ActiveCfg = Debug|Any CPU + {9050922E-E22E-4FF5-A1B0-2F21745C6882}.CrossPlatform|Any CPU.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {9050922E-E22E-4FF5-A1B0-2F21745C6882} = {8953473C-EEE8-4740-993D-B8E10FA876CD} + EndGlobalSection EndGlobal diff --git a/src/log4net/Layout/XmlLayout.cs b/src/log4net/Layout/XmlLayout.cs index 66b7dcf8f..7c5c0c291 100644 --- a/src/log4net/Layout/XmlLayout.cs +++ b/src/log4net/Layout/XmlLayout.cs @@ -160,7 +160,6 @@ public bool Base64EncodeProperties set {m_base64Properties=value;} } - #endregion Public Instance Properties #region Implementation of IOptionHandler @@ -199,7 +198,7 @@ public override void ActivateOptions() m_elmLocation = m_prefix + ":" + ELM_LOCATION; } } - + #endregion Implementation of IOptionHandler #region Override implementation of XMLLayoutBase @@ -217,7 +216,12 @@ public override void ActivateOptions() /// protected override void FormatXml(XmlWriter writer, LoggingEvent loggingEvent) { + #if NETSTANDARD + writer.WriteStartElement(m_prefix, ELM_EVENT, m_prefix); + // writer.WriteAttributeString("xmlns", "log4net", null, "http://logging.apache.org/log4net/schemas/log4net-events-1.2"); + #else writer.WriteStartElement(m_elmEvent); + #endif writer.WriteAttributeString(ATTR_LOGGER, loggingEvent.LoggerName); #if NET_2_0 || NETCF_2_0 || MONO_2_0 || NETSTANDARD @@ -243,7 +247,11 @@ protected override void FormatXml(XmlWriter writer, LoggingEvent loggingEvent) } // Append the message text + #if NETSTANDARD + writer.WriteStartElement(m_prefix, ELM_MESSAGE, m_prefix); + #else writer.WriteStartElement(m_elmMessage); + #endif if (!this.Base64EncodeMessage) { Transform.WriteEscapedXmlString(writer, loggingEvent.RenderedMessage, this.InvalidCharReplacement); @@ -261,10 +269,18 @@ protected override void FormatXml(XmlWriter writer, LoggingEvent loggingEvent) // Append the properties text if (properties.Count > 0) { + #if NETSTANDARD + writer.WriteStartElement(m_prefix, ELM_PROPERTIES, m_prefix); + #else writer.WriteStartElement(m_elmProperties); + #endif foreach(System.Collections.DictionaryEntry entry in properties) { + #if NETSTANDARD + writer.WriteStartElement(m_prefix, ELM_DATA, m_prefix); + #else writer.WriteStartElement(m_elmData); + #endif writer.WriteAttributeString(ATTR_NAME, Transform.MaskXmlInvalidCharacters((string)entry.Key,this.InvalidCharReplacement)); // Use an ObjectRenderer to convert the object to a string @@ -289,7 +305,11 @@ protected override void FormatXml(XmlWriter writer, LoggingEvent loggingEvent) if (exceptionStr != null && exceptionStr.Length > 0) { // Append the stack trace line + #if NETSTANDARD + writer.WriteStartElement(m_prefix, ELM_EXCEPTION, m_prefix); + #else writer.WriteStartElement(m_elmException); + #endif Transform.WriteEscapedXmlString(writer, exceptionStr,this.InvalidCharReplacement); writer.WriteEndElement(); } @@ -298,7 +318,11 @@ protected override void FormatXml(XmlWriter writer, LoggingEvent loggingEvent) { LocationInfo locationInfo = loggingEvent.LocationInformation; + #if NETSTANDARD + writer.WriteStartElement(m_prefix, ELM_LOCATION, m_prefix); + #else writer.WriteStartElement(m_elmLocation); + #endif writer.WriteAttributeString(ATTR_CLASS, locationInfo.ClassName); writer.WriteAttributeString(ATTR_METHOD, locationInfo.MethodName); writer.WriteAttributeString(ATTR_FILE, locationInfo.FileName); diff --git a/src/log4net/Layout/XmlLayoutSchemaLog4j.cs b/src/log4net/Layout/XmlLayoutSchemaLog4j.cs index 19dde79db..d5ac73fde 100644 --- a/src/log4net/Layout/XmlLayoutSchemaLog4j.cs +++ b/src/log4net/Layout/XmlLayoutSchemaLog4j.cs @@ -172,7 +172,11 @@ protected override void FormatXml(XmlWriter writer, LoggingEvent loggingEvent) } // Write the start element + #if NETSTANDARD writer.WriteStartElement("log4j", "event", "log4net"); + #else + writer.WriteStartElement("log4j:event"); + #endif writer.WriteAttributeString("logger", loggingEvent.LoggerName); // Calculate the timestamp as the number of milliseconds since january 1970 @@ -187,7 +191,11 @@ protected override void FormatXml(XmlWriter writer, LoggingEvent loggingEvent) writer.WriteAttributeString("thread", loggingEvent.ThreadName); // Append the message text + #if NETSTANDARD writer.WriteStartElement("log4j", "message", "log4net"); + #else + writer.WriteStartElement("log4j:message"); + #endif Transform.WriteEscapedXmlString(writer, loggingEvent.RenderedMessage,this.InvalidCharReplacement); writer.WriteEndElement(); @@ -199,7 +207,11 @@ protected override void FormatXml(XmlWriter writer, LoggingEvent loggingEvent) if (valueStr != null && valueStr.Length > 0) { // Append the NDC text + #if NETSTANDARD writer.WriteStartElement("log4j", "NDC", "log4net"); + #else + writer.WriteStartElement("log4j:NDC"); + #endif Transform.WriteEscapedXmlString(writer, valueStr,this.InvalidCharReplacement); writer.WriteEndElement(); } @@ -209,10 +221,18 @@ protected override void FormatXml(XmlWriter writer, LoggingEvent loggingEvent) PropertiesDictionary properties = loggingEvent.GetProperties(); if (properties.Count > 0) { + #if NETSTANDARD writer.WriteStartElement("log4j", "properties", "log4net"); + #else + writer.WriteStartElement("log4j:properties"); + #endif foreach(System.Collections.DictionaryEntry entry in properties) { + #if NETSTANDARD writer.WriteStartElement("log4j", "data", "log4net"); + #else + writer.WriteStartElement("log4j:data"); + #endif writer.WriteAttributeString("name", (string)entry.Key); // Use an ObjectRenderer to convert the object to a string @@ -228,7 +248,11 @@ protected override void FormatXml(XmlWriter writer, LoggingEvent loggingEvent) if (exceptionStr != null && exceptionStr.Length > 0) { // Append the stack trace line + #if NETSTANDARD writer.WriteStartElement("log4j", "throwable", "log4net"); + #else + writer.WriteStartElement("log4j:throwable"); + #endif Transform.WriteEscapedXmlString(writer, exceptionStr,this.InvalidCharReplacement); writer.WriteEndElement(); } @@ -237,7 +261,11 @@ protected override void FormatXml(XmlWriter writer, LoggingEvent loggingEvent) { LocationInfo locationInfo = loggingEvent.LocationInformation; + #if NETSTANDARD writer.WriteStartElement("log4j", "locationInfo", "log4net"); + #else + writer.WriteStartElement("log4j:locationInfo"); + #endif writer.WriteAttributeString("class", locationInfo.ClassName); writer.WriteAttributeString("method", locationInfo.MethodName); writer.WriteAttributeString("file", locationInfo.FileName); From e148f158ffd084ff1315577c15e5f54fa81e2fd7 Mon Sep 17 00:00:00 2001 From: "Bipul Raman (MSFT)" <8312486+BipulRaman@users.noreply.github.com> Date: Sun, 20 Feb 2022 21:56:40 +0530 Subject: [PATCH 046/122] Link Correction. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 85e2fdbfb..c118dc46b 100644 --- a/README.md +++ b/README.md @@ -36,8 +36,8 @@ install relevant SDKs and build for those targets. In particular, older Client Profile .NET Framework targets and dotnet core 1.1 may be installed by using the bundled helper scripts: -- [install-net-framework-sdk-3.5.ps1]() -- [install-dotnet-core-sdk-1.1.ps1]() +- [install-net-framework-sdk-3.5.ps1](install-net-framework-sdk-3.5.ps1) +- [install-dotnet-core-sdk-1.1.ps1](install-dotnet-core-sdk-1.1.ps1) These scripts download the relevant installers from Microsoft servers, but you run them at your own risk. From 025d7f6ac197fc8ca92c776b14d9205d6b899168 Mon Sep 17 00:00:00 2001 From: Davyd McColl Date: Tue, 22 Feb 2022 12:43:47 +0200 Subject: [PATCH 047/122] :zap: cache resolved windows username when available --- src/log4net/Core/LoggingEvent.cs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/log4net/Core/LoggingEvent.cs b/src/log4net/Core/LoggingEvent.cs index 26b76ba57..8d89ff935 100644 --- a/src/log4net/Core/LoggingEvent.cs +++ b/src/log4net/Core/LoggingEvent.cs @@ -922,6 +922,8 @@ public string ThreadName public string UserName => m_data.UserName ??= TryGetCurrentUserName() ?? SystemInfo.NotAvailableText; + private static string _cachedWindowsIdentityName; + private static string TryGetCurrentUserName() { #if (NETCF || SSCLI || NETSTANDARD1_3) @@ -937,10 +939,13 @@ private static string TryGetCurrentUserName() try { - using (WindowsIdentity windowsIdentity = WindowsIdentity.GetCurrent()) + if (_cachedWindowsIdentityName is not null) { - return windowsIdentity?.Name ?? ""; + return _cachedWindowsIdentityName; } + + using var windowsIdentity = WindowsIdentity.GetCurrent(); + return _cachedWindowsIdentityName = windowsIdentity?.Name ?? ""; } catch (PlatformNotSupportedException) { From 03f686c2ace7dfbff81a32284c4d610dda4a55a0 Mon Sep 17 00:00:00 2001 From: Davyd McColl Date: Tue, 22 Feb 2022 16:29:41 +0200 Subject: [PATCH 048/122] Revert ":zap: cache resolved windows username when available" This reverts commit 025d7f6ac197fc8ca92c776b14d9205d6b899168. --- src/log4net/Core/LoggingEvent.cs | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/log4net/Core/LoggingEvent.cs b/src/log4net/Core/LoggingEvent.cs index 8d89ff935..26b76ba57 100644 --- a/src/log4net/Core/LoggingEvent.cs +++ b/src/log4net/Core/LoggingEvent.cs @@ -922,8 +922,6 @@ public string ThreadName public string UserName => m_data.UserName ??= TryGetCurrentUserName() ?? SystemInfo.NotAvailableText; - private static string _cachedWindowsIdentityName; - private static string TryGetCurrentUserName() { #if (NETCF || SSCLI || NETSTANDARD1_3) @@ -939,13 +937,10 @@ private static string TryGetCurrentUserName() try { - if (_cachedWindowsIdentityName is not null) + using (WindowsIdentity windowsIdentity = WindowsIdentity.GetCurrent()) { - return _cachedWindowsIdentityName; + return windowsIdentity?.Name ?? ""; } - - using var windowsIdentity = WindowsIdentity.GetCurrent(); - return _cachedWindowsIdentityName = windowsIdentity?.Name ?? ""; } catch (PlatformNotSupportedException) { From 9305ea9b46276c0ff5e5e200903390f6d995e454 Mon Sep 17 00:00:00 2001 From: Davyd McColl Date: Fri, 11 Mar 2022 17:10:27 +0200 Subject: [PATCH 049/122] :bug: should test rolling file name case-insensitive --- .../log4net-672/Program.cs | 151 +- .../log4net-672/log4net-672.csproj | 4 + .../Appender/RollingFileAppenderTest.cs | 4028 +++++++++-------- src/log4net/Appender/RollingFileAppender.cs | 150 +- src/log4net/Core/LoggingEvent.cs | 39 +- 5 files changed, 2234 insertions(+), 2138 deletions(-) diff --git a/src/integration-testing/log4net-672/Program.cs b/src/integration-testing/log4net-672/Program.cs index 64be479b0..79f476119 100644 --- a/src/integration-testing/log4net-672/Program.cs +++ b/src/integration-testing/log4net-672/Program.cs @@ -1,102 +1,91 @@ using System; +using System.Collections.Generic; using System.IO; +using System.Linq; using System.Reflection; -using System.Xml; using log4net; using log4net.Config; -using log4net.Core; -if (true) +const int NO_ERROR = 0; +const int MISSING_LOGS = 1; +const int OVERWRITTEN_LOGS = 2; + +var appPath = new Uri(Assembly.GetExecutingAssembly().Location).LocalPath; +var appFolder = Path.GetDirectoryName(appPath); +if (appFolder is null) +{ + throw new InvalidOperationException( + $"Can't determine app folder for {appPath}" + ); +} + +var logFolder = Path.Combine(appFolder, "Logs"); +if (Directory.Exists(logFolder)) +{ + Directory.Delete(logFolder, recursive: true); +} + +var configFile = Path.Combine(appFolder, "log4net.config"); +if (!File.Exists(configFile)) { - var appPath = new Uri(Assembly.GetExecutingAssembly().Location).LocalPath; - var appFolder = Path.GetDirectoryName(appPath); - if (appFolder is null) + throw new InvalidOperationException($"log4net.config not found at {configFile}"); +} + +var logCount = 10; +var identifiers = new List(); +for (var i = 0; i < 10; i++) +{ + var identifier = Guid.NewGuid(); + identifiers.Add(identifier); + var logged = LogWith(identifier, logCount); + if (logged != logCount) { - throw new InvalidOperationException( - $"Can't determine app folder for {appPath}" - ); + Die($"Missing logs immediately for '{identifier}' - found {logged}/{logCount}", MISSING_LOGS); } +} - var configFile = Path.Combine(appFolder, "log4net.config"); - if (!File.Exists(configFile)) +foreach (var identifier in identifiers) +{ + var logged = CountIdentifierInLogs(identifier); + if (logged != logCount) { - throw new InvalidOperationException($"log4net.config not found at {configFile}"); + Die($"Logs have been overwritten for '{identifier}' - found {logged}/{logCount}", OVERWRITTEN_LOGS); } +} - var info = new FileInfo(configFile); +Console.WriteLine("All good: LOG4NET-672 is resolved"); +return NO_ERROR; - XmlConfigurator.Configure(info); +void Die(string message, int exitCode) +{ + Console.Error.WriteLine(message); + Environment.Exit(exitCode); +} + +int CountIdentifierInLogs(Guid id) +{ + return Directory.EnumerateFiles("Logs").Select( + filePath => CountIdentifierInFile(id, filePath) + ).Sum(); +} + +int CountIdentifierInFile(Guid id, string filePath) +{ + var contents = File.ReadAllLines(filePath); + return contents.Count(line => line.Contains(id.ToString())); +} +int LogWith(Guid identifier, int howManyLogs) +{ + var info = new FileInfo(configFile); + XmlConfigurator.Configure(info); var logger = LogManager.GetLogger("main"); - for (var i = 0; i < 10; i++) + for (var i = 0; i < howManyLogs; i++) { - logger.Info($"test log {i}"); + logger.Info($"test log {i} [{identifier}]"); } LogManager.Flush(int.MaxValue); -} - -// Sample.Main(); -// -// public class Sample -// { -// private const string filename = "sampledata.xml"; -// -// public static void Main() -// { -// -// XmlTextWriter writer = new XmlTextWriter (filename, null); -// //Use indenting for readability. -// writer.Formatting = Formatting.Indented; -// -// writer.WriteComment("sample XML fragment"); -// -// //Write an element (this one is the root). -// writer.WriteStartElement("bookstore"); -// -// //Write the namespace declaration. -// writer.WriteAttributeString("xmlns", "bk", null, "log4net"); -// -// writer.WriteStartElement("book"); -// -// //Lookup the prefix and then write the ISBN attribute. -// string prefix = writer.LookupPrefix("urn:samples"); -// writer.WriteStartAttribute(prefix, "ISBN", "urn:samples"); -// writer.WriteString("1-861003-78"); -// writer.WriteEndAttribute(); -// -// //Write the title. -// writer.WriteStartElement("title"); -// writer.WriteString("The Handmaid's Tale"); -// writer.WriteEndElement(); -// -// //Write the price. -// writer.WriteElementString("price", "19.95"); -// -// //Write the style element. -// writer.WriteStartElement(prefix, "style", "urn:samples"); -// writer.WriteString("hardcover"); -// writer.WriteEndElement(); -// -// //Write the end tag for the book element. -// writer.WriteEndElement(); -// -// //Write the close tag for the root element. -// writer.WriteEndElement(); -// -// //Write the XML to file and close the writer. -// writer.Flush(); -// writer.Close(); -// -// //Read the file back in and parse to ensure well formed XML. -// XmlDocument doc = new XmlDocument(); -// //Preserve white space for readability. -// doc.PreserveWhitespace = true; -// //Load the file -// doc.Load(filename); -// -// //Write the XML content to the console. -// Console.Write(doc.InnerXml); -// } -// } + return CountIdentifierInLogs(identifier); +} \ No newline at end of file diff --git a/src/integration-testing/log4net-672/log4net-672.csproj b/src/integration-testing/log4net-672/log4net-672.csproj index e0ac3505b..5a134f92c 100644 --- a/src/integration-testing/log4net-672/log4net-672.csproj +++ b/src/integration-testing/log4net-672/log4net-672.csproj @@ -20,4 +20,8 @@ + + + + diff --git a/src/log4net.Tests/Appender/RollingFileAppenderTest.cs b/src/log4net.Tests/Appender/RollingFileAppenderTest.cs index 7280eec0f..d6cee4b90 100644 --- a/src/log4net.Tests/Appender/RollingFileAppenderTest.cs +++ b/src/log4net.Tests/Appender/RollingFileAppenderTest.cs @@ -1,4 +1,5 @@ #region Apache License + // // Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with @@ -15,6 +16,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // + #endregion using System; @@ -23,2036 +25,2118 @@ using System.IO; using System.Text; using System.Text.RegularExpressions; - using log4net.Appender; using log4net.Core; using log4net.Layout; using log4net.Repository.Hierarchy; using log4net.Util; - using NUnit.Framework; using System.Globalization; namespace log4net.Tests.Appender { - ///

- /// Used for internal unit testing the class. - ///

- [TestFixture] - public class RollingFileAppenderTest - { - private const string c_fileName = "test_41d3d834_4320f4da.log"; - private const string c_testMessage98Chars = "01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567"; - private const string c_testMessage99Chars = "012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678"; - private const int c_iMaximumFileSize = 450; // in bytes - private int _iMessagesLoggedThisFile = 0; - private int _iMessagesLogged = 0; - private int _iCountDirection = 0; - private int _MaxSizeRollBackups = 3; - private CountingAppender _caRoot; - private Logger _root; + ///

+ /// Used for internal unit testing the class. + ///

+ [TestFixture] + public class RollingFileAppenderTest + { + private const string c_fileName = "test_41d3d834_4320f4da.log"; + + private const string c_testMessage98Chars = + "01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567"; + + private const string c_testMessage99Chars = + "012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678"; + + private const int c_iMaximumFileSize = 450; // in bytes + private int _iMessagesLoggedThisFile = 0; + private int _iMessagesLogged = 0; + private int _iCountDirection = 0; + private int _MaxSizeRollBackups = 3; + private CountingAppender _caRoot; + private Logger _root; #if !NETSTANDARD1_3 - private CultureInfo _currentCulture; - private CultureInfo _currentUICulture; + private CultureInfo _currentCulture; + private CultureInfo _currentUICulture; #endif - private class SilentErrorHandler : IErrorHandler - { - private StringBuilder m_buffer = new StringBuilder(); - - public string Message - { - get { return m_buffer.ToString(); } - } - - public void Error(string message) - { - m_buffer.Append(message + "\n"); - } - - public void Error(string message, Exception e) - { - m_buffer.Append(message + "\n" + e.Message + "\n"); - } - - public void Error(string message, Exception e, ErrorCode errorCode) - { - m_buffer.Append(message + "\n" + e.Message + "\n"); - } - } - - ///

- /// Sets up variables used for the tests - ///

- private void InitializeVariables() - { - _iMessagesLoggedThisFile = 0; - _iMessagesLogged = 0; - _iCountDirection = +1; // Up - _MaxSizeRollBackups = 3; - } - - ///

- /// Shuts down any loggers in the hierarchy, along - /// with all appenders, and deletes any test files used - /// for logging. - ///

- private static void ResetAndDeleteTestFiles() - { - // Regular users should not use the clear method lightly! - Utils.GetRepository().ResetConfiguration(); - Utils.GetRepository().Shutdown(); - ((Repository.Hierarchy.Hierarchy)Utils.GetRepository()).Clear(); - - DeleteTestFiles(); - } - - ///

- /// Any initialization that happens before each test can - /// go here - ///

- [SetUp] - public void SetUp() - { - ResetAndDeleteTestFiles(); - InitializeVariables(); + private class SilentErrorHandler : IErrorHandler + { + private StringBuilder m_buffer = new StringBuilder(); + + public string Message + { + get { return m_buffer.ToString(); } + } + + public void Error(string message) + { + m_buffer.Append(message + "\n"); + } + + public void Error(string message, Exception e) + { + m_buffer.Append(message + "\n" + e.Message + "\n"); + } + + public void Error(string message, Exception e, ErrorCode errorCode) + { + m_buffer.Append(message + "\n" + e.Message + "\n"); + } + } + + ///

+ /// Sets up variables used for the tests + ///

+ private void InitializeVariables() + { + _iMessagesLoggedThisFile = 0; + _iMessagesLogged = 0; + _iCountDirection = +1; // Up + _MaxSizeRollBackups = 3; + } + + ///

+ /// Shuts down any loggers in the hierarchy, along + /// with all appenders, and deletes any test files used + /// for logging. + ///

+ private static void ResetAndDeleteTestFiles() + { + // Regular users should not use the clear method lightly! + Utils.GetRepository().ResetConfiguration(); + Utils.GetRepository().Shutdown(); + ((Repository.Hierarchy.Hierarchy)Utils.GetRepository()).Clear(); + + DeleteTestFiles(); + } + + ///

+ /// Any initialization that happens before each test can + /// go here + ///

+ [SetUp] + public void SetUp() + { + ResetAndDeleteTestFiles(); + InitializeVariables(); #if !NETSTANDARD1_3 - // set correct thread culture - _currentCulture = System.Threading.Thread.CurrentThread.CurrentCulture; - _currentUICulture = System.Threading.Thread.CurrentThread.CurrentUICulture; - System.Threading.Thread.CurrentThread.CurrentCulture = System.Threading.Thread.CurrentThread.CurrentUICulture = System.Globalization.CultureInfo.InvariantCulture; + // set correct thread culture + _currentCulture = System.Threading.Thread.CurrentThread.CurrentCulture; + _currentUICulture = System.Threading.Thread.CurrentThread.CurrentUICulture; + System.Threading.Thread.CurrentThread.CurrentCulture = + System.Threading.Thread.CurrentThread.CurrentUICulture = + System.Globalization.CultureInfo.InvariantCulture; #endif - } + } - ///

- /// Any steps that happen after each test go here - ///

- [TearDown] - public void TearDown() - { - ResetAndDeleteTestFiles(); + ///

+ /// Any steps that happen after each test go here + ///

+ [TearDown] + public void TearDown() + { + ResetAndDeleteTestFiles(); #if !NETSTANDARD1_3 - // restore previous culture - System.Threading.Thread.CurrentThread.CurrentCulture = _currentCulture; - System.Threading.Thread.CurrentThread.CurrentUICulture = _currentUICulture; + // restore previous culture + System.Threading.Thread.CurrentThread.CurrentCulture = _currentCulture; + System.Threading.Thread.CurrentThread.CurrentUICulture = _currentUICulture; #endif - } - - ///

- /// Finds the number of files that match the base file name, - /// and matches the result against an expected count - ///

- /// - private static void VerifyFileCount(int iExpectedCount) - { - VerifyFileCount(iExpectedCount, false); + } + + ///

+ /// Finds the number of files that match the base file name, + /// and matches the result against an expected count + ///

+ /// + private static void VerifyFileCount(int iExpectedCount) + { + VerifyFileCount(iExpectedCount, false); + } + + ///

+ /// Finds the number of files that match the base file name, + /// and matches the result against an expected count + ///

+ /// + private static void VerifyFileCount(int iExpectedCount, bool preserveLogFileNameExtension) + { + ArrayList alFiles = GetExistingFiles(c_fileName, preserveLogFileNameExtension); + Assert.IsNotNull(alFiles); + Assert.AreEqual(iExpectedCount, alFiles.Count); + } + + ///

+ /// Creates a file with the given number, and the shared base file name + ///

+ /// + private static void CreateFile(int iFileNumber) + { + FileInfo fileInfo = new FileInfo(MakeFileName(c_fileName, iFileNumber)); + + FileStream fileStream = null; + try + { + fileStream = fileInfo.Create(); + } + finally + { + if (null != fileStream) + { + try + { + fileStream.Close(); + } + catch + { + } } - ///

- /// Finds the number of files that match the base file name, - /// and matches the result against an expected count - ///

- /// - private static void VerifyFileCount(int iExpectedCount, bool preserveLogFileNameExtension) - { - ArrayList alFiles = GetExistingFiles(c_fileName, preserveLogFileNameExtension); - Assert.IsNotNull(alFiles); - Assert.AreEqual(iExpectedCount, alFiles.Count); - } - - ///

- /// Creates a file with the given number, and the shared base file name - ///

- /// - private static void CreateFile(int iFileNumber) - { - FileInfo fileInfo = new FileInfo(MakeFileName(c_fileName, iFileNumber)); - - FileStream fileStream = null; - try - { - fileStream = fileInfo.Create(); - } - finally - { - if (null != fileStream) - { - try - { - fileStream.Close(); - } - catch - { - } - } - } - } - - ///

- /// Verifies that the code correctly loads all filenames - ///

- [Test] - public void TestGetExistingFiles() - { - VerifyFileCount(0); - CreateFile(0); - VerifyFileCount(1); - CreateFile(1); - VerifyFileCount(2); - } - - [Test] - public void RollingCombinedWithPreserveExtension() + } + } + + ///

+ /// Verifies that the code correctly loads all filenames + ///

+ [Test] + public void TestGetExistingFiles() + { + VerifyFileCount(0); + CreateFile(0); + VerifyFileCount(1); + CreateFile(1); + VerifyFileCount(2); + } + + [Test] + public void RollingCombinedWithPreserveExtension() + { + _root = ((Repository.Hierarchy.Hierarchy)Utils.GetRepository()).Root; + _root.Level = Level.All; + PatternLayout patternLayout = new PatternLayout(); + patternLayout.ActivateOptions(); + + RollingFileAppender roller = new RollingFileAppender(); + roller.StaticLogFileName = false; + roller.Layout = patternLayout; + roller.AppendToFile = true; + roller.RollingStyle = RollingFileAppender.RollingMode.Composite; + roller.DatePattern = "dd_MM_yyyy"; + roller.MaxSizeRollBackups = 1; + roller.CountDirection = 1; + roller.PreserveLogFileNameExtension = true; + roller.MaximumFileSize = "10KB"; + roller.File = c_fileName; + roller.ActivateOptions(); + _root.AddAppender(roller); + + _root.Repository.Configured = true; + + for (int i = 0; i < 1000; i++) { - _root = ((Repository.Hierarchy.Hierarchy)Utils.GetRepository()).Root; - _root.Level = Level.All; - PatternLayout patternLayout = new PatternLayout(); - patternLayout.ActivateOptions(); - - RollingFileAppender roller = new RollingFileAppender(); - roller.StaticLogFileName = false; - roller.Layout = patternLayout; - roller.AppendToFile = true; - roller.RollingStyle = RollingFileAppender.RollingMode.Composite; - roller.DatePattern = "dd_MM_yyyy"; - roller.MaxSizeRollBackups = 1; - roller.CountDirection = 1; - roller.PreserveLogFileNameExtension = true; - roller.MaximumFileSize = "10KB"; - roller.File = c_fileName; - roller.ActivateOptions(); - _root.AddAppender(roller); - - _root.Repository.Configured = true; - - for (int i = 0; i < 1000; i++) + StringBuilder s = new StringBuilder(); + for (int j = 50; j < 100; j++) { - StringBuilder s = new StringBuilder(); - for (int j = 50; j < 100; j++) + if (j > 50) { - if (j > 50) { - s.Append(" "); - } - s.Append(j); + s.Append(" "); } - _root.Log(Level.Debug, s.ToString(), null); + + s.Append(j); } - VerifyFileCount(2, true); + + _root.Log(Level.Debug, s.ToString(), null); } - ///

- /// Removes all test files that exist - ///

- private static void DeleteTestFiles() - { - ArrayList alFiles = GetExistingFiles(c_fileName); - alFiles.AddRange(GetExistingFiles(c_fileName, true)); - foreach(string sFile in alFiles) - { - try - { - Debug.WriteLine("Deleting test file " + sFile); - File.Delete(sFile); - } - catch(Exception ex) - { - Debug.WriteLine("Exception while deleting test file " + ex); - } - } - } - - /////

- ///// Generates a file name associated with the count. - /////

- ///// - ///// - //private string MakeFileName(int iFileCount) - //{ - // return MakeFileName(_fileName, iFileCount); - //} - - ///

- /// Generates a file name associated with the count, using - /// the base file name. - ///

- /// - /// - /// - private static string MakeFileName(string sBaseFile, int iFileCount) - { - if (0 == iFileCount) - { - return sBaseFile; - } - return sBaseFile + "." + iFileCount; - } - - ///

- /// Returns a RollingFileAppender using all the internal settings for maximum - /// file size and number of backups - ///

- /// - private RollingFileAppender CreateAppender() - { - return CreateAppender(new FileAppender.ExclusiveLock()); - } - - ///

- /// Returns a RollingFileAppender using all the internal settings for maximum - /// file size and number of backups - ///

- /// The locking model to test - /// - private RollingFileAppender CreateAppender(FileAppender.LockingModelBase lockModel) - { - // - // Use a basic pattern that - // includes just the message and a CR/LF. - // - PatternLayout layout = new PatternLayout("%m%n"); - - // - // Create the new appender - // - RollingFileAppender appender = new RollingFileAppender(); - appender.Layout = layout; - appender.File = c_fileName; - appender.Encoding = Encoding.ASCII; - appender.MaximumFileSize = c_iMaximumFileSize.ToString(); - appender.MaxSizeRollBackups = _MaxSizeRollBackups; - appender.CountDirection = _iCountDirection; - appender.RollingStyle = RollingFileAppender.RollingMode.Size; - appender.LockingModel = lockModel; - - appender.ActivateOptions(); - - return appender; - } - - ///

- /// Used for test purposes, a table of these objects can be used to identify - /// any existing files and their expected length. - ///

- public class RollFileEntry - { - ///

- /// Stores the name of the file - ///

- private string m_fileName; - - ///

- /// The expected length of the file - ///

- private long m_fileLength; - - ///

- /// Default constructor - ///

- public RollFileEntry() - { - } - - ///

- /// Constructor used when the fileInfo and expected length are known - ///

- /// - /// - public RollFileEntry(string fileName, long fileLength) - { - m_fileName = fileName; - m_fileLength = fileLength; - } - - ///

- /// Stores the name of the file - ///

- public string FileName - { - get { return m_fileName; } - } - - ///

- /// The expected length of the file - ///

- public long FileLength - { - get { return m_fileLength; } - } - } - - ///

- /// Used for table-driven testing. This class holds information that can be used - /// for testing of file rolling. - ///

- public class RollConditions - { - ///

- /// A table of entries showing files that should exist and their expected sizes - /// before logging is called - ///

- private RollFileEntry[] m_preLogFileEntries; - - ///

- /// A table of entries showing files that should exist and their expected sizes - /// after a message is logged - ///

- private RollFileEntry[] m_postLogFileEntries; - - ///

- /// Constructor, taking all required parameters - ///

- /// - /// - public RollConditions(RollFileEntry[] preLogFileEntries, RollFileEntry[] postLogFileEntries) - { - m_preLogFileEntries = preLogFileEntries; - m_postLogFileEntries = postLogFileEntries; - } - - ///

- /// A table of entries showing files that should exist and their expected sizes - /// before logging is called - ///

- public RollFileEntry[] GetPreLogFileEntries() - { - return m_preLogFileEntries; - } - - ///

- /// A table of entries showing files that should exist and their expected sizes - /// after a message is logged - ///

- public RollFileEntry[] GetPostLogFileEntries() - { - return m_postLogFileEntries; - } - } - - private static void VerifyExistenceAndRemoveFromList(ArrayList alExisting, string sFileName, FileInfo file, RollFileEntry entry) - { - Assert.IsTrue(alExisting.Contains(sFileName), "filename {0} not found in test directory", sFileName); - Assert.AreEqual(entry.FileLength, file.Length, "file length mismatch"); - // Remove this file from the list - alExisting.Remove(sFileName); - } - - ///

- /// Checks that all the expected files exist, and only the expected files. Also - /// verifies the length of all files against the expected length - ///

- /// - /// - private static void VerifyFileConditions(string sBaseFileName, RollFileEntry[] fileEntries) - { - ArrayList alExisting = GetExistingFiles(sBaseFileName); - if (null != fileEntries) - { - // AssertEquals( "File count mismatch", alExisting.Count, fileEntries.Length ); - foreach(RollFileEntry rollFile in fileEntries) - { - string sFileName = rollFile.FileName; - FileInfo file = new FileInfo(sFileName); - - if (rollFile.FileLength > 0) - { - Assert.IsTrue(file.Exists, "filename {0} does not exist", sFileName); - VerifyExistenceAndRemoveFromList(alExisting, sFileName, file, rollFile); - } - else - { - // If length is 0, file may not exist yet. If file exists, make sure length - // is zero. If file doesn't exist, this is OK - - if (file.Exists) - { - VerifyExistenceAndRemoveFromList(alExisting, sFileName, file, rollFile); - } - } - } - } - else - { - Assert.AreEqual(0, alExisting.Count); - } - - // This check ensures no extra files matching the wildcard pattern exist. - // We only want the files we expect, and no others - Assert.AreEqual(0, alExisting.Count); - } - - ///

- /// Called before logging a message to check that all the expected files exist, - /// and only the expected files. Also verifies the length of all files against - /// the expected length - ///

- /// - /// - private static void VerifyPreConditions(string sBaseFileName, RollConditions entry) - { - VerifyFileConditions(sBaseFileName, entry.GetPreLogFileEntries()); - } - - ///

- /// Called after logging a message to check that all the expected files exist, - /// and only the expected files. Also verifies the length of all files against - /// the expected length - ///

- /// - /// - private static void VerifyPostConditions(string sBaseFileName, RollConditions entry) - { - VerifyFileConditions(sBaseFileName, entry.GetPostLogFileEntries()); - } - - ///

- /// Logs a message, verifying the expected message counts against the - /// current running totals. - ///

- /// - /// - private void LogMessage(RollConditions entry, string sMessageToLog) - { - Assert.AreEqual(_caRoot.Counter, _iMessagesLogged++); - _root.Log(Level.Debug, sMessageToLog, null); - Assert.AreEqual(_caRoot.Counter, _iMessagesLogged); - _iMessagesLoggedThisFile++; - } - - //private void DumpFileEntry( RollFileEntry entry ) - //{ - // System.Diagnostics.Debug.WriteLine( "\tfile name: " + entry.FileName ); - // System.Diagnostics.Debug.WriteLine( "\tfile length: " + entry.FileLength ); - //} - - //private void DumpTableEntry( RollConditions entry ) - //{ - // System.Diagnostics.Debug.WriteLine( "Pre-Conditions" ); - // foreach( RollFileEntry file in entry.GetPreLogFileEntries() ) - // { - // DumpFileEntry( file ); - // } - // System.Diagnostics.Debug.WriteLine( "Post-Conditions" ); - // foreach( RollFileEntry file in entry.GetPostLogFileEntries() ) - // { - // DumpFileEntry( file ); - // } - // // System.Diagnostics.Debug.WriteLine(""); - //} - - ///

- /// Runs through all table entries, logging messages. Before each message is logged, - /// pre-conditions are checked to ensure the expected files exist and they are the - /// expected size. After logging, verifies the same. - ///

- /// - /// - /// - private void RollFromTableEntries(string sBaseFileName, RollConditions[] entries, string sMessageToLog) - { - for(int i = 0; i < entries.Length; i++) - { - RollConditions entry = entries[i]; - - // System.Diagnostics.Debug.WriteLine( i + ": Entry " + i + " pre/post conditions"); - // DumpTableEntry( entry ); - // System.Diagnostics.Debug.WriteLine( i + ": Testing entry pre-conditions"); - VerifyPreConditions(sBaseFileName, entry); - // System.Diagnostics.Debug.WriteLine( i + ": Logging message"); - LogMessage(entry, sMessageToLog); - // System.Diagnostics.Debug.WriteLine( i + ": Testing entry post-conditions"); - VerifyPostConditions(sBaseFileName, entry); - // System.Diagnostics.Debug.WriteLine( i + ": Finished validating entry\n"); - } - } + VerifyFileCount(2, true); + } - private static readonly int s_Newline_Length = Environment.NewLine.Length; + ///

+ /// Removes all test files that exist + ///

+ private static void DeleteTestFiles() + { + ArrayList alFiles = GetExistingFiles(c_fileName); + alFiles.AddRange(GetExistingFiles(c_fileName, true)); + foreach (string sFile in alFiles) + { + try + { + Debug.WriteLine("Deleting test file " + sFile); + File.Delete(sFile); + } + catch (Exception ex) + { + Debug.WriteLine("Exception while deleting test file " + ex); + } + } + } - ///

- /// Returns the number of bytes logged per message, including - /// any newline characters in addition to the message length. - ///

- /// - /// - private static int TotalMessageLength(string sMessage) - { - return sMessage.Length + s_Newline_Length; - } - - ///

- /// Determines how many messages of a fixed length can be logged - /// to a single file before the file rolls. - ///

- /// - /// - private static int MessagesPerFile(int iMessageLength) - { - int iMessagesPerFile = c_iMaximumFileSize / iMessageLength; - - // - // RollingFileAppender checks for wrap BEFORE logging, - // so we will actually get one more message per file than - // we would otherwise. - // - if (iMessagesPerFile * iMessageLength < c_iMaximumFileSize) - { - iMessagesPerFile++; - } - - return iMessagesPerFile; - } - - ///

- /// Determines the name of the current file - ///

- /// - private static string GetCurrentFile() - { - // Current file name is always the base file name when - // counting. Dates will need a different approach - return c_fileName; - } - - ///

- /// Turns a group of file names into an array of file entries that include the name - /// and a size. This is useful for assigning the properties of backup files, when - /// the length of the files are all the same size due to a fixed message length. - ///

- /// - /// - /// - private static RollFileEntry[] MakeBackupFileEntriesFromBackupGroup(string sBackupGroup, int iBackupFileLength) - { - string[] sFiles = sBackupGroup.Split(' '); - - ArrayList alEntries = new ArrayList(); - - for(int i = 0; i < sFiles.Length; i++) - { - // Weed out any whitespace entries from the array - if (sFiles[i].Trim().Length > 0) - { - alEntries.Add(new RollFileEntry(sFiles[i], iBackupFileLength)); - } - } - - return (RollFileEntry[])alEntries.ToArray(typeof(RollFileEntry)); - } - - ///

- /// Finds the iGroup group in the string (comma separated groups) - ///

- /// - /// - /// - private static string GetBackupGroup(string sBackupGroups, int iGroup) - { - string[] sGroups = sBackupGroups.Split(','); - return sGroups[iGroup]; - } - - /////

- ///// Builds a collection of file entries based on the file names - ///// specified in a groups string and the max file size from the - ///// stats object - /////

- ///// - ///// - ///// - //private RollFileEntry[] MakeBackupFileEntriesForPreCondition( string sBackupGroups, RollingStats stats ) - //{ - // if (0 == stats.NumberOfFileRolls ) - // { - // return null; // first round has no previous backups - // } - // string sGroup; - // if (0 == stats.MessagesThisFile ) - // { - // // first file has special pattern...since rolling doesn't occur when message - // // is logged, rather before next message is logged. - // if (stats.NumberOfFileRolls <= 1 ) - // { - // return null; - // } - // // Use backup files from previous round. The minus 2 is because we have already - // // rolled, and the first round uses null instead of the string - // sGroup = GetBackupGroup( sBackupGroups, stats.NumberOfFileRolls-2 ); - // } - // else - // { - // sGroup = GetBackupGroup( sBackupGroups, stats.NumberOfFileRolls-1 ); - // } - // return MakeBackupFileEntriesFromBackupGroup( sGroup, stats.MaximumFileSize ); - //} - - ///

- /// Builds a collection of file entries based on the file names - /// specified in a groups string and the max file size from the - /// stats object - ///

- /// - /// - /// - private static RollFileEntry[] MakeBackupFileEntriesForPostCondition(string sBackupGroups, RollingStats stats) - { - if (0 == stats.NumberOfFileRolls) - { - return null; // first round has no previous backups - } - string sGroup = GetBackupGroup(sBackupGroups, stats.NumberOfFileRolls - 1); - return MakeBackupFileEntriesFromBackupGroup(sGroup, stats.MaximumFileSize); - } - - - ///

- /// This class holds information that is used while we are generating - /// test data sets - ///

- public class RollingStats - { - private int iTotalMessageLength; - private int iMessagesPerFile; - private int iMessagesThisFile; - private int iNumberOfFileRolls; - - ///

- /// Number of total bytes a log file can reach. - ///

- public int MaximumFileSize - { - get { return TotalMessageLength * MessagesPerFile; } - } - - ///

- /// The length of a message, including any CR/LF characters. - /// This length assumes all messages are a fixed length for - /// test purposes. - ///

- public int TotalMessageLength - { - get { return iTotalMessageLength; } - set { iTotalMessageLength = value; } - } - - ///

- /// A count of the number of messages that are logged to each - /// file. - ///

- public int MessagesPerFile - { - get { return iMessagesPerFile; } - set { iMessagesPerFile = value; } - } - - ///

- /// Counts how many messages have been logged to the current file - ///

- public int MessagesThisFile - { - get { return iMessagesThisFile; } - set { iMessagesThisFile = value; } - } - - ///

- /// Counts how many times a file roll has occurred - ///

- public int NumberOfFileRolls - { - get { return iNumberOfFileRolls; } - set { iNumberOfFileRolls = value; } - } - } - - ///

- /// The stats are used to keep track of progress while we are algorithmically - /// generating a table of pre/post condition tests for file rolling. - ///

- /// - /// - private static RollingStats InitializeStats(string sTestMessage) - { - RollingStats rollingStats = new RollingStats(); - - rollingStats.TotalMessageLength = TotalMessageLength(sTestMessage); - rollingStats.MessagesPerFile = MessagesPerFile(rollingStats.TotalMessageLength); - rollingStats.MessagesThisFile = 0; - rollingStats.NumberOfFileRolls = 0; - - return rollingStats; - } - - ///

- /// Takes an existing array of RollFileEntry objects, creates a new array one element - /// bigger, and appends the final element to the end. If the existing entries are - /// null (no entries), then a one-element array is returned with the final element - /// as the only entry. - ///

- /// - /// - /// - private static RollFileEntry[] AddFinalElement(RollFileEntry[] existing, RollFileEntry final) - { - int iLength = 1; - if (null != existing) - { - iLength += existing.Length; - } - RollFileEntry[] combined = new RollFileEntry[iLength]; - if (null != existing) - { - Array.Copy(existing, 0, combined, 0, existing.Length); - } - combined[iLength - 1] = final; - return combined; - } - - ///

- /// Generates the pre and post condition arrays from an array of backup files and the - /// current file / next file. - ///

- /// - /// - /// - /// - /// - /// - private static RollConditions BuildTableEntry(string sBackupFiles, RollConditions preCondition, RollFileEntry current, RollFileEntry currentNext, RollingStats rollingStats) - { - RollFileEntry[] backupsPost = MakeBackupFileEntriesForPostCondition(sBackupFiles, rollingStats); - RollFileEntry[] post = AddFinalElement(backupsPost, currentNext); - if (null == preCondition) - { - return new RollConditions(AddFinalElement(null, current), post); - } - return new RollConditions(preCondition.GetPostLogFileEntries(), post); - } - - ///

- /// Returns a RollFileEntry that represents the next state of the current file, - /// based on the current state. When the current state would roll, the next - /// entry is the current file wrapped to 0 bytes. Otherwise, the next state - /// is the post-condition passed in as the currentNext parameter - ///

- /// - /// - /// - private static RollFileEntry MoveNextEntry(RollingStats rollingStats, RollFileEntry currentNext) - { - rollingStats.MessagesThisFile = rollingStats.MessagesThisFile + 1; - if (rollingStats.MessagesThisFile >= rollingStats.MessagesPerFile) - { - rollingStats.MessagesThisFile = 0; - rollingStats.NumberOfFileRolls = rollingStats.NumberOfFileRolls + 1; - - return new RollFileEntry(GetCurrentFile(), 0); - } - else - { - return currentNext; - } - } - - ///

- /// Callback point for the regular expression parser. Turns - /// the number into a file name. - ///

- /// - /// - private static string NumberedNameMaker(Match match) - { - Int32 iValue = Int32.Parse(match.Value); - return MakeFileName(c_fileName, iValue); - } - - ///

- /// Parses a numeric list of files, turning them into file names. - /// Calls back to a method that does the actual replacement, turning - /// the numeric value into a filename. - ///

- /// - /// - /// - private static string ConvertToFiles(string sBackupInfo, MatchEvaluator evaluator) - { - Regex regex = new Regex(@"\d+"); - return regex.Replace(sBackupInfo, evaluator); - } - - ///

- /// Makes test entries used for verifying counted file names - ///

- /// A message to log repeatedly - /// Filename groups used to indicate backup file name progression - /// that results after each message is logged - /// How many times the test message will be repeatedly logged - /// - private static RollConditions[] MakeNumericTestEntries(string sTestMessage, string sBackupInfo, int iMessagesToLog) - { - return MakeTestEntries( - sTestMessage, - sBackupInfo, - iMessagesToLog, - new MatchEvaluator(NumberedNameMaker)); - } - - ///

- /// This routine takes a list of backup file names and a message that will be logged - /// repeatedly, and generates a collection of objects containing pre-condition and - /// post-condition information. This pre/post information shows the names and expected - /// file sizes for all files just before and just after a message is logged. - ///

- /// A message to log repeatedly - /// Filename groups used to indicate backup file name progression - /// that results after each message is logged - /// How many times the test message will be repeatedly logged - /// Function that can turn a number into a filename - /// - private static RollConditions[] MakeTestEntries(string sTestMessage, string sBackupInfo, int iMessagesToLog, MatchEvaluator evaluator) - { - string sBackupFiles = ConvertToFiles(sBackupInfo, evaluator); - - RollConditions[] table = new RollConditions[iMessagesToLog]; - - RollingStats rollingStats = InitializeStats(sTestMessage); - - RollConditions preCondition = null; - rollingStats.MessagesThisFile = 0; - - RollFileEntry currentFile = new RollFileEntry(GetCurrentFile(), 0); - for(int i = 0; i < iMessagesToLog; i++) - { - RollFileEntry currentNext = new RollFileEntry( - GetCurrentFile(), - (1 + rollingStats.MessagesThisFile) * rollingStats.TotalMessageLength); - - table[i] = BuildTableEntry(sBackupFiles, preCondition, currentFile, currentNext, rollingStats); - preCondition = table[i]; - - //System.Diagnostics.Debug.WriteLine( "Message " + i ); - //DumpTableEntry( table[i] ); - - currentFile = MoveNextEntry(rollingStats, currentNext); - } - - return table; - } - - ///

- /// Uses the externally defined rolling table to verify rolling names/sizes - ///

- /// - /// Pattern is: check pre-conditions. Log messages, checking size of current file. - /// when size exceeds limit, check post conditions. Can determine from message the - /// number of messages N that will cause a roll to occur. Challenge is to verify the - /// expected files, their sizes, and the names. For a message of length L, the backups - /// will be of size (N * L), and the current file will be of size (K * L), where K is - /// the number of messages that have been logged to this file. - /// - /// File sizes can be checked algorithmically. - /// - /// File names are generated using a table driven algorithm, where a number is turned into - /// the actual filename. - /// - /// The entries are comma-separated, with spaces between the names. Each comma indicates - /// a 'roll', and the group between commas indicates the numbers for all backup files that - /// occur as a result of the roll. It is assumed that no backup files exist before a roll - /// occurs - /// - /// - private void VerifyRolling(RollConditions[] table) - { - ConfigureRootAppender(); - RollFromTableEntries(c_fileName, table, GetTestMessage()); - } - - ///

- /// Validates rolling using a fixed number of backup files, with - /// count direction set to up, so that newer files have higher counts. - /// Newest = N, Oldest = N-K, where K is the number of backups to allow - /// and N is the number of times rolling has occurred. - ///

- [Test] - public void TestRollingCountUpFixedBackups() - { - // - // Oldest to newest when reading in a group left-to-right, so 1 2 3 means 1 is the - // oldest, and 3 is the newest - // - string sBackupInfo = "1, 1 2, 1 2 3, 2 3 4, 3 4 5"; - - // - // Count Up - // - _iCountDirection = +1; - - // - // Log 30 messages. This is 5 groups, 6 checks per group ( 0, 100, 200, 300, 400, 500 - // bytes for current file as messages are logged. - // - int iMessagesToLog = 30; - - VerifyRolling(MakeNumericTestEntries(GetTestMessage(), sBackupInfo, iMessagesToLog)); - } - - ///

- /// Validates rolling using an infinite number of backup files, with - /// count direction set to up, so that newer files have higher counts. - /// Newest = N, Oldest = 1, where N is the number of times rolling has - /// occurred. - ///

- [Test] - public void TestRollingCountUpInfiniteBackups() - { - // - // Oldest to newest when reading in a group left-to-right, so 1 2 3 means 1 is the - // oldest, and 3 is the newest - // - string sBackupInfo = "1, 1 2, 1 2 3, 1 2 3 4, 1 2 3 4 5"; - - // - // Count Up - // - _iCountDirection = +1; - - // - // Infinite backups - // - _MaxSizeRollBackups = -1; - - // - // Log 30 messages. This is 5 groups, 6 checks per group ( 0, 100, 200, 300, 400, 500 - // bytes for current file as messages are logged. - // - int iMessagesToLog = 30; - - VerifyRolling(MakeNumericTestEntries(GetTestMessage(), sBackupInfo, iMessagesToLog)); - } - - ///

- /// Validates rolling with no backup files, with count direction set to up. - /// Only the current file should be present, wrapping to 0 bytes once the - /// previous file fills up. - ///

- [Test] - public void TestRollingCountUpZeroBackups() - { - // - // Oldest to newest when reading in a group left-to-right, so 1 2 3 means 1 is the - // oldest, and 3 is the newest - // - string sBackupInfo = ", , , , "; - - // - // Count Up - // - _iCountDirection = +1; - - // - // No backups - // - _MaxSizeRollBackups = 0; - - // - // Log 30 messages. This is 5 groups, 6 checks per group ( 0, 100, 200, 300, 400, 500 - // bytes for current file as messages are logged. - // - int iMessagesToLog = 30; - - VerifyRolling(MakeNumericTestEntries(GetTestMessage(), sBackupInfo, iMessagesToLog)); - } - - - ///

- /// Validates rolling using a fixed number of backup files, with - /// count direction set to down, so that older files have higher counts. - /// Newest = 1, Oldest = N, where N is the number of backups to allow - ///

- [Test] - public void TestRollingCountDownFixedBackups() - { - // - // Oldest to newest when reading in a group left-to-right, so 1 2 3 means 1 is the - // oldest, and 3 is the newest - // - string sBackupInfo = "1, 1 2, 1 2 3, 1 2 3, 1 2 3"; - - // - // Count Up - // - _iCountDirection = -1; - - // - // Log 30 messages. This is 5 groups, 6 checks per group ( 0, 100, 200, 300, 400, 500 - // bytes for current file as messages are logged. - // - int iMessagesToLog = 30; - - VerifyRolling(MakeNumericTestEntries(GetTestMessage(), sBackupInfo, iMessagesToLog)); - } - - ///

- /// Validates rolling using an infinite number of backup files, with - /// count direction set to down, so that older files have higher counts. - /// Newest = 1, Oldest = N, where N is the number of times rolling has - /// occurred - ///

- [Test] - public void TestRollingCountDownInfiniteBackups() - { - // - // Oldest to newest when reading in a group left-to-right, so 1 2 3 means 1 is the - // oldest, and 3 is the newest - // - string sBackupInfo = "1, 1 2, 1 2 3, 1 2 3 4, 1 2 3 4 5"; - - // - // Count Down - // - _iCountDirection = -1; - - // - // Infinite backups - // - _MaxSizeRollBackups = -1; - - // - // Log 30 messages. This is 5 groups, 6 checks per group ( 0, 100, 200, 300, 400, 500 - // bytes for current file as messages are logged. - // - int iMessagesToLog = 30; - - VerifyRolling(MakeNumericTestEntries(GetTestMessage(), sBackupInfo, iMessagesToLog)); - } - - ///

- /// Validates rolling with no backup files, with count direction set to down. - /// Only the current file should be present, wrapping to 0 bytes once the - /// previous file fills up. - ///

- [Test] - public void TestRollingCountDownZeroBackups() - { - // - // Oldest to newest when reading in a group left-to-right, so 1 2 3 means 1 is the - // oldest, and 3 is the newest - // - string sBackupInfo = ", , , , "; - - // - // Count Up - // - _iCountDirection = -1; - - // - // No backups - // - _MaxSizeRollBackups = 0; - - // - // Log 30 messages. This is 5 groups, 6 checks per group ( 0, 100, 200, 300, 400, 500 - // bytes for current file as messages are logged. - // - int iMessagesToLog = 30; - - VerifyRolling(MakeNumericTestEntries(GetTestMessage(), sBackupInfo, iMessagesToLog)); - } - - ///

- /// Configures the root appender for counting and rolling - ///

- private void ConfigureRootAppender() - { - _root = ((Repository.Hierarchy.Hierarchy)Utils.GetRepository()).Root; - _root.Level = Level.Debug; - _caRoot = new CountingAppender(); - _root.AddAppender(_caRoot); - Assert.AreEqual(_caRoot.Counter, 0); - - // - // Set the root appender with a RollingFileAppender - // - _root.AddAppender(CreateAppender()); - - _root.Repository.Configured = true; - } - - ///

- /// Verifies that the current backup index is detected correctly when initializing - ///

- /// - /// - /// - private static void VerifyInitializeRollBackupsFromBaseFile(string sBaseFile, ArrayList alFiles, int iExpectedCurSizeRollBackups) - { - InitializeAndVerifyExpectedValue(alFiles, sBaseFile, CreateRollingFileAppender("5,0,1"), iExpectedCurSizeRollBackups); - } - - ///

- /// Tests that the current backup index is 0 when no - /// existing files are seen - ///

- [Test] - public void TestInitializeRollBackups1() - { - string sBaseFile = "LogFile.log"; - ArrayList arrFiles = new ArrayList(); - arrFiles.Add("junk1"); - arrFiles.Add("junk1.log"); - arrFiles.Add("junk2.log"); - arrFiles.Add("junk.log.1"); - arrFiles.Add("junk.log.2"); - - int iExpectedCurSizeRollBackups = 0; - VerifyInitializeRollBackupsFromBaseFile(sBaseFile, arrFiles, iExpectedCurSizeRollBackups); - } - - ///

- /// Verifies that files are detected when the base file is specified - ///

- /// - private static void VerifyInitializeRollBackupsFromBaseFile(string sBaseFile) - { - ArrayList alFiles = MakeTestDataFromString(sBaseFile, "0,1,2"); - - int iExpectedCurSizeRollBackups = 2; - VerifyInitializeRollBackupsFromBaseFile(sBaseFile, alFiles, iExpectedCurSizeRollBackups); - } - - ///