Codestin Search App

diff --git a/BUILDING.md b/BUILDING.md index f8de5e2c..2330e8cf 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -32,6 +32,7 @@ Options: - `npm run build` - optionally `npm test` to run all tests - optionally `npm run release` to generate release artifacts +- build via docker for windows, using the `build-with-docker-for-windows.bat` script - build via the vs2019 Windows AppVeyer image. There is an appveyer.yml file included which (should) build if you set up AppVeyer to track your fork. AppVeyer is free for open-source projects. diff --git a/package-lock.json b/package-lock.json index 5368c2fd..e02ddb9e 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 09ab351c..b535be67 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,11 @@ { "name": "log4net", - "version": "2.0.9", + "version": "2.0.12", "description": "Log4Net is a logging framework for .NET", "scripts": { "test": "cross-env NUNIT_PROCESS=Single MAX_CONCURRENCY=1 run-s clean-build \"zarro test-dotnet\" run-dotnet-core-tests", + "test-xplatform": "run-s build-xplatform run-dotnet-core-tests", + "build-xplatform": "cross-env DOTNET_CORE=1 BUILD_CONFIGURATION=CrossPlatform run-s build", "run-dotnet-core-tests": "cross-env DOTNET_CORE=1 run-s \"zarro quick-test-dotnet\"", "clean-build": "rimraf build", "build": "run-s clean-build \"zarro build\"", @@ -27,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", diff --git a/src/Directory.Build.props b/src/Directory.Build.props new file mode 100644 index 00000000..41fa9c90 --- /dev/null +++ b/src/Directory.Build.props @@ -0,0 +1,5 @@ + + + true + + diff --git a/src/MonoForFramework.targets b/src/MonoForFramework.targets new file mode 100644 index 00000000..4209d58f --- /dev/null +++ b/src/MonoForFramework.targets @@ -0,0 +1,28 @@ + + + + + + /Library/Frameworks/Mono.framework/Versions/Current/lib/mono + /usr/lib/mono + /usr/local/lib/mono + + $(BaseFrameworkPathOverrideForMono)/2.0-api + $(BaseFrameworkPathOverrideForMono)/3.5-api + $(BaseFrameworkPathOverrideForMono)/4.0-api + $(BaseFrameworkPathOverrideForMono)/4.5-api + $(BaseFrameworkPathOverrideForMono)/4.5.1-api + $(BaseFrameworkPathOverrideForMono)/4.5.2-api + $(BaseFrameworkPathOverrideForMono)/4.6-api + $(BaseFrameworkPathOverrideForMono)/4.6.1-api + $(BaseFrameworkPathOverrideForMono)/4.6.2-api + $(BaseFrameworkPathOverrideForMono)/4.7-api + $(BaseFrameworkPathOverrideForMono)/4.7.1-api + $(BaseFrameworkPathOverrideForMono)/4.7.2-api + $(BaseFrameworkPathOverrideForMono)/4.8-api + true + + $(FrameworkPathOverride)/Facades;$(AssemblySearchPaths) + + + diff --git a/src/log4net.Tests/LoggerRepository/ConfigurationMessages.cs b/src/log4net.Tests/LoggerRepository/ConfigurationMessages.cs index e9a88778..daa26724 100644 --- a/src/log4net.Tests/LoggerRepository/ConfigurationMessages.cs +++ b/src/log4net.Tests/LoggerRepository/ConfigurationMessages.cs @@ -80,7 +80,7 @@ static void rep_ConfigurationChanged(object sender, EventArgs e) public class LogLogAppender : AppenderSkeleton { - private readonly static Type declaringType = typeof(LogLogAppender); + private static readonly Type declaringType = typeof(LogLogAppender); public override void ActivateOptions() { diff --git a/src/log4net.Tests/log4net.Tests.csproj b/src/log4net.Tests/log4net.Tests.csproj index 6af4bf90..7da2aaf4 100644 --- a/src/log4net.Tests/log4net.Tests.csproj +++ b/src/log4net.Tests/log4net.Tests.csproj @@ -27,6 +27,8 @@ true ..\..\log4net.snk bin\$(Configuration) + Debug;Release;CrossPlatform + AnyCPU 285212672 @@ -60,6 +62,10 @@ + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + @@ -82,4 +88,5 @@ - \ No newline at end of file + + diff --git a/src/log4net.sln b/src/log4net.sln index e6e79280..c08c55c2 100644 --- a/src/log4net.sln +++ b/src/log4net.sln @@ -28,16 +28,21 @@ Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU + CrossPlatform|Any CPU = CrossPlatform|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {181FE707-E161-4722-9F38-6AAAB6FAA106}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {181FE707-E161-4722-9F38-6AAAB6FAA106}.Debug|Any CPU.Build.0 = Debug|Any CPU {181FE707-E161-4722-9F38-6AAAB6FAA106}.Release|Any CPU.ActiveCfg = Release|Any CPU {181FE707-E161-4722-9F38-6AAAB6FAA106}.Release|Any CPU.Build.0 = Release|Any CPU + {181FE707-E161-4722-9F38-6AAAB6FAA106}.CrossPlatform|Any CPU.ActiveCfg = CrossPlatform|Any CPU + {181FE707-E161-4722-9F38-6AAAB6FAA106}.CrossPlatform|Any CPU.Build.0 = CrossPlatform|Any CPU {B0530F10-0238-49A9-93B0-8EF412E90BCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B0530F10-0238-49A9-93B0-8EF412E90BCF}.Debug|Any CPU.Build.0 = Debug|Any CPU {B0530F10-0238-49A9-93B0-8EF412E90BCF}.Release|Any CPU.ActiveCfg = Release|Any CPU {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 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/log4net/Appender/AdoNetAppender.cs b/src/log4net/Appender/AdoNetAppender.cs index 72a5a762..dd9939ba 100644 --- a/src/log4net/Appender/AdoNetAppender.cs +++ b/src/log4net/Appender/AdoNetAppender.cs @@ -407,7 +407,7 @@ protected IDbConnection Connection /// must be called again. /// /// - override public void ActivateOptions() + public override void ActivateOptions() { base.ActivateOptions(); @@ -431,7 +431,7 @@ override public void ActivateOptions() /// Closes the database command and database connection. /// /// - override protected void OnClose() + protected override void OnClose() { base.OnClose(); DiposeConnection(); @@ -451,7 +451,7 @@ override protected void OnClose() /// array into the database. /// /// - override protected void SendBuffer(LoggingEvent[] events) + protected override void SendBuffer(LoggingEvent[] events) { if (ReconnectOnError && (Connection == null || Connection.State != ConnectionState.Open)) { @@ -536,7 +536,7 @@ public void AddParameter(AdoNetAppenderParameter parameter) /// property for more information. /// /// - virtual protected void SendBuffer(IDbTransaction dbTran, LoggingEvent[] events) + protected virtual void SendBuffer(IDbTransaction dbTran, LoggingEvent[] events) { // string.IsNotNullOrWhiteSpace() does not exist in ancient .NET frameworks if (CommandText != null && CommandText.Trim() != "") @@ -608,7 +608,7 @@ virtual protected void SendBuffer(IDbTransaction dbTran, LoggingEvent[] events) /// /// Text that can be passed to a . /// - virtual protected string GetLogStatement(LoggingEvent logEvent) + protected virtual string GetLogStatement(LoggingEvent logEvent) { if (Layout == null) { @@ -632,7 +632,7 @@ virtual protected string GetLogStatement(LoggingEvent logEvent) /// The of the object. /// The connectionString output from the ResolveConnectionString method. /// An instance with a valid connection string. - virtual protected IDbConnection CreateConnection(Type connectionType, string connectionString) + protected virtual IDbConnection CreateConnection(Type connectionType, string connectionString) { IDbConnection connection = (IDbConnection)Activator.CreateInstance(connectionType); connection.ConnectionString = connectionString; @@ -648,7 +648,7 @@ virtual protected IDbConnection CreateConnection(Type connectionType, string con /// /// Additional information describing the connection string. /// A connection string used to connect to the database. - virtual protected string ResolveConnectionString(out string connectionStringContext) + protected virtual string ResolveConnectionString(out string connectionStringContext) { if (ConnectionString != null && ConnectionString.Length > 0) { @@ -702,7 +702,7 @@ virtual protected string ResolveConnectionString(out string connectionStringCont /// /// /// The of the ADO.NET provider - virtual protected Type ResolveConnectionType() + protected virtual Type ResolveConnectionType() { try { @@ -858,7 +858,7 @@ private void DiposeConnection() /// Used by the internal logger to record the Type of the /// log message. /// - private readonly static Type declaringType = typeof(AdoNetAppender); + private static readonly Type declaringType = typeof(AdoNetAppender); #endregion Private Static Fields } @@ -1053,7 +1053,7 @@ public IRawLayout Layout /// this parameter to its collection of parameters. /// /// - virtual public void Prepare(IDbCommand command) + public virtual void Prepare(IDbCommand command) { // Create a new parameter IDbDataParameter param = command.CreateParameter(); @@ -1093,7 +1093,7 @@ virtual public void Prepare(IDbCommand command) /// object. Sets the value of the parameter on the command object. /// /// - virtual public void FormatValue(IDbCommand command, LoggingEvent loggingEvent) + public virtual void FormatValue(IDbCommand command, LoggingEvent loggingEvent) { // Lookup the parameter IDbDataParameter param = (IDbDataParameter)command.Parameters[ParameterName]; diff --git a/src/log4net/Appender/AnsiColorTerminalAppender.cs b/src/log4net/Appender/AnsiColorTerminalAppender.cs index 2f074766..50a6875c 100644 --- a/src/log4net/Appender/AnsiColorTerminalAppender.cs +++ b/src/log4net/Appender/AnsiColorTerminalAppender.cs @@ -246,7 +246,7 @@ public AnsiColorTerminalAppender() /// This is either "Console.Out" or "Console.Error". /// /// - virtual public string Target + public virtual string Target { get { return m_writeToErrorStream ? ConsoleError : ConsoleOut; } set @@ -296,7 +296,7 @@ public void AddMapping(LevelColors mapping) /// The format of the output will depend on the appender's layout. /// /// - override protected void Append(log4net.Core.LoggingEvent loggingEvent) + protected override void Append(log4net.Core.LoggingEvent loggingEvent) { string loggingMessage = RenderLoggingEvent(loggingEvent); @@ -366,7 +366,7 @@ override protected void Append(log4net.Core.LoggingEvent loggingEvent) /// This appender requires a to be set. /// /// - override protected bool RequiresLayout + protected override bool RequiresLayout { get { return true; } } diff --git a/src/log4net/Appender/AppenderCollection.cs b/src/log4net/Appender/AppenderCollection.cs index 21987b84..14f2304b 100644 --- a/src/log4net/Appender/AppenderCollection.cs +++ b/src/log4net/Appender/AppenderCollection.cs @@ -160,7 +160,7 @@ public AppenderCollection(ICollection col) /// Used to access protected constructor /// /// - internal protected enum Tag + protected internal enum Tag { ///

/// A value @@ -173,7 +173,7 @@ internal protected enum Tag ///

/// /// - internal protected AppenderCollection(Tag tag) + protected internal AppenderCollection(Tag tag) { m_array = null; } diff --git a/src/log4net/Appender/AppenderSkeleton.cs b/src/log4net/Appender/AppenderSkeleton.cs index 44fb6904..44b68c75 100644 --- a/src/log4net/Appender/AppenderSkeleton.cs +++ b/src/log4net/Appender/AppenderSkeleton.cs @@ -121,7 +121,7 @@ public Level Threshold /// implementation for the property. /// /// - virtual public IErrorHandler ErrorHandler + public virtual IErrorHandler ErrorHandler { get { return this.m_errorHandler; } set @@ -152,7 +152,7 @@ virtual public IErrorHandler ErrorHandler /// and so all Filters on this Appender are available through the result. /// /// - virtual public IFilter FilterHead + public virtual IFilter FilterHead { get { return m_headFilter; } } @@ -167,7 +167,7 @@ virtual public IFilter FilterHead /// /// /// - virtual public ILayout Layout + public virtual ILayout Layout { get { return m_layout; } set { m_layout = value; } @@ -193,7 +193,7 @@ virtual public ILayout Layout /// must be called again. /// /// - virtual public void ActivateOptions() + public virtual void ActivateOptions() { } @@ -479,7 +479,7 @@ public void DoAppend(LoggingEvent[] loggingEvents) /// /// /// - virtual protected bool FilterEvent(LoggingEvent loggingEvent) + protected virtual bool FilterEvent(LoggingEvent loggingEvent) { if (!IsAsSevereAsThreshold(loggingEvent.Level)) { @@ -523,7 +523,7 @@ virtual protected bool FilterEvent(LoggingEvent loggingEvent) /// back of the filter chain. /// /// - virtual public void AddFilter(IFilter filter) + public virtual void AddFilter(IFilter filter) { if (filter == null) { @@ -549,7 +549,7 @@ virtual public void AddFilter(IFilter filter) /// Clears the filter list for this appender. /// /// - virtual public void ClearFilters() + public virtual void ClearFilters() { m_headFilter = m_tailFilter = null; } @@ -571,7 +571,7 @@ virtual public void ClearFilters() /// true if the meets the /// requirements of this appender. /// - virtual protected bool IsAsSevereAsThreshold(Level level) + protected virtual bool IsAsSevereAsThreshold(Level level) { return ((m_threshold == null) || level >= m_threshold); } @@ -589,7 +589,7 @@ virtual protected bool IsAsSevereAsThreshold(Level level) /// It is a programming error to append to a closed appender. /// /// - virtual protected void OnClose() + protected virtual void OnClose() { // Do nothing by default } @@ -612,7 +612,7 @@ virtual protected void OnClose() /// override the method. /// /// - abstract protected void Append(LoggingEvent loggingEvent); + protected abstract void Append(LoggingEvent loggingEvent); ///

/// Append a bulk array of logging events. @@ -628,7 +628,7 @@ virtual protected void OnClose() /// override this method in addition to . /// /// - virtual protected void Append(LoggingEvent[] loggingEvents) + protected virtual void Append(LoggingEvent[] loggingEvents) { foreach(LoggingEvent loggingEvent in loggingEvents) { @@ -654,7 +654,7 @@ virtual protected void Append(LoggingEvent[] loggingEvents) /// /// /// true if the call to should proceed. - virtual protected bool PreAppendCheck() + protected virtual bool PreAppendCheck() { if ((m_layout == null) && RequiresLayout) { @@ -775,7 +775,7 @@ protected void RenderLoggingEvent(TextWriter writer, LoggingEvent loggingEvent) /// /// true if the appender requires a layout object, otherwise false. /// - virtual protected bool RequiresLayout + protected virtual bool RequiresLayout { get { return false; } } @@ -902,7 +902,7 @@ public virtual bool Flush(int millisecondsTimeout) /// Used by the internal logger to record the Type of the /// log message. /// - private readonly static Type declaringType = typeof(AppenderSkeleton); + private static readonly Type declaringType = typeof(AppenderSkeleton); #endregion Private Static Fields } diff --git a/src/log4net/Appender/AspNetTraceAppender.cs b/src/log4net/Appender/AspNetTraceAppender.cs index a8e3f522..bffa0459 100644 --- a/src/log4net/Appender/AspNetTraceAppender.cs +++ b/src/log4net/Appender/AspNetTraceAppender.cs @@ -85,7 +85,7 @@ public AspNetTraceAppender() /// (). /// /// - override protected void Append(LoggingEvent loggingEvent) + protected override void Append(LoggingEvent loggingEvent) { // check if log4net is running in the context of an ASP.NET application if (HttpContext.Current != null) @@ -114,7 +114,7 @@ override protected void Append(LoggingEvent loggingEvent) /// This appender requires a to be set. /// /// - override protected bool RequiresLayout + protected override bool RequiresLayout { get { return true; } } diff --git a/src/log4net/Appender/BufferingAppenderSkeleton.cs b/src/log4net/Appender/BufferingAppenderSkeleton.cs index 91b49f45..c49d8382 100644 --- a/src/log4net/Appender/BufferingAppenderSkeleton.cs +++ b/src/log4net/Appender/BufferingAppenderSkeleton.cs @@ -222,7 +222,7 @@ public ITriggeringEventEvaluator LossyEvaluator /// /// [Obsolete("Use Fix property")] - virtual public bool OnlyFixPartialEventData + public virtual bool OnlyFixPartialEventData { get { return (Fix == FixFlags.Partial); } set @@ -252,7 +252,7 @@ virtual public bool OnlyFixPartialEventData /// /// /// - virtual public FixFlags Fix + public virtual FixFlags Fix { get { return m_fixFlags; } set { m_fixFlags = value; } @@ -381,7 +381,7 @@ public virtual void Flush(bool flushLossyBuffer) /// must be called again. /// /// - override public void ActivateOptions() + public override void ActivateOptions() { base.ActivateOptions(); @@ -417,7 +417,7 @@ override public void ActivateOptions() /// the buffer must be sent when the appender is closed. /// /// - override protected void OnClose() + protected override void OnClose() { // Flush the buffer on close Flush(true); @@ -453,7 +453,7 @@ override protected void OnClose() /// is processed. /// /// - override protected void Append(LoggingEvent loggingEvent) + protected override void Append(LoggingEvent loggingEvent) { // If the buffer size is set to 1 or less then the buffer will be // sent immediately because there is not enough space in the buffer @@ -542,7 +542,7 @@ override protected void Append(LoggingEvent loggingEvent) /// The subclass must override . /// /// - virtual protected void SendFromBuffer(LoggingEvent firstLoggingEvent, CyclicBuffer buffer) + protected virtual void SendFromBuffer(LoggingEvent firstLoggingEvent, CyclicBuffer buffer) { LoggingEvent[] bufferEvents = buffer.PopAll(); @@ -576,7 +576,7 @@ virtual protected void SendFromBuffer(LoggingEvent firstLoggingEvent, CyclicBuff /// The subclass must override this method to process the buffered events. /// /// - abstract protected void SendBuffer(LoggingEvent[] events); + protected abstract void SendBuffer(LoggingEvent[] events); #region Private Static Fields diff --git a/src/log4net/Appender/BufferingForwardingAppender.cs b/src/log4net/Appender/BufferingForwardingAppender.cs index 17d02b89..20c36241 100644 --- a/src/log4net/Appender/BufferingForwardingAppender.cs +++ b/src/log4net/Appender/BufferingForwardingAppender.cs @@ -74,7 +74,7 @@ public BufferingForwardingAppender() /// It is a programming error to append to a closed appender. /// /// - override protected void OnClose() + protected override void OnClose() { // Remove all the attached appenders lock(this) @@ -102,7 +102,7 @@ override protected void OnClose() /// Forwards the events to the attached appenders. /// /// - override protected void SendBuffer(LoggingEvent[] events) + protected override void SendBuffer(LoggingEvent[] events) { // Pass the logging event on to the attached appenders if (m_appenderAttachedImpl != null) @@ -126,7 +126,7 @@ override protected void SendBuffer(LoggingEvent[] events) /// appenders, then it won't be added again. /// /// - virtual public void AddAppender(IAppender newAppender) + public virtual void AddAppender(IAppender newAppender) { if (newAppender == null) { @@ -153,7 +153,7 @@ virtual public void AddAppender(IAppender newAppender) /// /// A collection of the appenders in this appender. /// - virtual public AppenderCollection Appenders + public virtual AppenderCollection Appenders { get { @@ -183,7 +183,7 @@ virtual public AppenderCollection Appenders /// Get the named appender attached to this buffering appender. /// /// - virtual public IAppender GetAppender(string name) + public virtual IAppender GetAppender(string name) { lock(this) { @@ -204,7 +204,7 @@ virtual public IAppender GetAppender(string name) /// This is useful when re-reading configuration information. /// /// - virtual public void RemoveAllAppenders() + public virtual void RemoveAllAppenders() { lock(this) { @@ -226,7 +226,7 @@ virtual public void RemoveAllAppenders() /// If you are discarding the appender you must call /// on the appender removed. /// - virtual public IAppender RemoveAppender(IAppender appender) + public virtual IAppender RemoveAppender(IAppender appender) { lock(this) { @@ -248,7 +248,7 @@ virtual public IAppender RemoveAppender(IAppender appender) /// If you are discarding the appender you must call /// on the appender removed. /// - virtual public IAppender RemoveAppender(string name) + public virtual IAppender RemoveAppender(string name) { lock(this) { diff --git a/src/log4net/Appender/ColoredConsoleAppender.cs b/src/log4net/Appender/ColoredConsoleAppender.cs index d3949708..cbcc8757 100644 --- a/src/log4net/Appender/ColoredConsoleAppender.cs +++ b/src/log4net/Appender/ColoredConsoleAppender.cs @@ -216,7 +216,7 @@ public ColoredConsoleAppender(ILayout layout, bool writeToErrorStream) /// This is either "Console.Out" or "Console.Error". /// /// - virtual public string Target + public virtual string Target { get { return m_writeToErrorStream ? ConsoleError : ConsoleOut; } set @@ -270,7 +270,7 @@ public void AddMapping(LevelColors mapping) [System.Security.SecuritySafeCritical] #endif [System.Security.Permissions.SecurityPermission(System.Security.Permissions.SecurityAction.Demand, UnmanagedCode = true)] - override protected void Append(log4net.Core.LoggingEvent loggingEvent) + protected override void Append(log4net.Core.LoggingEvent loggingEvent) { if (m_consoleOutputWriter != null) { @@ -422,7 +422,7 @@ override protected void Append(log4net.Core.LoggingEvent loggingEvent) /// This appender requires a to be set. /// /// - override protected bool RequiresLayout + protected override bool RequiresLayout { get { return true; } } diff --git a/src/log4net/Appender/ConsoleAppender.cs b/src/log4net/Appender/ConsoleAppender.cs index d5d6a702..760aace4 100644 --- a/src/log4net/Appender/ConsoleAppender.cs +++ b/src/log4net/Appender/ConsoleAppender.cs @@ -115,7 +115,7 @@ public ConsoleAppender(ILayout layout, bool writeToErrorStream) /// This is either "Console.Out" or "Console.Error". /// /// - virtual public string Target + public virtual string Target { get { return m_writeToErrorStream ? ConsoleError : ConsoleOut; } set @@ -149,7 +149,7 @@ virtual public string Target /// The format of the output will depend on the appender's layout. /// /// - override protected void Append(LoggingEvent loggingEvent) + protected override void Append(LoggingEvent loggingEvent) { #if NETCF_1_0 // Write to the output stream @@ -177,7 +177,7 @@ override protected void Append(LoggingEvent loggingEvent) /// This appender requires a to be set. /// /// - override protected bool RequiresLayout + protected override bool RequiresLayout { get { return true; } } diff --git a/src/log4net/Appender/DebugAppender.cs b/src/log4net/Appender/DebugAppender.cs index b4f32957..c1eda997 100644 --- a/src/log4net/Appender/DebugAppender.cs +++ b/src/log4net/Appender/DebugAppender.cs @@ -164,7 +164,7 @@ public override bool Flush(int millisecondsTimeout) /// /// #endif - override protected void Append(LoggingEvent loggingEvent) + protected override void Append(LoggingEvent loggingEvent) { // // Write the string to the Debug system @@ -205,7 +205,7 @@ override protected void Append(LoggingEvent loggingEvent) /// This appender requires a to be set. /// /// - override protected bool RequiresLayout + protected override bool RequiresLayout { get { return true; } } diff --git a/src/log4net/Appender/EventLogAppender.cs b/src/log4net/Appender/EventLogAppender.cs index 0784cbff..0d1f3c89 100644 --- a/src/log4net/Appender/EventLogAppender.cs +++ b/src/log4net/Appender/EventLogAppender.cs @@ -275,7 +275,7 @@ public short Category /// must be called again. /// /// - override public void ActivateOptions() + public override void ActivateOptions() { try { @@ -381,7 +381,7 @@ private static void CreateEventSource(string source, string logName, string mach /// There is a limit of 32K characters for an event log message /// /// - override protected void Append(LoggingEvent loggingEvent) + protected override void Append(LoggingEvent loggingEvent) { // // Write the resulting string to the event log system @@ -484,7 +484,7 @@ override protected void Append(LoggingEvent loggingEvent) /// This appender requires a to be set. /// /// - override protected bool RequiresLayout + protected override bool RequiresLayout { get { return true; } } @@ -504,7 +504,7 @@ override protected bool RequiresLayout /// this is a one way mapping. There is /// a loss of information during the conversion. /// - virtual protected EventLogEntryType GetEntryType(Level level) + protected virtual EventLogEntryType GetEntryType(Level level) { // see if there is a specified lookup. Level2EventLogEntryType entryType = m_levelMapping.Lookup(level) as Level2EventLogEntryType; @@ -614,7 +614,7 @@ public EventLogEntryType EventLogEntryType /// Used by the internal logger to record the Type of the /// log message. /// - private readonly static Type declaringType = typeof(EventLogAppender); + private static readonly Type declaringType = typeof(EventLogAppender); ///

/// The maximum size supported by default. @@ -628,7 +628,7 @@ public EventLogEntryType EventLogEntryType /// the event log! See: System.Diagnostics.EventLogInternal.InternalWriteEvent() /// for the use of the 32766 max size. /// - private readonly static int MAX_EVENTLOG_MESSAGE_SIZE_DEFAULT = 32766; + private static readonly int MAX_EVENTLOG_MESSAGE_SIZE_DEFAULT = 32766; ///

/// The maximum size supported by a windows operating system that is vista @@ -659,7 +659,7 @@ public EventLogEntryType EventLogEntryType /// terminator of #0#0, as we cannot see the source of ReportEvent (though we could use an API monitor to examine the /// buffer, given enough time). /// - private readonly static int MAX_EVENTLOG_MESSAGE_SIZE_VISTA_OR_NEWER = 31839 - 2; + private static readonly int MAX_EVENTLOG_MESSAGE_SIZE_VISTA_OR_NEWER = 31839 - 2; ///

/// The maximum size that the operating system supports for @@ -670,7 +670,7 @@ public EventLogEntryType EventLogEntryType /// to the operating system event log and eventually truncate a string /// that exceeds the limits. /// - private readonly static int MAX_EVENTLOG_MESSAGE_SIZE = GetMaxEventLogMessageSize(); + private static readonly int MAX_EVENTLOG_MESSAGE_SIZE = GetMaxEventLogMessageSize(); ///

/// This method determines the maximum event log message size allowed for diff --git a/src/log4net/Appender/FileAppender.cs b/src/log4net/Appender/FileAppender.cs index f0c2bc1f..dbade37f 100644 --- a/src/log4net/Appender/FileAppender.cs +++ b/src/log4net/Appender/FileAppender.cs @@ -965,7 +965,7 @@ public FileAppender(ILayout layout, string filename) /// the application base directory. /// /// - virtual public string File + public virtual string File { get { return m_fileName; } set { m_fileName = value; } @@ -1101,7 +1101,7 @@ public FileAppender.LockingModelBase LockingModel /// This will cause the file to be opened. /// /// - override public void ActivateOptions() + public override void ActivateOptions() { base.ActivateOptions(); @@ -1145,7 +1145,7 @@ override public void ActivateOptions() /// Resets the filename and the file stream. /// /// - override protected void Reset() + protected override void Reset() { base.Reset(); m_fileName = null; @@ -1154,7 +1154,7 @@ override protected void Reset() ///

/// Close this appender instance. The underlying stream or writer is also closed. ///

- override protected void OnClose() + protected override void OnClose() { base.OnClose(); m_lockingModel.OnClose(); @@ -1169,7 +1169,7 @@ override protected void OnClose() /// successfully opened. /// /// - override protected void PrepareWriter() + protected override void PrepareWriter() { SafeOpenFile(m_fileName, m_appendToFile); } @@ -1188,7 +1188,7 @@ override protected void PrepareWriter() /// The format of the output will depend on the appender's layout. /// /// - override protected void Append(LoggingEvent loggingEvent) + protected override void Append(LoggingEvent loggingEvent) { if (m_stream.AcquireLock()) { @@ -1214,7 +1214,7 @@ override protected void Append(LoggingEvent loggingEvent) /// the stream. /// /// - override protected void Append(LoggingEvent[] loggingEvents) + protected override void Append(LoggingEvent[] loggingEvents) { if (m_stream.AcquireLock()) { @@ -1337,7 +1337,7 @@ protected void CloseFile() /// Errors are passed to the . /// /// - virtual protected void SafeOpenFile(string fileName, bool append) + protected virtual void SafeOpenFile(string fileName, bool append) { try { @@ -1364,7 +1364,7 @@ virtual protected void SafeOpenFile(string fileName, bool append) /// for the specified exists. /// /// - virtual protected void OpenFile(string fileName, bool append) + protected virtual void OpenFile(string fileName, bool append) { if (LogLog.IsErrorEnabled) { @@ -1427,7 +1427,7 @@ virtual protected void OpenFile(string fileName, bool append) /// data using a System.Security.Cryptography.CryptoStream. /// /// - virtual protected void SetQWForFiles(Stream fileStream) + protected virtual void SetQWForFiles(Stream fileStream) { #pragma warning disable CA2000 // Dispose objects before losing scope StreamWriter writer = new StreamWriter(fileStream, m_encoding); @@ -1445,7 +1445,7 @@ virtual protected void SetQWForFiles(Stream fileStream) /// wrap the in some way. /// /// - virtual protected void SetQWForFiles(TextWriter writer) + protected virtual void SetQWForFiles(TextWriter writer) { QuietWriter = new QuietTextWriter(writer, ErrorHandler); } @@ -1518,7 +1518,7 @@ protected static string ConvertToFullPath(string path) /// Used by the internal logger to record the Type of the /// log message. /// - private readonly static Type declaringType = typeof(FileAppender); + private static readonly Type declaringType = typeof(FileAppender); #endregion Private Static Fields } diff --git a/src/log4net/Appender/ForwardingAppender.cs b/src/log4net/Appender/ForwardingAppender.cs index 681f8125..20a99ccc 100644 --- a/src/log4net/Appender/ForwardingAppender.cs +++ b/src/log4net/Appender/ForwardingAppender.cs @@ -68,7 +68,7 @@ public ForwardingAppender() /// It is a programming error to append to a closed appender. /// /// - override protected void OnClose() + protected override void OnClose() { // Remove all the attached appenders lock(this) @@ -89,7 +89,7 @@ override protected void OnClose() /// Delivers the logging event to all the attached appenders. /// /// - override protected void Append(LoggingEvent loggingEvent) + protected override void Append(LoggingEvent loggingEvent) { // Pass the logging event on the the attached appenders if (m_appenderAttachedImpl != null) @@ -107,7 +107,7 @@ override protected void Append(LoggingEvent loggingEvent) /// Delivers the logging events to all the attached appenders. /// /// - override protected void Append(LoggingEvent[] loggingEvents) + protected override void Append(LoggingEvent[] loggingEvents) { // Pass the logging event on the the attached appenders if (m_appenderAttachedImpl != null) @@ -131,7 +131,7 @@ override protected void Append(LoggingEvent[] loggingEvents) /// appenders, then it won't be added again. /// /// - virtual public void AddAppender(IAppender newAppender) + public virtual void AddAppender(IAppender newAppender) { if (newAppender == null) { @@ -158,7 +158,7 @@ virtual public void AddAppender(IAppender newAppender) /// /// A collection of the appenders in this appender. /// - virtual public AppenderCollection Appenders + public virtual AppenderCollection Appenders { get { @@ -188,7 +188,7 @@ virtual public AppenderCollection Appenders /// Get the named appender attached to this appender. /// /// - virtual public IAppender GetAppender(string name) + public virtual IAppender GetAppender(string name) { lock(this) { @@ -209,7 +209,7 @@ virtual public IAppender GetAppender(string name) /// This is useful when re-reading configuration information. /// /// - virtual public void RemoveAllAppenders() + public virtual void RemoveAllAppenders() { lock(this) { @@ -231,7 +231,7 @@ virtual public void RemoveAllAppenders() /// If you are discarding the appender you must call /// on the appender removed. /// - virtual public IAppender RemoveAppender(IAppender appender) + public virtual IAppender RemoveAppender(IAppender appender) { lock(this) { @@ -253,7 +253,7 @@ virtual public IAppender RemoveAppender(IAppender appender) /// If you are discarding the appender you must call /// on the appender removed. /// - virtual public IAppender RemoveAppender(string name) + public virtual IAppender RemoveAppender(string name) { lock(this) { diff --git a/src/log4net/Appender/LocalSyslogAppender.cs b/src/log4net/Appender/LocalSyslogAppender.cs index 13efc54f..ad31b5df 100644 --- a/src/log4net/Appender/LocalSyslogAppender.cs +++ b/src/log4net/Appender/LocalSyslogAppender.cs @@ -433,7 +433,7 @@ protected override void OnClose() /// This appender requires a to be set. /// /// - override protected bool RequiresLayout + protected override bool RequiresLayout { get { return true; } } @@ -452,7 +452,7 @@ override protected bool RequiresLayout /// Translates a log4net level to a syslog severity. /// /// - virtual protected SyslogSeverity GetSeverity(Level level) + protected virtual SyslogSeverity GetSeverity(Level level) { LevelSeverity levelSeverity = m_levelMapping.Lookup(level) as LevelSeverity; if (levelSeverity != null) diff --git a/src/log4net/Appender/ManagedColoredConsoleAppender.cs b/src/log4net/Appender/ManagedColoredConsoleAppender.cs index 9efe65d0..9edfce50 100644 --- a/src/log4net/Appender/ManagedColoredConsoleAppender.cs +++ b/src/log4net/Appender/ManagedColoredConsoleAppender.cs @@ -126,7 +126,7 @@ public ManagedColoredConsoleAppender() /// This is either "Console.Out" or "Console.Error". /// /// - virtual public string Target + public virtual string Target { get { return m_writeToErrorStream ? ConsoleError : ConsoleOut; } set @@ -174,7 +174,7 @@ public void AddMapping(LevelColors mapping) /// The format of the output will depend on the appender's layout. /// /// - override protected void Append(log4net.Core.LoggingEvent loggingEvent) + protected override void Append(log4net.Core.LoggingEvent loggingEvent) { System.IO.TextWriter writer; @@ -216,7 +216,7 @@ override protected void Append(log4net.Core.LoggingEvent loggingEvent) /// This appender requires a to be set. /// /// - override protected bool RequiresLayout + protected override bool RequiresLayout { get { return true; } } diff --git a/src/log4net/Appender/MemoryAppender.cs b/src/log4net/Appender/MemoryAppender.cs index e0ec7413..441569ce 100644 --- a/src/log4net/Appender/MemoryAppender.cs +++ b/src/log4net/Appender/MemoryAppender.cs @@ -84,7 +84,7 @@ public MemoryAppender() : base() /// Gets the events that have been logged. /// /// - virtual public LoggingEvent[] GetEvents() + public virtual LoggingEvent[] GetEvents() { lock (m_eventsList.SyncRoot) { @@ -110,7 +110,7 @@ virtual public LoggingEvent[] GetEvents() /// /// [Obsolete("Use Fix property")] - virtual public bool OnlyFixPartialEventData + public virtual bool OnlyFixPartialEventData { get { return (Fix == FixFlags.Partial); } set @@ -136,7 +136,7 @@ virtual public bool OnlyFixPartialEventData /// for details. /// /// - virtual public FixFlags Fix + public virtual FixFlags Fix { get { return m_fixFlags; } set { m_fixFlags = value; } @@ -153,7 +153,7 @@ virtual public FixFlags Fix /// /// Stores the in the events list. /// - override protected void Append(LoggingEvent loggingEvent) + protected override void Append(LoggingEvent loggingEvent) { // Because we are caching the LoggingEvent beyond the // lifetime of the Append() method we must fix any @@ -176,7 +176,7 @@ override protected void Append(LoggingEvent loggingEvent) /// /// Clear the list of events /// - virtual public void Clear() + public virtual void Clear() { lock (m_eventsList.SyncRoot) { @@ -193,7 +193,7 @@ virtual public void Clear() /// Gets the events that have been logged and clears the list of events. /// /// - virtual public LoggingEvent[] PopAllEvents() + public virtual LoggingEvent[] PopAllEvents() { lock (m_eventsList.SyncRoot) { diff --git a/src/log4net/Appender/NetSendAppender.cs b/src/log4net/Appender/NetSendAppender.cs index a72076f0..b03d21d6 100644 --- a/src/log4net/Appender/NetSendAppender.cs +++ b/src/log4net/Appender/NetSendAppender.cs @@ -344,7 +344,7 @@ protected override void Append(LoggingEvent loggingEvent) /// This appender requires a to be set. /// /// - override protected bool RequiresLayout + protected override bool RequiresLayout { get { return true; } } diff --git a/src/log4net/Appender/OutputDebugStringAppender.cs b/src/log4net/Appender/OutputDebugStringAppender.cs index f010fd58..1a13512b 100644 --- a/src/log4net/Appender/OutputDebugStringAppender.cs +++ b/src/log4net/Appender/OutputDebugStringAppender.cs @@ -80,7 +80,7 @@ public OutputDebugStringAppender() #if !NETCF && !NETSTANDARD1_3 [System.Security.Permissions.SecurityPermission(System.Security.Permissions.SecurityAction.Demand, UnmanagedCode = true)] #endif - override protected void Append(LoggingEvent loggingEvent) + protected override void Append(LoggingEvent loggingEvent) { #if NETSTANDARD if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) @@ -101,7 +101,7 @@ override protected void Append(LoggingEvent loggingEvent) /// This appender requires a to be set. /// /// - override protected bool RequiresLayout + protected override bool RequiresLayout { get { return true; } } diff --git a/src/log4net/Appender/RemoteSyslogAppender.cs b/src/log4net/Appender/RemoteSyslogAppender.cs index a70bb564..675d6f97 100644 --- a/src/log4net/Appender/RemoteSyslogAppender.cs +++ b/src/log4net/Appender/RemoteSyslogAppender.cs @@ -456,7 +456,7 @@ public override void ActivateOptions() /// Translates a log4net level to a syslog severity. /// /// - virtual protected SyslogSeverity GetSeverity(Level level) + protected virtual SyslogSeverity GetSeverity(Level level) { LevelSeverity levelSeverity = m_levelMapping.Lookup(level) as LevelSeverity; if (levelSeverity != null) diff --git a/src/log4net/Appender/RemotingAppender.cs b/src/log4net/Appender/RemotingAppender.cs index f4fa6f1f..7c095f89 100644 --- a/src/log4net/Appender/RemotingAppender.cs +++ b/src/log4net/Appender/RemotingAppender.cs @@ -141,7 +141,7 @@ public string Sink #if NET_4_0 || MONO_4_0 [System.Security.SecuritySafeCritical] #endif - override public void ActivateOptions() + public override void ActivateOptions() { base.ActivateOptions(); @@ -173,7 +173,7 @@ override public void ActivateOptions() /// the events will block in the thread pool manager until a thread is available. /// /// The events to send. - override protected void SendBuffer(LoggingEvent[] events) + protected override void SendBuffer(LoggingEvent[] events) { // Setup for an async send BeginAsyncSend(); @@ -207,7 +207,7 @@ override protected void SendBuffer(LoggingEvent[] events) /// exit the runtime limits the time that a /// event handler is allowed to run for. /// - override protected void OnClose() + protected override void OnClose() { base.OnClose(); diff --git a/src/log4net/Appender/RollingFileAppender.cs b/src/log4net/Appender/RollingFileAppender.cs index 9da3fb85..b5bf2532 100644 --- a/src/log4net/Appender/RollingFileAppender.cs +++ b/src/log4net/Appender/RollingFileAppender.cs @@ -547,7 +547,7 @@ public bool StaticLogFileName /// Used by the internal logger to record the Type of the /// log message. /// - private readonly static Type declaringType = typeof(RollingFileAppender); + private static readonly Type declaringType = typeof(RollingFileAppender); #endregion Private Static Fields @@ -560,7 +560,7 @@ public bool StaticLogFileName /// This method can be overridden by sub classes. /// /// the writer to set - override protected void SetQWForFiles(TextWriter writer) + protected override void SetQWForFiles(TextWriter writer) { QuietWriter = new CountingQuietTextWriter(writer, ErrorHandler); } @@ -576,7 +576,7 @@ override protected void SetQWForFiles(TextWriter writer) /// is need and then appends to the file last. /// /// - override protected void Append(LoggingEvent loggingEvent) + protected override void Append(LoggingEvent loggingEvent) { AdjustFileBeforeAppend(); base.Append(loggingEvent); @@ -593,7 +593,7 @@ override protected void Append(LoggingEvent loggingEvent) /// is need and then appends to the file last. /// /// - override protected void Append(LoggingEvent[] loggingEvents) + protected override void Append(LoggingEvent[] loggingEvents) { AdjustFileBeforeAppend(); base.Append(loggingEvents); @@ -609,7 +609,7 @@ override protected void Append(LoggingEvent[] loggingEvents) /// is need and then appends to the file last. /// /// - virtual protected void AdjustFileBeforeAppend() + protected virtual void AdjustFileBeforeAppend() { // reuse the file appenders locking model to lock the rolling #if !NETCF @@ -663,7 +663,7 @@ virtual protected void AdjustFileBeforeAppend() /// This method will ensure that the directory structure /// for the specified exists. /// - override protected void OpenFile(string fileName, bool append) + protected override void OpenFile(string fileName, bool append) { lock(this) { @@ -1114,7 +1114,7 @@ private RollPoint ComputeCheckPeriod(string datePattern) /// the current number of backups. /// /// - override public void ActivateOptions() + public override void ActivateOptions() { if (m_dateTime == null) { diff --git a/src/log4net/Appender/SmtpAppender.cs b/src/log4net/Appender/SmtpAppender.cs index bbe8bd51..98b6bb61 100644 --- a/src/log4net/Appender/SmtpAppender.cs +++ b/src/log4net/Appender/SmtpAppender.cs @@ -381,7 +381,7 @@ public Encoding BodyEncoding /// Sends the contents of the cyclic buffer as an e-mail message. ///

/// The logging events to send. - override protected void SendBuffer(LoggingEvent[] events) + protected override void SendBuffer(LoggingEvent[] events) { // Note: this code already owns the monitor for this // appender. This frees us from needing to synchronize again. @@ -428,7 +428,7 @@ override protected void SendBuffer(LoggingEvent[] events) /// This appender requires a to be set. /// /// - override protected bool RequiresLayout + protected override bool RequiresLayout { get { return true; } } @@ -441,7 +441,7 @@ override protected bool RequiresLayout /// Send the email message ///

/// the body text to include in the mail - virtual protected void SendEmail(string messageBody) + protected virtual void SendEmail(string messageBody) { #if NET_2_0 || MONO_2_0 || NETSTANDARD2_0 // .NET 2.0 has a new API for SMTP email System.Net.Mail diff --git a/src/log4net/Appender/SmtpPickupDirAppender.cs b/src/log4net/Appender/SmtpPickupDirAppender.cs index b9a97ef9..17a6af4e 100644 --- a/src/log4net/Appender/SmtpPickupDirAppender.cs +++ b/src/log4net/Appender/SmtpPickupDirAppender.cs @@ -201,7 +201,7 @@ public SecurityContext SecurityContext /// Sends the contents of the cyclic buffer as an e-mail message. /// /// - override protected void SendBuffer(LoggingEvent[] events) + protected override void SendBuffer(LoggingEvent[] events) { // Note: this code already owns the monitor for this // appender. This frees us from needing to synchronize again. @@ -280,7 +280,7 @@ override protected void SendBuffer(LoggingEvent[] events) /// must be called again. /// /// - override public void ActivateOptions() + public override void ActivateOptions() { base.ActivateOptions(); @@ -304,7 +304,7 @@ override public void ActivateOptions() /// This appender requires a to be set. /// /// - override protected bool RequiresLayout + protected override bool RequiresLayout { get { return true; } } diff --git a/src/log4net/Appender/TelnetAppender.cs b/src/log4net/Appender/TelnetAppender.cs index b117ca03..0d61a002 100644 --- a/src/log4net/Appender/TelnetAppender.cs +++ b/src/log4net/Appender/TelnetAppender.cs @@ -79,7 +79,7 @@ public TelnetAppender() /// Used by the internal logger to record the Type of the /// log message. /// - private readonly static Type declaringType = typeof(TelnetAppender); + private static readonly Type declaringType = typeof(TelnetAppender); #endregion Private Static Fields diff --git a/src/log4net/Appender/TextWriterAppender.cs b/src/log4net/Appender/TextWriterAppender.cs index 94826073..6eb943cc 100644 --- a/src/log4net/Appender/TextWriterAppender.cs +++ b/src/log4net/Appender/TextWriterAppender.cs @@ -144,7 +144,7 @@ public bool ImmediateFlush /// Note: Logging to an unopened will fail. /// /// - virtual public TextWriter Writer + public virtual TextWriter Writer { get { return m_qtw; } set @@ -175,7 +175,7 @@ virtual public TextWriter Writer /// /// /// false if any of the preconditions fail. - override protected bool PreAppendCheck() + protected override bool PreAppendCheck() { if (!base.PreAppendCheck()) { @@ -216,7 +216,7 @@ override protected bool PreAppendCheck() /// The format of the output will depend on the appender's layout. /// /// - override protected void Append(LoggingEvent loggingEvent) + protected override void Append(LoggingEvent loggingEvent) { RenderLoggingEvent(m_qtw, loggingEvent); @@ -237,7 +237,7 @@ override protected void Append(LoggingEvent loggingEvent) /// before flushing the stream. /// /// - override protected void Append(LoggingEvent[] loggingEvents) + protected override void Append(LoggingEvent[] loggingEvents) { foreach(LoggingEvent loggingEvent in loggingEvents) { @@ -256,7 +256,7 @@ override protected void Append(LoggingEvent[] loggingEvents) /// /// Closed appenders cannot be reused. /// - override protected void OnClose() + protected override void OnClose() { lock(this) { @@ -271,7 +271,7 @@ override protected void OnClose() /// /// The for this appender. /// - override public IErrorHandler ErrorHandler + public override IErrorHandler ErrorHandler { get { return base.ErrorHandler; } set @@ -303,7 +303,7 @@ override public IErrorHandler ErrorHandler /// This appender requires a to be set. /// /// - override protected bool RequiresLayout + protected override bool RequiresLayout { get { return true; } } @@ -320,7 +320,7 @@ override protected bool RequiresLayout /// Writes the footer and closes the underlying . /// /// - virtual protected void WriteFooterAndCloseWriter() + protected virtual void WriteFooterAndCloseWriter() { WriteFooter(); CloseWriter(); @@ -334,7 +334,7 @@ virtual protected void WriteFooterAndCloseWriter() /// Closes the underlying . /// /// - virtual protected void CloseWriter() + protected virtual void CloseWriter() { if (m_qtw != null) { @@ -360,7 +360,7 @@ virtual protected void CloseWriter() /// Subclasses can override this method for an alternate closing behavior. /// /// - virtual protected void Reset() + protected virtual void Reset() { WriteFooterAndCloseWriter(); m_qtw = null; @@ -374,7 +374,7 @@ virtual protected void Reset() /// Writes a footer as produced by the embedded layout's property. /// /// - virtual protected void WriteFooter() + protected virtual void WriteFooter() { if (Layout != null && m_qtw != null && !m_qtw.Closed) { @@ -394,7 +394,7 @@ virtual protected void WriteFooter() /// Writes a header produced by the embedded layout's property. /// /// - virtual protected void WriteHeader() + protected virtual void WriteHeader() { if (Layout != null && m_qtw != null && !m_qtw.Closed) { @@ -416,7 +416,7 @@ virtual protected void WriteHeader() /// attempt to initialize the writer multiple times. /// /// - virtual protected void PrepareWriter() + protected virtual void PrepareWriter() { } @@ -478,7 +478,7 @@ protected QuietTextWriter QuietWriter /// Used by the internal logger to record the Type of the /// log message. /// - private readonly static Type declaringType = typeof(TextWriterAppender); + private static readonly Type declaringType = typeof(TextWriterAppender); #endregion Private Static Fields diff --git a/src/log4net/Appender/TraceAppender.cs b/src/log4net/Appender/TraceAppender.cs index 18dd480b..8e6cb7f3 100644 --- a/src/log4net/Appender/TraceAppender.cs +++ b/src/log4net/Appender/TraceAppender.cs @@ -141,7 +141,7 @@ public PatternLayout Category /// Writes the logging event to the system. /// /// - override protected void Append(LoggingEvent loggingEvent) + protected override void Append(LoggingEvent loggingEvent) { // // Write the string to the Trace system @@ -174,7 +174,7 @@ override protected void Append(LoggingEvent loggingEvent) /// This appender requires a to be set. /// /// - override protected bool RequiresLayout + protected override bool RequiresLayout { get { return true; } } diff --git a/src/log4net/Appender/UdpAppender.cs b/src/log4net/Appender/UdpAppender.cs index 99a6a8c6..e2cafe49 100644 --- a/src/log4net/Appender/UdpAppender.cs +++ b/src/log4net/Appender/UdpAppender.cs @@ -428,7 +428,7 @@ protected override void Append(LoggingEvent loggingEvent) /// This appender requires a to be set. /// /// - override protected bool RequiresLayout + protected override bool RequiresLayout { get { return true; } } @@ -443,7 +443,7 @@ override protected bool RequiresLayout /// and unmanaged resources associated with the . /// /// - override protected void OnClose() + protected override void OnClose() { base.OnClose(); diff --git a/src/log4net/AssemblyInfo.cs b/src/log4net/AssemblyInfo.cs index 5264ed2a..9539a78e 100644 --- a/src/log4net/AssemblyInfo.cs +++ b/src/log4net/AssemblyInfo.cs @@ -54,77 +54,77 @@ // #if (CLI_1_0) -[assembly: AssemblyInformationalVersionAttribute("2.0.11.0-.CLI 1.0")] +[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-.CLI 1.0")] [assembly: AssemblyTitle("Apache log4net for CLI 1.0 Compatible Frameworks")] #elif (NET_1_0) -[assembly: AssemblyInformationalVersionAttribute("2.0.11.0-.NET 1.0")] +[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-.NET 1.0")] [assembly: AssemblyTitle("Apache log4net for .NET Framework 1.0")] #elif (NET_1_1) -[assembly: AssemblyInformationalVersionAttribute("2.0.11.0-.NET 1.1")] +[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-.NET 1.1")] [assembly: AssemblyTitle("Apache log4net for .NET Framework 1.1")] #elif (NET_4_5) -[assembly: AssemblyInformationalVersionAttribute("2.0.11.0-.NET 4.5")] +[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-.NET 4.5")] [assembly: AssemblyTitle("Apache log4net for .NET Framework 4.5")] #elif (NET_4_0) #if CLIENT_PROFILE -[assembly: AssemblyInformationalVersionAttribute("2.0.11.0-.NET 4.0 CP")] +[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-.NET 4.0 CP")] [assembly: AssemblyTitle("Apache log4net for .NET Framework 4.0 Client Profile")] #else -[assembly: AssemblyInformationalVersionAttribute("2.0.11.0-.NET 4.0")] +[assembly: AssemblyInformationalVersionAttribute("2.0.12.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.11.0-.NET 3.5 CP")] +[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-.NET 3.5 CP")] [assembly: AssemblyTitle("Apache log4net for .NET Framework 3.5 Client Profile")] #else -[assembly: AssemblyInformationalVersionAttribute("2.0.11.0-.NET 3.5")] +[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-.NET 3.5")] [assembly: AssemblyTitle("Apache log4net for .NET Framework 3.5")] #endif // Client Profile #elif (NET_2_0) -[assembly: AssemblyInformationalVersionAttribute("2.0.11.0-.NET 2.0")] +[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-.NET 2.0")] [assembly: AssemblyTitle("Apache log4net for .NET Framework 2.0")] #elif (NETCF_1_0) -[assembly: AssemblyInformationalVersionAttribute("2.0.11.0-.NETCF 1.0")] +[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-.NETCF 1.0")] [assembly: AssemblyTitle("Apache log4net for .NET Compact Framework 1.0")] #elif (NETCF_2_0) -[assembly: AssemblyInformationalVersionAttribute("2.0.11.0-.NETCF 2.0")] +[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-.NETCF 2.0")] [assembly: AssemblyTitle("Apache log4net for .NET Compact Framework 2.0")] #elif (MONO_1_0) -[assembly: AssemblyInformationalVersionAttribute("2.0.11.0-Mono 1.0")] +[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-Mono 1.0")] [assembly: AssemblyTitle("Apache log4net for Mono 1.0")] #elif (MONO_2_0) -[assembly: AssemblyInformationalVersionAttribute("2.0.11.0-Mono 2.0")] +[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-Mono 2.0")] [assembly: AssemblyTitle("Apache log4net for Mono 2.0")] #elif (MONO_3_5) -[assembly: AssemblyInformationalVersionAttribute("2.0.11.0-Mono 3.5")] +[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-Mono 3.5")] [assembly: AssemblyTitle("Apache log4net for Mono 3.5")] #elif (MONO_4_0) -[assembly: AssemblyInformationalVersionAttribute("2.0.11.0-Mono 4.0")] +[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-Mono 4.0")] [assembly: AssemblyTitle("Apache log4net for Mono 4.0")] #elif (SSCLI_1_0) -[assembly: AssemblyInformationalVersionAttribute("2.0.11.0-SSCLI 1.0")] +[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-SSCLI 1.0")] [assembly: AssemblyTitle("Apache log4net for Shared Source CLI 1.0")] #elif (NET) -[assembly: AssemblyInformationalVersionAttribute("2.0.11.0-.NET")] +[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-.NET")] [assembly: AssemblyTitle("Apache log4net for .NET Framework")] #elif (NETSTANDARD1_3) -[assembly: AssemblyInformationalVersionAttribute("2.0.11.0-.NET Standard 1.3")] +[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-.NET Standard 1.3")] [assembly: AssemblyTitle("Apache log4net for .NET Standard 1.3")] #elif (NETSTANDARD2_0) -[assembly: AssemblyInformationalVersionAttribute("2.0.11.0-.NET Standard 2.0")] +[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-.NET Standard 2.0")] [assembly: AssemblyTitle("Apache log4net for .NET Standard 2.0")] #elif (NETCF) -[assembly: AssemblyInformationalVersionAttribute("2.0.11.0-.NETCF")] +[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-.NETCF")] [assembly: AssemblyTitle("Apache log4net for .NET Compact Framework")] #elif (MONO) -[assembly: AssemblyInformationalVersionAttribute("2.0.11.0-Mono")] +[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-Mono")] [assembly: AssemblyTitle("Apache log4net for Mono")] #elif (SSCLI) -[assembly: AssemblyInformationalVersionAttribute("2.0.11.0-SSCLI")] +[assembly: AssemblyInformationalVersionAttribute("2.0.12.0-SSCLI")] [assembly: AssemblyTitle("Apache log4net for Shared Source CLI")] #else -[assembly: AssemblyInformationalVersionAttribute("2.0.11.0")] +[assembly: AssemblyInformationalVersionAttribute("2.0.12.0")] [assembly: AssemblyTitle("Apache log4net")] #endif diff --git a/src/log4net/AssemblyVersionInfo.cs b/src/log4net/AssemblyVersionInfo.cs index 0b62aa9c..1bde4670 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.11.0")] +[assembly: System.Reflection.AssemblyVersion("2.0.12.0")] #if !NETCF #if !SSCLI -[assembly: System.Reflection.AssemblyFileVersion("2.0.11.0")] +[assembly: System.Reflection.AssemblyFileVersion("2.0.12.0")] #endif #endif diff --git a/src/log4net/Config/BasicConfigurator.cs b/src/log4net/Config/BasicConfigurator.cs index 4f0ee650..374cf72b 100644 --- a/src/log4net/Config/BasicConfigurator.cs +++ b/src/log4net/Config/BasicConfigurator.cs @@ -62,7 +62,7 @@ public sealed class BasicConfigurator /// Used by the internal logger to record the Type of the /// log message. /// - private readonly static Type declaringType = typeof(BasicConfigurator); + private static readonly Type declaringType = typeof(BasicConfigurator); #endregion Private Static Fields @@ -97,7 +97,7 @@ private BasicConfigurator() /// layout style. /// /// - static public ICollection Configure() + public static ICollection Configure() { return BasicConfigurator.Configure(LogManager.GetRepository(Assembly.GetCallingAssembly())); } @@ -111,7 +111,7 @@ static public ICollection Configure() /// Initializes the log4net system using the specified appenders. /// /// - static public ICollection Configure(params IAppender[] appenders) + public static ICollection Configure(params IAppender[] appenders) { ArrayList configurationMessages = new ArrayList(); @@ -136,7 +136,7 @@ static public ICollection Configure(params IAppender[] appenders) /// Initializes the log4net system using the specified appender. /// /// - static public ICollection Configure(IAppender appender) + public static ICollection Configure(IAppender appender) { return Configure(new IAppender[] { appender }); } @@ -155,7 +155,7 @@ static public ICollection Configure(IAppender appender) /// layout style. /// /// - static public ICollection Configure(ILoggerRepository repository) + public static ICollection Configure(ILoggerRepository repository) { ArrayList configurationMessages = new ArrayList(); @@ -189,7 +189,7 @@ static public ICollection Configure(ILoggerRepository repository) /// Initializes the using the specified appender. /// /// - static public ICollection Configure(ILoggerRepository repository, IAppender appender) + public static ICollection Configure(ILoggerRepository repository, IAppender appender) { return Configure(repository, new IAppender[] { appender }); } @@ -204,7 +204,7 @@ static public ICollection Configure(ILoggerRepository repository, IAppender appe /// Initializes the using the specified appender. /// /// - static public ICollection Configure(ILoggerRepository repository, params IAppender[] appenders) + public static ICollection Configure(ILoggerRepository repository, params IAppender[] appenders) { ArrayList configurationMessages = new ArrayList(); @@ -218,7 +218,7 @@ static public ICollection Configure(ILoggerRepository repository, params IAppend return configurationMessages; } - static private void InternalConfigure(ILoggerRepository repository, params IAppender[] appenders) + private static void InternalConfigure(ILoggerRepository repository, params IAppender[] appenders) { IBasicRepositoryConfigurator configurableRepository = repository as IBasicRepositoryConfigurator; if (configurableRepository != null) diff --git a/src/log4net/Config/DOMConfigurator.cs b/src/log4net/Config/DOMConfigurator.cs index fd8eeb44..2dd16d84 100644 --- a/src/log4net/Config/DOMConfigurator.cs +++ b/src/log4net/Config/DOMConfigurator.cs @@ -75,7 +75,7 @@ private DOMConfigurator() /// log4net that contains the configuration data. /// [Obsolete("Use XmlConfigurator.Configure instead of DOMConfigurator.Configure")] - static public void Configure() + public static void Configure() { XmlConfigurator.Configure(LogManager.GetRepository(Assembly.GetCallingAssembly())); } @@ -96,7 +96,7 @@ static public void Configure() /// /// The repository to configure. [Obsolete("Use XmlConfigurator.Configure instead of DOMConfigurator.Configure")] - static public void Configure(ILoggerRepository repository) + public static void Configure(ILoggerRepository repository) { XmlConfigurator.Configure(repository); } @@ -113,7 +113,7 @@ static public void Configure(ILoggerRepository repository) /// /// The element to parse. [Obsolete("Use XmlConfigurator.Configure instead of DOMConfigurator.Configure")] - static public void Configure(XmlElement element) + public static void Configure(XmlElement element) { XmlConfigurator.Configure(LogManager.GetRepository(Assembly.GetCallingAssembly()), element); } @@ -132,7 +132,7 @@ static public void Configure(XmlElement element) /// The repository to configure. /// The element to parse. [Obsolete("Use XmlConfigurator.Configure instead of DOMConfigurator.Configure")] - static public void Configure(ILoggerRepository repository, XmlElement element) + public static void Configure(ILoggerRepository repository, XmlElement element) { XmlConfigurator.Configure(repository, element); } @@ -180,7 +180,7 @@ static public void Configure(ILoggerRepository repository, XmlElement element) /// /// [Obsolete("Use XmlConfigurator.Configure instead of DOMConfigurator.Configure")] - static public void Configure(FileInfo configFile) + public static void Configure(FileInfo configFile) { XmlConfigurator.Configure(LogManager.GetRepository(Assembly.GetCallingAssembly()), configFile); } @@ -203,7 +203,7 @@ static public void Configure(FileInfo configFile) /// /// [Obsolete("Use XmlConfigurator.Configure instead of DOMConfigurator.Configure")] - static public void Configure(Stream configStream) + public static void Configure(Stream configStream) { XmlConfigurator.Configure(LogManager.GetRepository(Assembly.GetCallingAssembly()), configStream); } @@ -253,7 +253,7 @@ static public void Configure(Stream configStream) /// /// [Obsolete("Use XmlConfigurator.Configure instead of DOMConfigurator.Configure")] - static public void Configure(ILoggerRepository repository, FileInfo configFile) + public static void Configure(ILoggerRepository repository, FileInfo configFile) { XmlConfigurator.Configure(repository, configFile); } @@ -279,7 +279,7 @@ static public void Configure(ILoggerRepository repository, FileInfo configFile) /// /// [Obsolete("Use XmlConfigurator.Configure instead of DOMConfigurator.Configure")] - static public void Configure(ILoggerRepository repository, Stream configStream) + public static void Configure(ILoggerRepository repository, Stream configStream) { XmlConfigurator.Configure(repository, configStream); } @@ -315,7 +315,7 @@ static public void Configure(ILoggerRepository repository, Stream configStream) /// /// [Obsolete("Use XmlConfigurator.ConfigureAndWatch instead of DOMConfigurator.ConfigureAndWatch")] - static public void ConfigureAndWatch(FileInfo configFile) + public static void ConfigureAndWatch(FileInfo configFile) { XmlConfigurator.ConfigureAndWatch(LogManager.GetRepository(Assembly.GetCallingAssembly()), configFile); } @@ -347,7 +347,7 @@ static public void ConfigureAndWatch(FileInfo configFile) /// /// [Obsolete("Use XmlConfigurator.ConfigureAndWatch instead of DOMConfigurator.ConfigureAndWatch")] - static public void ConfigureAndWatch(ILoggerRepository repository, FileInfo configFile) + public static void ConfigureAndWatch(ILoggerRepository repository, FileInfo configFile) { XmlConfigurator.ConfigureAndWatch(repository, configFile); } diff --git a/src/log4net/Config/PluginAttribute.cs b/src/log4net/Config/PluginAttribute.cs index 67bbc08b..b6629725 100644 --- a/src/log4net/Config/PluginAttribute.cs +++ b/src/log4net/Config/PluginAttribute.cs @@ -175,7 +175,7 @@ public IPlugin CreatePlugin() /// /// /// A representation of the properties of this object - override public string ToString() + public override string ToString() { if (m_type != null) { diff --git a/src/log4net/Config/SecurityContextProviderAttribute.cs b/src/log4net/Config/SecurityContextProviderAttribute.cs index c6f85572..7698c1be 100644 --- a/src/log4net/Config/SecurityContextProviderAttribute.cs +++ b/src/log4net/Config/SecurityContextProviderAttribute.cs @@ -102,7 +102,7 @@ public Type ProviderType /// Sets this as the default security context provider . /// /// - override public void Configure(Assembly sourceAssembly, ILoggerRepository targetRepository) + public override void Configure(Assembly sourceAssembly, ILoggerRepository targetRepository) { if (m_providerType == null) { @@ -142,7 +142,7 @@ override public void Configure(Assembly sourceAssembly, ILoggerRepository target /// Used by the internal logger to record the Type of the /// log message. /// - private readonly static Type declaringType = typeof(SecurityContextProviderAttribute); + private static readonly Type declaringType = typeof(SecurityContextProviderAttribute); #endregion Private Static Fields } diff --git a/src/log4net/Config/XmlConfigurator.cs b/src/log4net/Config/XmlConfigurator.cs index cd9ebfea..ce37d2d3 100644 --- a/src/log4net/Config/XmlConfigurator.cs +++ b/src/log4net/Config/XmlConfigurator.cs @@ -94,7 +94,7 @@ private XmlConfigurator() /// /// The repository to configure. #endif - static public ICollection Configure(ILoggerRepository repository) + public static ICollection Configure(ILoggerRepository repository) { ArrayList configurationMessages = new ArrayList(); @@ -108,7 +108,7 @@ static public ICollection Configure(ILoggerRepository repository) return configurationMessages; } - static private void InternalConfigure(ILoggerRepository repository) + private static void InternalConfigure(ILoggerRepository repository) { LogLog.Debug(declaringType, "configuring repository [" + repository.Name + "] using .config file section"); @@ -194,7 +194,7 @@ static private void InternalConfigure(ILoggerRepository repository) /// /// #endif - static public ICollection Configure() + public static ICollection Configure() { return Configure(LogManager.GetRepository(Assembly.GetCallingAssembly())); } @@ -209,7 +209,7 @@ static public ICollection Configure() /// /// /// The element to parse. - static public ICollection Configure(XmlElement element) + public static ICollection Configure(XmlElement element) { ArrayList configurationMessages = new ArrayList(); @@ -312,7 +312,7 @@ static public ICollection Configure(XmlElement element) /// /// #endif - static public ICollection Configure(FileInfo configFile) + public static ICollection Configure(FileInfo configFile) { ArrayList configurationMessages = new ArrayList(); @@ -338,7 +338,7 @@ static public ICollection Configure(FileInfo configFile) /// The must support the URI scheme specified. /// /// - static public ICollection Configure(Uri configUri) + public static ICollection Configure(Uri configUri) { ArrayList configurationMessages = new ArrayList(); @@ -367,7 +367,7 @@ static public ICollection Configure(Uri configUri) /// Note that this method will NOT close the stream parameter. /// /// - static public ICollection Configure(Stream configStream) + public static ICollection Configure(Stream configStream) { ArrayList configurationMessages = new ArrayList(); @@ -393,7 +393,7 @@ static public ICollection Configure(Stream configStream) /// /// The repository to configure. /// The element to parse. - static public ICollection Configure(ILoggerRepository repository, XmlElement element) + public static ICollection Configure(ILoggerRepository repository, XmlElement element) { ArrayList configurationMessages = new ArrayList(); @@ -500,7 +500,7 @@ static public ICollection Configure(ILoggerRepository repository, XmlElement ele /// /// #endif - static public ICollection Configure(ILoggerRepository repository, FileInfo configFile) + public static ICollection Configure(ILoggerRepository repository, FileInfo configFile) { ArrayList configurationMessages = new ArrayList(); @@ -514,7 +514,7 @@ static public ICollection Configure(ILoggerRepository repository, FileInfo confi return configurationMessages; } - static private void InternalConfigure(ILoggerRepository repository, FileInfo configFile) + private static void InternalConfigure(ILoggerRepository repository, FileInfo configFile) { LogLog.Debug(declaringType, "configuring repository [" + repository.Name + "] using file [" + configFile + "]"); @@ -589,7 +589,7 @@ static private void InternalConfigure(ILoggerRepository repository, FileInfo con /// The must support the URI scheme specified. /// /// - static public ICollection Configure(ILoggerRepository repository, Uri configUri) + public static ICollection Configure(ILoggerRepository repository, Uri configUri) { ArrayList configurationMessages = new ArrayList(); @@ -603,7 +603,7 @@ static public ICollection Configure(ILoggerRepository repository, Uri configUri) return configurationMessages; } - static private void InternalConfigure(ILoggerRepository repository, Uri configUri) + private static void InternalConfigure(ILoggerRepository repository, Uri configUri) { LogLog.Debug(declaringType, "configuring repository [" + repository.Name + "] using URI ["+configUri+"]"); @@ -683,7 +683,7 @@ static private void InternalConfigure(ILoggerRepository repository, Uri configUr /// Note that this method will NOT close the stream parameter. /// /// - static public ICollection Configure(ILoggerRepository repository, Stream configStream) + public static ICollection Configure(ILoggerRepository repository, Stream configStream) { ArrayList configurationMessages = new ArrayList(); @@ -697,7 +697,7 @@ static public ICollection Configure(ILoggerRepository repository, Stream configS return configurationMessages; } - static private void InternalConfigure(ILoggerRepository repository, Stream configStream) + private static void InternalConfigure(ILoggerRepository repository, Stream configStream) { LogLog.Debug(declaringType, "configuring repository [" + repository.Name + "] using stream"); @@ -803,7 +803,7 @@ static private void InternalConfigure(ILoggerRepository repository, Stream confi /// /// /// - static public ICollection ConfigureAndWatch(FileInfo configFile) + public static ICollection ConfigureAndWatch(FileInfo configFile) { ArrayList configurationMessages = new ArrayList(); @@ -843,7 +843,7 @@ static public ICollection ConfigureAndWatch(FileInfo configFile) /// /// /// - static public ICollection ConfigureAndWatch(ILoggerRepository repository, FileInfo configFile) + public static ICollection ConfigureAndWatch(ILoggerRepository repository, FileInfo configFile) { ArrayList configurationMessages = new ArrayList(); @@ -857,7 +857,7 @@ static public ICollection ConfigureAndWatch(ILoggerRepository repository, FileIn return configurationMessages; } - static private void InternalConfigureAndWatch(ILoggerRepository repository, FileInfo configFile) + private static void InternalConfigureAndWatch(ILoggerRepository repository, FileInfo configFile) { LogLog.Debug(declaringType, "configuring repository [" + repository.Name + "] using file [" + configFile + "] watching for file updates"); @@ -1070,7 +1070,7 @@ public void Dispose() /// to load the configuration from an . /// /// - static private void InternalConfigureFromXml(ILoggerRepository repository, XmlElement element) + private static void InternalConfigureFromXml(ILoggerRepository repository, XmlElement element) { if (element == null) { @@ -1116,7 +1116,7 @@ static private void InternalConfigureFromXml(ILoggerRepository repository, XmlEl /// ConfigAndWatchHandler to dispose of its FileSystemWatcher when a repository is /// reconfigured. ///

- private readonly static Hashtable m_repositoryName2ConfigAndWatchHandler = new Hashtable(); + private static readonly Hashtable m_repositoryName2ConfigAndWatchHandler = new Hashtable(); ///

/// The fully qualified type of the XmlConfigurator class. @@ -1125,7 +1125,7 @@ static private void InternalConfigureFromXml(ILoggerRepository repository, XmlEl /// Used by the internal logger to record the Type of the /// log message. /// - private readonly static Type declaringType = typeof(XmlConfigurator); + private static readonly Type declaringType = typeof(XmlConfigurator); #endregion Private Static Fields } diff --git a/src/log4net/Config/XmlConfiguratorAttribute.cs b/src/log4net/Config/XmlConfiguratorAttribute.cs index 6c3ea3e3..b5cc702f 100644 --- a/src/log4net/Config/XmlConfiguratorAttribute.cs +++ b/src/log4net/Config/XmlConfiguratorAttribute.cs @@ -196,7 +196,7 @@ public bool Watch /// /// /// The does not extend . - override public void Configure(Assembly sourceAssembly, ILoggerRepository targetRepository) + public override void Configure(Assembly sourceAssembly, ILoggerRepository targetRepository) { IList configurationMessages = new ArrayList(); @@ -460,7 +460,7 @@ private void ConfigureFromUri(Assembly sourceAssembly, ILoggerRepository targetR /// Used by the internal logger to record the Type of the /// log message. /// - private readonly static Type declaringType = typeof(XmlConfiguratorAttribute); + private static readonly Type declaringType = typeof(XmlConfiguratorAttribute); #endregion Private Static Fields } diff --git a/src/log4net/Core/CompactRepositorySelector.cs b/src/log4net/Core/CompactRepositorySelector.cs index dd46f6d5..b1b2805d 100644 --- a/src/log4net/Core/CompactRepositorySelector.cs +++ b/src/log4net/Core/CompactRepositorySelector.cs @@ -311,7 +311,7 @@ public ILoggerRepository[] GetAllRepositories() /// Used by the internal logger to record the Type of the /// log message. /// - private readonly static Type declaringType = typeof(CompactRepositorySelector); + private static readonly Type declaringType = typeof(CompactRepositorySelector); #endregion Private Static Fields diff --git a/src/log4net/Core/DefaultRepositorySelector.cs b/src/log4net/Core/DefaultRepositorySelector.cs index ce399217..2cc84d26 100644 --- a/src/log4net/Core/DefaultRepositorySelector.cs +++ b/src/log4net/Core/DefaultRepositorySelector.cs @@ -891,7 +891,7 @@ private void LoadAliases(Assembly assembly, ILoggerRepository repository) /// Used by the internal logger to record the Type of the /// log message. /// - private readonly static Type declaringType = typeof(DefaultRepositorySelector); + private static readonly Type declaringType = typeof(DefaultRepositorySelector); private const string DefaultRepositoryName = "log4net-default-repository"; diff --git a/src/log4net/Core/Level.cs b/src/log4net/Core/Level.cs index 713918dd..767d03ee 100644 --- a/src/log4net/Core/Level.cs +++ b/src/log4net/Core/Level.cs @@ -83,7 +83,7 @@ namespace log4net.Core #if !NETCF [Serializable] #endif - sealed public class Level : IComparable + public sealed class Level : IComparable { #region Public Instance Constructors @@ -202,7 +202,7 @@ public string DisplayName /// Returns the level . /// /// - override public string ToString() + public override string ToString() { return m_levelName; } @@ -219,7 +219,7 @@ override public string ToString() /// instance. /// /// - override public bool Equals(object o) + public override bool Equals(object o) { Level otherLevel = o as Level; if (otherLevel != null) @@ -245,7 +245,7 @@ override public bool Equals(object o) /// Returns the hash code of the level . /// /// - override public int GetHashCode() + public override int GetHashCode() { return m_levelValue; } @@ -500,107 +500,107 @@ public static int Compare(Level l, Level r) ///

/// The level designates a higher level than all the rest. ///

- public readonly static Level Off = new Level(int.MaxValue, "OFF"); + public static readonly Level Off = new Level(int.MaxValue, "OFF"); ///

/// The level designates very severe error events. /// System unusable, emergencies. ///

- public readonly static Level Log4Net_Debug = new Level(120000, "log4net:DEBUG"); + public static readonly Level Log4Net_Debug = new Level(120000, "log4net:DEBUG"); ///

/// The level designates very severe error events. /// System unusable, emergencies. ///

- public readonly static Level Emergency = new Level(120000, "EMERGENCY"); + public static readonly Level Emergency = new Level(120000, "EMERGENCY"); ///

/// The level designates very severe error events /// that will presumably lead the application to abort. ///

- public readonly static Level Fatal = new Level(110000, "FATAL"); + public static readonly Level Fatal = new Level(110000, "FATAL"); ///

/// The level designates very severe error events. /// Take immediate action, alerts. ///

- public readonly static Level Alert = new Level(100000, "ALERT"); + public static readonly Level Alert = new Level(100000, "ALERT"); ///

/// The level designates very severe error events. /// Critical condition, critical. ///

- public readonly static Level Critical = new Level(90000, "CRITICAL"); + public static readonly Level Critical = new Level(90000, "CRITICAL"); ///

/// The level designates very severe error events. ///

- public readonly static Level Severe = new Level(80000, "SEVERE"); + public static readonly Level Severe = new Level(80000, "SEVERE"); ///

/// The level designates error events that might /// still allow the application to continue running. ///

- public readonly static Level Error = new Level(70000, "ERROR"); + public static readonly Level Error = new Level(70000, "ERROR"); ///

/// The level designates potentially harmful /// situations. ///

- public readonly static Level Warn = new Level(60000, "WARN"); + public static readonly Level Warn = new Level(60000, "WARN"); ///

/// The level designates informational messages /// that highlight the progress of the application at the highest level. ///

- public readonly static Level Notice = new Level(50000, "NOTICE"); + public static readonly Level Notice = new Level(50000, "NOTICE"); ///

/// The level designates informational messages that /// highlight the progress of the application at coarse-grained level. ///

- public readonly static Level Info = new Level(40000, "INFO"); + public static readonly Level Info = new Level(40000, "INFO"); ///