diff -r -u -N -w log4net-1.2.10-original\src\Appender\AppenderCollection.cs log4net-1.2.10\src\Appender\AppenderCollection.cs --- log4net-1.2.10-original\src\Appender\AppenderCollection.cs Fri Apr 16 16:27:41 2010 +++ log4net-1.2.10\src\Appender\AppenderCollection.cs Fri Apr 16 15:48:48 2010 @@ -569,9 +569,9 @@ /// -or- /// is equal to or greater than . /// - private void ValidateIndex(int i) + private void ValidateIndex(int index) { - ValidateIndex(i, false); + ValidateIndex(index, false); } /// @@ -579,12 +579,12 @@ /// -or- /// is equal to or greater than . /// - private void ValidateIndex(int i, bool allowEqualEnd) + private void ValidateIndex(int index, bool allowEqualEnd) { int max = (allowEqualEnd) ? (m_count) : (m_count-1); - if (i < 0 || i > max) + if (index < 0 || index > max) { - throw log4net.Util.SystemInfo.CreateArgumentOutOfRangeException("i", (object)i, "Index was out of range. Must be non-negative and less than the size of the collection. [" + (object)i + "] Specified argument was out of the range of valid values."); + throw log4net.Util.SystemInfo.CreateArgumentOutOfRangeException("i", (object)index, "Index was out of range. Must be non-negative and less than the size of the collection. [" + (object)index + "] Specified argument was out of the range of valid values."); } } diff -r -u -N -w log4net-1.2.10-original\src\Appender\AppenderSkeleton.cs log4net-1.2.10\src\Appender\AppenderSkeleton.cs --- log4net-1.2.10-original\src\Appender\AppenderSkeleton.cs Fri Apr 16 16:27:41 2010 +++ log4net-1.2.10\src\Appender\AppenderSkeleton.cs Fri Apr 16 15:46:49 2010 @@ -361,14 +361,14 @@ /// /// /// - /// Checks that the severity of the + /// Checks that the severity of the /// is greater than or equal to the of this /// appender. /// /// /// /// Checks that the chain accepts the - /// . + /// . /// /// /// diff -r -u -N -w log4net-1.2.10-original\src\Appender\AspNetTraceAppender.cs log4net-1.2.10\src\Appender\AspNetTraceAppender.cs --- log4net-1.2.10-original\src\Appender\AspNetTraceAppender.cs Fri Apr 16 16:27:41 2010 +++ log4net-1.2.10\src\Appender\AspNetTraceAppender.cs Fri Sep 17 18:54:24 2010 @@ -25,6 +25,8 @@ using log4net.Layout; using log4net.Core; +#if false + namespace log4net.Appender { /// @@ -120,3 +122,5 @@ } #endif // !NETCF && !SSCLI + +#endif // false \ No newline at end of file diff -r -u -N -w log4net-1.2.10-original\src\Appender\ColoredConsoleAppender.cs log4net-1.2.10\src\Appender\ColoredConsoleAppender.cs --- log4net-1.2.10-original\src\Appender\ColoredConsoleAppender.cs Fri Apr 16 16:27:41 2010 +++ log4net-1.2.10\src\Appender\ColoredConsoleAppender.cs Tue Jun 28 21:59:54 2011 @@ -33,6 +33,7 @@ using log4net.Layout; using log4net.Util; +using System.Security; namespace log4net.Appender { @@ -264,6 +265,9 @@ /// The format of the output will depend on the appender's layout. /// /// +#if NET_4_0 + [SecuritySafeCritical] +#endif override protected void Append(log4net.Core.LoggingEvent loggingEvent) { if (m_consoleOutputWriter != null) @@ -429,6 +433,9 @@ /// Initialize the level to color mappings set on this appender. /// /// +#if NET_4_0 + [SecuritySafeCritical] +#endif public override void ActivateOptions() { base.ActivateOptions(); diff -r -u -N -w log4net-1.2.10-original\src\Appender\EventLogAppender.cs log4net-1.2.10\src\Appender\EventLogAppender.cs --- log4net-1.2.10-original\src\Appender\EventLogAppender.cs Fri Apr 16 16:27:41 2010 +++ log4net-1.2.10\src\Appender\EventLogAppender.cs Fri Apr 16 15:48:30 2010 @@ -403,10 +403,10 @@ #region Protected Instance Methods /// - /// Get the equivalent for a + /// Get the equivalent for a /// /// the Level to convert to an EventLogEntryType - /// The equivalent for a + /// The equivalent for a /// /// Because there are fewer applicable /// values to use in logging levels than there are in the diff -r -u -N -w log4net-1.2.10-original\src\AssemblyInfo.cs log4net-1.2.10\src\AssemblyInfo.cs --- log4net-1.2.10-original\src\AssemblyInfo.cs Fri Apr 16 16:27:41 2010 +++ log4net-1.2.10\src\AssemblyInfo.cs Fri Apr 16 21:12:23 2010 @@ -50,6 +50,8 @@ [assembly: AssemblyTitle("log4net for .NET Framework 1.0")] #elif (NET_1_1) [assembly: AssemblyTitle("log4net for .NET Framework 1.1")] +#elif (NET_4_0) +[assembly: AssemblyTitle("log4net for .NET Framework 4.0")] #elif (NET_2_0) [assembly: AssemblyTitle("log4net for .NET Framework 2.0")] #elif (NETCF_1_0) diff -r -u -N -w log4net-1.2.10-original\src\Config\XmlConfigurator.cs log4net-1.2.10\src\Config\XmlConfigurator.cs --- log4net-1.2.10-original\src\Config\XmlConfigurator.cs Fri Apr 16 16:27:41 2010 +++ log4net-1.2.10\src\Config\XmlConfigurator.cs Fri Apr 16 15:49:12 2010 @@ -621,7 +621,7 @@ #elif NET_2_0 // Allow the DTD to specify entity includes XmlReaderSettings settings = new XmlReaderSettings(); - settings.ProhibitDtd = false; + settings.DtdProcessing = DtdProcessing.Prohibit; // Create a reader over the input stream XmlReader xmlReader = XmlReader.Create(configStream, settings); diff -r -u -N -w log4net-1.2.10-original\src\Config\XmlConfiguratorAttribute.cs log4net-1.2.10\src\Config\XmlConfiguratorAttribute.cs --- log4net-1.2.10-original\src\Config\XmlConfiguratorAttribute.cs Fri Apr 16 16:27:41 2010 +++ log4net-1.2.10\src\Config\XmlConfiguratorAttribute.cs Fri Apr 16 15:45:45 2010 @@ -193,7 +193,9 @@ /// configure it. /// /// - /// The does not extend . + /// + /// The does not extend . + /// override public void Configure(Assembly sourceAssembly, ILoggerRepository targetRepository) { string applicationBaseDirectory = null; diff -r -u -N -w log4net-1.2.10-original\src\Core\LevelCollection.cs log4net-1.2.10\src\Core\LevelCollection.cs --- log4net-1.2.10-original\src\Core\LevelCollection.cs Fri Apr 16 16:27:41 2010 +++ log4net-1.2.10\src\Core\LevelCollection.cs Fri Apr 16 15:46:46 2010 @@ -544,9 +544,9 @@ /// -or- /// is equal to or greater than . /// - private void ValidateIndex(int i) + private void ValidateIndex(int index) { - ValidateIndex(i, false); + ValidateIndex(index, false); } /// @@ -554,12 +554,12 @@ /// -or- /// is equal to or greater than . /// - private void ValidateIndex(int i, bool allowEqualEnd) + private void ValidateIndex(int index, bool allowEqualEnd) { int max = (allowEqualEnd) ? (m_count) : (m_count-1); - if (i < 0 || i > max) + if (index < 0 || index > max) { - throw log4net.Util.SystemInfo.CreateArgumentOutOfRangeException("i", (object)i, "Index was out of range. Must be non-negative and less than the size of the collection. [" + (object)i + "] Specified argument was out of the range of valid values."); + throw log4net.Util.SystemInfo.CreateArgumentOutOfRangeException("index", (object)index, "Index was out of range. Must be non-negative and less than the size of the collection. [" + (object)index + "] Specified argument was out of the range of valid values."); } } diff -r -u -N -w log4net-1.2.10-original\src\Core\LoggingEvent.cs log4net-1.2.10\src\Core\LoggingEvent.cs --- log4net-1.2.10-original\src\Core\LoggingEvent.cs Fri Apr 16 16:27:41 2010 +++ log4net-1.2.10\src\Core\LoggingEvent.cs Sat May 01 10:49:08 2010 @@ -26,6 +26,7 @@ using log4net.Util; using log4net.Repository; +using System.Security; namespace log4net.Core { @@ -1010,7 +1011,11 @@ /// is to be used outside that method. /// /// +#if NET_4_0 + [SecurityCritical] +#else [System.Security.Permissions.SecurityPermissionAttribute(System.Security.Permissions.SecurityAction.Demand, SerializationFormatter=true)] +#endif public virtual void GetObjectData(SerializationInfo info, StreamingContext context) { // The caller must call FixVolatileData before this object @@ -1296,6 +1301,11 @@ #region Protected Instance Methods +#if NET_4_0 + [SecuritySafeCritical] +#else + [PermissionSet(SecurityAction.LinkDemand)] +#endif private void CreateCompositeProperties() { m_compositeProperties = new CompositeProperties(); diff -r -u -N -w log4net-1.2.10-original\src\log4net (net-4.0).csproj log4net-1.2.10\src\log4net (net-4.0).csproj --- log4net-1.2.10-original\src\log4net (net-4.0).csproj Thu Jan 01 01:00:00 1970 +++ log4net-1.2.10\src\log4net (net-4.0).csproj Fri Sep 17 18:53:52 2010 @@ -0,0 +1,677 @@ + + + + Debug + AnyCPU + 8.0.30703 + 2.0 + {E8A4DACA-520F-46D4-8F93-71FA0DA79A79} + Library + Properties + log4net + log4net + v4.0 + 512 + Client + + + true + full + false + bin\net-4.0\Debug\ + TRACE;DEBUG;STRONG;NET;NET_2_0;NET_4_0 + prompt + 4 + bin\net-4.0\Debug\log4net.xml + + + pdbonly + true + bin\net-4.0\Release\ + TRACE;STRONG;NET;NET_2_0;NET_4_0 + prompt + 4 + bin\net-4.0\Release\log4net.xml + + + true + + + ..\..\..\nuclex.snk + + + + + + + + + + + + + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + + + nuclex.snk + + + + + \ No newline at end of file diff -r -u -N -w log4net-1.2.10-original\src\log4net (net-4.0).sln log4net-1.2.10\src\log4net (net-4.0).sln --- log4net-1.2.10-original\src\log4net (net-4.0).sln Thu Jan 01 01:00:00 1970 +++ log4net-1.2.10\src\log4net (net-4.0).sln Fri Apr 16 15:41:35 2010 @@ -0,0 +1,20 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual C# Express 2010 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "log4net", "log4net (net-4.0).csproj", "{E8A4DACA-520F-46D4-8F93-71FA0DA79A79}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {E8A4DACA-520F-46D4-8F93-71FA0DA79A79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E8A4DACA-520F-46D4-8F93-71FA0DA79A79}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E8A4DACA-520F-46D4-8F93-71FA0DA79A79}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E8A4DACA-520F-46D4-8F93-71FA0DA79A79}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal Binary files log4net-1.2.10-original\src\log4net (net-4.0).suo and log4net-1.2.10\src\log4net (net-4.0).suo differ Binary files log4net-1.2.10-original\src\log4net.suo and log4net-1.2.10\src\log4net.suo differ diff -r -u -N -w log4net-1.2.10-original\src\MDC.cs log4net-1.2.10\src\MDC.cs --- log4net-1.2.10-original\src\MDC.cs Fri Apr 16 16:27:41 2010 +++ log4net-1.2.10\src\MDC.cs Fri Apr 16 15:45:28 2010 @@ -106,13 +106,13 @@ /// /// /// - /// Puts a context value (the parameter) as identified + /// Puts a context value (the parameter) as identified /// with the parameter into the current thread's /// context map. /// /// /// If a value is already defined for the - /// specified then the value will be replaced. If the + /// specified then the value will be replaced. If the /// is specified as null then the key value mapping will be removed. /// /// diff -r -u -N -w log4net-1.2.10-original\src\Plugin\PluginCollection.cs log4net-1.2.10\src\Plugin\PluginCollection.cs --- log4net-1.2.10-original\src\Plugin\PluginCollection.cs Fri Apr 16 16:27:42 2010 +++ log4net-1.2.10\src\Plugin\PluginCollection.cs Fri Apr 16 15:48:13 2010 @@ -556,9 +556,9 @@ /// -or- /// is equal to or greater than . /// - private void ValidateIndex(int i) + private void ValidateIndex(int index) { - ValidateIndex(i, false); + ValidateIndex(index, false); } /// @@ -566,12 +566,12 @@ /// -or- /// is equal to or greater than . /// - private void ValidateIndex(int i, bool allowEqualEnd) + private void ValidateIndex(int index, bool allowEqualEnd) { int max = (allowEqualEnd) ? (m_count) : (m_count-1); - if (i < 0 || i > max) + if (index < 0 || index > max) { - throw log4net.Util.SystemInfo.CreateArgumentOutOfRangeException("i", (object)i, "Index was out of range. Must be non-negative and less than the size of the collection. [" + (object)i + "] Specified argument was out of the range of valid values."); + throw log4net.Util.SystemInfo.CreateArgumentOutOfRangeException("i", (object)index, "Index was out of range. Must be non-negative and less than the size of the collection. [" + (object)index + "] Specified argument was out of the range of valid values."); } } diff -r -u -N -w log4net-1.2.10-original\src\Repository\Hierarchy\Logger.cs log4net-1.2.10\src\Repository\Hierarchy\Logger.cs --- log4net-1.2.10-original\src\Repository\Hierarchy\Logger.cs Fri Apr 16 16:27:42 2010 +++ log4net-1.2.10\src\Repository\Hierarchy\Logger.cs Fri Apr 16 15:47:57 2010 @@ -431,10 +431,6 @@ { log4net.Util.LogLog.Error("Log: Exception while logging", ex); } - catch - { - log4net.Util.LogLog.Error("Log: Exception while logging"); - } } /// @@ -466,10 +462,6 @@ { log4net.Util.LogLog.Error("Log: Exception while logging", ex); } - catch - { - log4net.Util.LogLog.Error("Log: Exception while logging"); - } } /// @@ -503,10 +495,6 @@ catch (Exception ex) { log4net.Util.LogLog.Error("Log: Exception while logging", ex); - } - catch - { - log4net.Util.LogLog.Error("Log: Exception while logging"); } return false; } diff -r -u -N -w log4net-1.2.10-original\src\Util\LogicalThreadContextProperties.cs log4net-1.2.10\src\Util\LogicalThreadContextProperties.cs --- log4net-1.2.10-original\src\Util\LogicalThreadContextProperties.cs Fri Apr 16 16:27:43 2010 +++ log4net-1.2.10\src\Util\LogicalThreadContextProperties.cs Sat May 01 10:44:39 2010 @@ -23,6 +23,8 @@ using System.Collections; using System.Runtime.Remoting.Messaging; +using System.Security; +using System.Security.Permissions; namespace log4net.Util { @@ -141,6 +143,11 @@ /// caller must clone the collection before doings so. /// /// +#if NET_4_0 + [SecurityCritical] +#else + [PermissionSet(SecurityAction.LinkDemand)] +#endif internal PropertiesDictionary GetProperties(bool create) { PropertiesDictionary properties = (PropertiesDictionary)CallContext.GetData("log4net.Util.LogicalThreadContextProperties"); diff -r -u -N -w log4net-1.2.10-original\src\Util\OptionConverter.cs log4net-1.2.10\src\Util\OptionConverter.cs --- log4net-1.2.10-original\src\Util\OptionConverter.cs Fri Apr 16 16:27:43 2010 +++ log4net-1.2.10\src\Util\OptionConverter.cs Fri Apr 16 15:46:10 2010 @@ -491,7 +491,7 @@ } /// - /// Performs variable substitution in string from the + /// Performs variable substitution in string from the /// values of keys found in . /// /// The string on which variable substitution is performed. diff -r -u -N -w log4net-1.2.10-original\src\Util\PatternStringConverters\PropertyPatternConverter.cs log4net-1.2.10\src\Util\PatternStringConverters\PropertyPatternConverter.cs --- log4net-1.2.10-original\src\Util\PatternStringConverters\PropertyPatternConverter.cs Fri Apr 16 16:27:43 2010 +++ log4net-1.2.10\src\Util\PatternStringConverters\PropertyPatternConverter.cs Tue Jun 28 21:52:27 2011 @@ -24,6 +24,7 @@ using log4net.Core; using log4net.Util; using log4net.Repository; +using System.Security; namespace log4net.Util.PatternStringConverters { @@ -63,6 +64,9 @@ /// then all the properties are written as key value pairs. /// /// +#if NET_4_0 + [SecuritySafeCritical] +#endif override protected void Convert(TextWriter writer, object state) { CompositeProperties compositeProperties = new CompositeProperties(); diff -r -u -N -w log4net-1.2.10-original\src\Util\ReadOnlyPropertiesDictionary.cs log4net-1.2.10\src\Util\ReadOnlyPropertiesDictionary.cs --- log4net-1.2.10-original\src\Util\ReadOnlyPropertiesDictionary.cs Fri Apr 16 16:27:43 2010 +++ log4net-1.2.10\src\Util\ReadOnlyPropertiesDictionary.cs Tue Apr 20 09:21:22 2010 @@ -21,6 +21,7 @@ #if !NETCF using System.Runtime.Serialization; using System.Xml; +using System.Security; #endif namespace log4net.Util @@ -202,7 +203,12 @@ /// Serializes this object into the provided. /// /// + /// +#if NET_4_0 + [SecurityCritical] +#else [System.Security.Permissions.SecurityPermissionAttribute(System.Security.Permissions.SecurityAction.Demand, SerializationFormatter=true)] +#endif public virtual void GetObjectData(SerializationInfo info, StreamingContext context) { foreach(DictionaryEntry entry in InnerHashtable) diff -r -u -N -w log4net-1.2.10-original\src\Util\SystemStringFormat.cs log4net-1.2.10\src\Util\SystemStringFormat.cs --- log4net-1.2.10-original\src\Util\SystemStringFormat.cs Fri Apr 16 16:27:43 2010 +++ log4net-1.2.10\src\Util\SystemStringFormat.cs Fri Apr 16 15:47:17 2010 @@ -108,11 +108,6 @@ log4net.Util.LogLog.Warn("StringFormat: Exception while rendering format ["+format+"]", ex); return StringFormatError(ex, format, args); } - catch - { - log4net.Util.LogLog.Warn("StringFormat: Exception while rendering format ["+format+"]"); - return StringFormatError(null, format, args); - } } /// @@ -145,11 +140,6 @@ log4net.Util.LogLog.Error("StringFormat: INTERNAL ERROR during StringFormat error handling", ex); return "Exception during StringFormat. See Internal Log."; } - catch - { - log4net.Util.LogLog.Error("StringFormat: INTERNAL ERROR during StringFormat error handling"); - return "Exception during StringFormat. See Internal Log."; - } } /// @@ -204,10 +194,6 @@ catch(Exception ex) { buffer.Append(""); - } - catch - { - buffer.Append(""); } } }