This is an automated email from the ASF dual-hosted git repository. freeandnil pushed a commit to branch Feature/118-nullability in repository https://gitbox.apache.org/repos/asf/logging-log4net.git
commit db32e7e083ffcc4b5a24473ace444bce946fc61c Author: Erik Mavrinac <[email protected]> AuthorDate: Mon Mar 11 09:54:56 2024 -0700 PR comments --- .editorconfig | 2 ++ src/log4net/Appender/FileAppender.cs | 6 +++--- src/log4net/Appender/RollingFileAppender.cs | 5 +---- src/log4net/AssemblyInfo.cs | 5 ++++- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..ea294227 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,2 @@ +indent_style = space +indent_size = 2 diff --git a/src/log4net/Appender/FileAppender.cs b/src/log4net/Appender/FileAppender.cs index 843ea1d4..8c0c4c5a 100644 --- a/src/log4net/Appender/FileAppender.cs +++ b/src/log4net/Appender/FileAppender.cs @@ -146,7 +146,7 @@ namespace log4net.Appender return base.WriteAsync(buffer, offset, count, cancellationToken); } - public override void Flush() + public override void Flush() { AssertLocked().Flush(); } @@ -228,9 +228,9 @@ namespace log4net.Appender } } - #endregion Override Implementation of Stream + #endregion Override Implementation of Stream - #region Locking Methods + #region Locking Methods private Stream AssertLocked() { diff --git a/src/log4net/Appender/RollingFileAppender.cs b/src/log4net/Appender/RollingFileAppender.cs index 1b8481f3..17a790e1 100644 --- a/src/log4net/Appender/RollingFileAppender.cs +++ b/src/log4net/Appender/RollingFileAppender.cs @@ -21,7 +21,6 @@ using System; using System.Collections.Generic; using System.Globalization; using System.IO; -using System.Runtime.CompilerServices; using log4net.Util; using log4net.Core; @@ -29,8 +28,6 @@ using System.Threading; #nullable enable -[assembly: InternalsVisibleTo("log4net.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100297dcac908e28689360399027b0ea4cd852fbb74e1ed95e695a5ba55cbd1d075ec20cdb5fa6fc593d3d571527b20558d6f39e1f4d5cfe0798428c589c311965244b209c38a02aaa8c9da3b72405b6fedeeb4292c3457e9769b74e645c19cb06c2be75fb2d12281a585fbeabf7bd195d6961ba113286fc3e286d7bbd69024ceda")] - namespace log4net.Appender { #if CONFIRM_WIN32_FILE_SHAREMODES @@ -1333,7 +1330,7 @@ namespace log4net.Appender if (File is not null) { - RollOverRenameFiles(File); + RollOverRenameFiles(File); } if (!StaticLogFileName && CountDirection >= 0) diff --git a/src/log4net/AssemblyInfo.cs b/src/log4net/AssemblyInfo.cs index ed3f5f72..4baf481c 100644 --- a/src/log4net/AssemblyInfo.cs +++ b/src/log4net/AssemblyInfo.cs @@ -18,6 +18,7 @@ #endregion using System.Reflection; +using System.Runtime.CompilerServices; // // log4net makes use of static methods which cannot be made com visible @@ -62,4 +63,6 @@ using System.Reflection; [assembly: AssemblyProduct("log4net")] [assembly: AssemblyDefaultAlias("log4net")] -[assembly: AssemblyCulture("")] \ No newline at end of file +[assembly: AssemblyCulture("")] + +[assembly: InternalsVisibleTo("log4net.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100297dcac908e28689360399027b0ea4cd852fbb74e1ed95e695a5ba55cbd1d075ec20cdb5fa6fc593d3d571527b20558d6f39e1f4d5cfe0798428c589c311965244b209c38a02aaa8c9da3b72405b6fedeeb4292c3457e9769b74e645c19cb06c2be75fb2d12281a585fbeabf7bd195d6961ba113286fc3e286d7bbd69024ceda")]
