svn commit: r1669888 - in /logging/log4net/trunk/src: log4net.Tests/Layout/ log4net/ log4net/Layout/

[bodewig]

Author: bodewig
Date: Sun Mar 29 10:27:25 2015
New Revision: 1669888

URL: http://svn.apache.org/r1669888
Log:
some fixes for Mono
based on Patch by Antonius Riha

closes #11 by @antoniusriha 


Added:
    logging/log4net/trunk/src/log4net/Layout/XmlLayout.cs
      - copied unchanged from r1669887, 
logging/log4net/trunk/src/log4net/Layout/XMLLayout.cs
    logging/log4net/trunk/src/log4net/Layout/XmlLayoutBase.cs
      - copied unchanged from r1669887, 
logging/log4net/trunk/src/log4net/Layout/XMLLayoutBase.cs
Removed:
    logging/log4net/trunk/src/log4net/Layout/XMLLayout.cs
    logging/log4net/trunk/src/log4net/Layout/XMLLayoutBase.cs
Modified:
    logging/log4net/trunk/src/log4net.Tests/Layout/XmlLayoutTest.cs
    logging/log4net/trunk/src/log4net/AssemblyInfo.cs
    logging/log4net/trunk/src/log4net/Log4netAssemblyInfo.cs

Modified: logging/log4net/trunk/src/log4net.Tests/Layout/XmlLayoutTest.cs
URL: 
http://svn.apache.org/viewvc/logging/log4net/trunk/src/log4net.Tests/Layout/XmlLayoutTest.cs?rev=1669888&r1=1669887&r2=1669888&view=diff
==============================================================================
--- logging/log4net/trunk/src/log4net.Tests/Layout/XmlLayoutTest.cs (original)
+++ logging/log4net/trunk/src/log4net.Tests/Layout/XmlLayoutTest.cs Sun Mar 29 
10:27:25 2015
@@ -347,10 +347,11 @@ namespace log4net.Tests.Layout
             bar(42);
 
             var log = stringAppender.GetString();
-            var startOfExceptionElement = log.IndexOf("<exception>");
-            var sub = log.Substring(startOfExceptionElement + 11);
-            StringAssert.StartsWith("System.NullReferenceException: Object 
reference not set to an instance of an object", sub);
-            StringAssert.Contains("at 
log4net.Tests.Layout.XmlLayoutTest.&lt;&gt;c__DisplayClass4.&lt;BracketsInStackTracesAreEscapedProperly&gt;b__3(Int32
 foo)", sub);
+            var startOfExceptionText = log.IndexOf("<exception>", 
StringComparison.InvariantCulture) + 11;
+            var endOfExceptionText = log.IndexOf("</exception>", 
StringComparison.InvariantCulture);
+            var sub = log.Substring(startOfExceptionText, endOfExceptionText - 
startOfExceptionText);
+            StringAssert.DoesNotContain("<", sub);
+            StringAssert.DoesNotContain(">", sub);
         }
 #endif
        }

Modified: logging/log4net/trunk/src/log4net/AssemblyInfo.cs
URL: 
http://svn.apache.org/viewvc/logging/log4net/trunk/src/log4net/AssemblyInfo.cs?rev=1669888&r1=1669887&r2=1669888&view=diff
==============================================================================
--- logging/log4net/trunk/src/log4net/AssemblyInfo.cs (original)
+++ logging/log4net/trunk/src/log4net/AssemblyInfo.cs Sun Mar 29 10:27:25 2015
@@ -69,7 +69,13 @@ using System.Runtime.CompilerServices;
 #elif NETCF
 [assembly: AssemblyTitle("Apache log4net for .NET Compact Framework 2.0")]
 #elif MONO
+#if FRAMEWORK_4_0_OR_ABOVE
+[assembly: AssemblyTitle("Apache log4net for Mono 4.0")]
+#elif FRAMEWORK_3_5_OR_ABOVE
+[assembly: AssemblyTitle("Apache log4net for Mono 3.5")]
+#else
 [assembly: AssemblyTitle("Apache log4net for Mono 2.0")]
+#endif // Mono subversions
 #endif
 
 #if DEBUG

Modified: logging/log4net/trunk/src/log4net/Log4netAssemblyInfo.cs
URL: 
http://svn.apache.org/viewvc/logging/log4net/trunk/src/log4net/Log4netAssemblyInfo.cs?rev=1669888&r1=1669887&r2=1669888&view=diff
==============================================================================
--- logging/log4net/trunk/src/log4net/Log4netAssemblyInfo.cs (original)
+++ logging/log4net/trunk/src/log4net/Log4netAssemblyInfo.cs Sun Mar 29 
10:27:25 2015
@@ -29,6 +29,8 @@ namespace log4net {
 
         /// <summary>Version of the framework targeted</summary>
 #if FRAMEWORK_4_0_OR_ABOVE
+        public const decimal TargetFrameworkVersion = 4.5M;
+#elif FRAMEWORK_4_0_OR_ABOVE
         public const decimal TargetFrameworkVersion = 4.0M;
 #elif FRAMEWORK_3_5_OR_ABOVE
         public const decimal TargetFrameworkVersion = 3.5M;