You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by bo...@apache.org on 2015/08/23 17:51:01 UTC
svn commit: r1697199 - in /logging/log4net/branches/log4net-1.2.x: src/
src/Layout/ tests/ tests/src/ tests/src/Layout/
Author: bodewig
Date: Sun Aug 23 15:51:01 2015
New Revision: 1697199
URL: http://svn.apache.org/r1697199
Log:
merge Mono fixes by Antonius Riha for pull request #11
Added:
logging/log4net/branches/log4net-1.2.x/src/Layout/XmlLayout.cs
- copied unchanged from r1669888, logging/log4net/trunk/src/log4net/Layout/XmlLayout.cs
logging/log4net/branches/log4net-1.2.x/src/Layout/XmlLayoutBase.cs
- copied unchanged from r1669888, logging/log4net/trunk/src/log4net/Layout/XmlLayoutBase.cs
Removed:
logging/log4net/branches/log4net-1.2.x/src/Layout/XMLLayout.cs
logging/log4net/branches/log4net-1.2.x/src/Layout/XMLLayoutBase.cs
Modified:
logging/log4net/branches/log4net-1.2.x/src/ (props changed)
logging/log4net/branches/log4net-1.2.x/src/Log4netAssemblyInfo.cs
logging/log4net/branches/log4net-1.2.x/tests/nant.build
logging/log4net/branches/log4net-1.2.x/tests/src/ (props changed)
logging/log4net/branches/log4net-1.2.x/tests/src/Layout/XmlLayoutTest.cs
Propchange: logging/log4net/branches/log4net-1.2.x/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 23 15:51:01 2015
@@ -1,4 +1,4 @@
/logging/log4net/branches/1.2.12/src:1511686-1520870
/logging/log4net/tags/1.2.13RC1/src:1539445-1539920
/logging/log4net/trunk/src:1539083
-/logging/log4net/trunk/src/log4net:1541408,1544744,1665915,1669884-1669885,1669887
+/logging/log4net/trunk/src/log4net:1541408,1544744,1665915,1669884-1669885,1669887-1669888
Modified: logging/log4net/branches/log4net-1.2.x/src/Log4netAssemblyInfo.cs
URL: http://svn.apache.org/viewvc/logging/log4net/branches/log4net-1.2.x/src/Log4netAssemblyInfo.cs?rev=1697199&r1=1697198&r2=1697199&view=diff
==============================================================================
--- logging/log4net/branches/log4net-1.2.x/src/Log4netAssemblyInfo.cs (original)
+++ logging/log4net/branches/log4net-1.2.x/src/Log4netAssemblyInfo.cs Sun Aug 23 15:51:01 2015
@@ -33,6 +33,8 @@ namespace log4net {
#elif NET_4_5
public const decimal TargetFrameworkVersion = 4.5M;
#elif NET_4_0 || MONO_4_0
+ public const decimal TargetFrameworkVersion = 4.5M;
+#elif FRAMEWORK_4_0_OR_ABOVE
public const decimal TargetFrameworkVersion = 4.0M;
#elif MONO_3_5
public const decimal TargetFrameworkVersion = 3.5M;
Modified: logging/log4net/branches/log4net-1.2.x/tests/nant.build
URL: http://svn.apache.org/viewvc/logging/log4net/branches/log4net-1.2.x/tests/nant.build?rev=1697199&r1=1697198&r2=1697199&view=diff
==============================================================================
--- logging/log4net/branches/log4net-1.2.x/tests/nant.build (original)
+++ logging/log4net/branches/log4net-1.2.x/tests/nant.build Sun Aug 23 15:51:01 2015
@@ -393,6 +393,7 @@ limitations under the License.
<references defaultexcludes="true">
<!-- include name="mscorlib.dll" / -->
<include name="System.dll" />
+ <include name="System.Core.dll" />
<include name="System.Data.dll" />
<include name="System.Web.dll" />
<include name="System.Xml.dll" />
@@ -448,6 +449,7 @@ limitations under the License.
<references defaultexcludes="true">
<!-- include name="mscorlib.dll" / -->
<include name="System.dll" />
+ <include name="System.Core.dll" />
<include name="System.Data.dll" />
<include name="System.Web.dll" />
<include name="System.Xml.dll" />
Propchange: logging/log4net/branches/log4net-1.2.x/tests/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 23 15:51:01 2015
@@ -1,4 +1,4 @@
/logging/log4net/branches/1.2.12/tests/src:1511686-1520870
/logging/log4net/tags/1.2.13RC1/tests/src:1539445-1539920
-/logging/log4net/trunk/src/log4net.Tests:1669884
+/logging/log4net/trunk/src/log4net.Tests:1669884,1669888
/logging/log4net/trunk/tests/src:1539083
Modified: logging/log4net/branches/log4net-1.2.x/tests/src/Layout/XmlLayoutTest.cs
URL: http://svn.apache.org/viewvc/logging/log4net/branches/log4net-1.2.x/tests/src/Layout/XmlLayoutTest.cs?rev=1697199&r1=1697198&r2=1697199&view=diff
==============================================================================
--- logging/log4net/branches/log4net-1.2.x/tests/src/Layout/XmlLayoutTest.cs (original)
+++ logging/log4net/branches/log4net-1.2.x/tests/src/Layout/XmlLayoutTest.cs Sun Aug 23 15:51:01 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.<>c__DisplayClass4.<BracketsInStackTracesAreEscapedProperly>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
}