Merge pull request #3 from NLog/master

Sync back
NLog · Feb 3, 2015 · 85a3941 · 85a3941
2 parents 5476dbd + c84e6c6
commit 85a3941
Show file tree

Hide file tree

Showing 15 changed files with 48 additions and 89 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,13 @@
 Welcome to NLog
 ===
 
+[![NuGet](https://img.shields.io/badge/nuget-v3.2.0-lightgrey.svg?style=flat)](https://www.nuget.org/packages/NLog/)
+[![GitHub](https://img.shields.io/badge/release-v3.2.0-blue.svg?style=flat)](https://github.com/NLog/NLog/releases)
+[![AppVeyor](https://img.shields.io/appveyor/ci/gruntjs/grunt.svg?style=flat)](https://ci.appveyor.com/project/Xharze/nlog-134)
+
+
+
+
 NLog is a free logging platform for .NET with rich log routing and management 
 capabilities. It makes it easy to produce and manage high-quality logs for 
 your application regardless of its size or complexity. 
@@ -21,6 +28,6 @@ or just get started with the tutorials on [the NLog wiki](https://github.com/NLo
 
 Project RSS Feed: [nlog-project.org/feed](http://nlog-project.org/feed/)
 
-Questions? Bug reports? Feature requests?
-===
+Questions, bug reports or feature requests?
+---
 Do you have feature requests, questions or would you like to report a bug? Please post them on the [issue list](https://github.com/NLog/NLog/issues) and follow [these guidelines](CONTRIBUTING.md).
diff --git a/src/NuGet/NLog.Config/NLog.Config.nuspec b/src/NuGet/NLog.Config/NLog.Config.nuspec
@@ -11,7 +11,7 @@
     <description>Empty NLog.config file.</description>
     <language>en-US</language>
     <iconUrl>http://nlog-project.org/NConfig.png</iconUrl>
-    <projectUrl>http://github.com/NLog/NLog/</projectUrl>
+    <projectUrl>http://nlog-project.org/</projectUrl>
     <licenseUrl>http://raw.github.com/NLog/NLog/master/LICENSE.txt</licenseUrl>
     <dependencies>
       <dependency id="NLog" version="$BuildVersion$" />

diff --git a/src/NuGet/NLog.Extended/NLog.Extended.nuspec b/src/NuGet/NLog.Extended/NLog.Extended.nuspec
@@ -11,7 +11,7 @@
     <description>NLog.Extended.dll for use with .NET Framework Extended profile. Supports server-specific targets and other extensions.</description>
     <language>en-US</language>
     <iconUrl>http://nlog-project.org/N.png</iconUrl>
-    <projectUrl>http://github.com/NLog/NLog/</projectUrl>
+    <projectUrl>http://nlog-project.org/</projectUrl>
     <licenseUrl>http://raw.github.com/NLog/NLog/master/LICENSE.txt</licenseUrl>
     <dependencies>
       <dependency id="NLog" version="[$BuildVersion$]" />

diff --git a/src/NuGet/NLog.Schema/NLog.Schema.nuspec b/src/NuGet/NLog.Schema/NLog.Schema.nuspec
@@ -11,7 +11,7 @@
     <description>Enables Intellisense(TM) when editing NLog configuration file.</description>
     <language>en-US</language>
     <iconUrl>http://nlog-project.org/NConfig.png</iconUrl>
-    <projectUrl>http://github.com/NLog/NLog/</projectUrl>
+    <projectUrl>http://nlog-project.org/</projectUrl>
     <licenseUrl>http://raw.github.com/NLog/NLog/master/LICENSE.txt</licenseUrl>
     <tags>nlog, intellisense, xsd</tags>
   </metadata>

diff --git a/src/NuGet/NLog.Snippets/NLog.Snippets.nuspec b/src/NuGet/NLog.Snippets/NLog.Snippets.nuspec
@@ -11,7 +11,7 @@
     <description>Installs NLog snippets.</description>
     <language>en-US</language>
     <iconUrl>http://nlog-project.org/N.png</iconUrl>
-    <projectUrl>http://github.com/NLog/NLog/</projectUrl>
+    <projectUrl>http://nlog-project.org/</projectUrl>
     <licenseUrl>http://raw.github.com/NLog/NLog/master/LICENSE.txt</licenseUrl>
     <tags>nlog, snippets</tags>
   </metadata>

diff --git a/src/NuGet/NLog/NLog.nuspec b/src/NuGet/NLog/NLog.nuspec
@@ -13,7 +13,7 @@ This package installs NLog.dll with includes core logging functionality.
 For your main project also need to install "NLog Configuration" package.</description>
     <language>en-US</language>
     <iconUrl>http://nlog-project.org/N.png</iconUrl>
-    <projectUrl>http://github.com/NLog/NLog/</projectUrl>
+    <projectUrl>http://nlog-project.org/</projectUrl>
     <licenseUrl>http://raw.github.com/NLog/NLog/master/LICENSE.txt</licenseUrl>
     <tags>logging, log, tracing, logfiles</tags>
   </metadata>

diff --git a/tests/NLog.UnitTests/LayoutRenderers/AppDomainLayoutRendererTests.cs b/tests/NLog.UnitTests/LayoutRenderers/AppDomainLayoutRendererTests.cs
@@ -67,12 +67,11 @@ public void AppDomainTestLongFormatTest()
             AssertLayoutRendererOutput("${appdomain:format=long}", string.Format("{0:0000}:{1}", id, friendlyname));
         }
 
-        [Fact(Skip = "Not working because of issue #427 - Evaluating nested substitutions ")]
-        //[Fact]
+        [Fact]
         public void AppDomainCustomFormatTest()
         {
             //example: 0003: NLog.UnitTests
-            AssertLayoutRendererOutput("${appdomain:format={1}{0}}", string.Format("{1}{0}", id, friendlyname));
+            AssertLayoutRendererOutput("${appdomain:format={1\\}{0\\}}", string.Format("{1}{0}", id, friendlyname));
         }
 
 

diff --git a/tests/NLog.UnitTests/LayoutRenderers/ExceptionLayoutRendererTests.cs b/tests/NLog.UnitTests/LayoutRenderers/ExceptionLayoutRendererTests.cs
diff --git a/tests/NLog.UnitTests/LayoutRenderers/ExceptionTests.cs b/tests/NLog.UnitTests/LayoutRenderers/ExceptionTests.cs
@@ -409,6 +409,34 @@ public void CustomInnerExceptionTest()
                 "System.InvalidOperationException Wrapper1 " + ExceptionDataFormat, exceptionDataKey, exceptionDataValue));
         }
 
+        [Fact]
+        public void ErrorException_should_not_throw_exception_when_exception_message_property_throw_exception()
+        {
+            LogManager.Configuration = CreateConfigurationFromString(@"
+            <nlog>
+                <targets>
+                    <target name='debug1' type='Debug' layout='${exception}' />
+                </targets>
+                <rules>
+                    <logger minlevel='Info' writeTo='debug1' />
+                </rules>
+            </nlog>");
+
+            var ex = new ExceptionWithBrokenMessagePropertyException();
+
+            Assert.ThrowsDelegate action = () => logger.ErrorException("msg", ex);
+
+            Assert.DoesNotThrow(action);
+        }
+
+        private class ExceptionWithBrokenMessagePropertyException : NLogConfigurationException
+        {
+            public override string Message
+            {
+                get { throw new Exception("Exception from Message property"); }
+            }
+        }
+
         private void SetConfigurationForExceptionUsingRootMethodTests()
         {
             LogManager.Configuration = CreateConfigurationFromString(@"

diff --git a/tests/NLog.UnitTests/NLog.UnitTests.monodevelop.csproj b/tests/NLog.UnitTests/NLog.UnitTests.monodevelop.csproj
@@ -104,7 +104,6 @@
     <Compile Include="LayoutRenderers\EnvironmentTests.cs" />
     <Compile Include="LayoutRenderers\EventContextTests.cs" />
     <Compile Include="LayoutRenderers\EventPropertiesTests.cs" />
-    <Compile Include="LayoutRenderers\ExceptionLayoutRendererTests.cs" />
     <Compile Include="LayoutRenderers\ExceptionTests.cs" />
     <Compile Include="LayoutRenderers\FileContentsTests.cs" />
     <Compile Include="LayoutRenderers\GDCTests.cs" />

diff --git a/tests/NLog.UnitTests/NLog.UnitTests.netfx35.csproj b/tests/NLog.UnitTests/NLog.UnitTests.netfx35.csproj
@@ -133,7 +133,6 @@
     <Compile Include="LayoutRenderers\EnvironmentTests.cs" />
     <Compile Include="LayoutRenderers\EventContextTests.cs" />
     <Compile Include="LayoutRenderers\EventPropertiesTests.cs" />
-    <Compile Include="LayoutRenderers\ExceptionLayoutRendererTests.cs" />
     <Compile Include="LayoutRenderers\ExceptionTests.cs" />
     <Compile Include="LayoutRenderers\FileContentsTests.cs" />
     <Compile Include="LayoutRenderers\GDCTests.cs" />

diff --git a/tests/NLog.UnitTests/NLog.UnitTests.netfx40.csproj b/tests/NLog.UnitTests/NLog.UnitTests.netfx40.csproj
@@ -113,7 +113,6 @@
     <Compile Include="LayoutRenderers\EnvironmentTests.cs" />
     <Compile Include="LayoutRenderers\EventContextTests.cs" />
     <Compile Include="LayoutRenderers\EventPropertiesTests.cs" />
-    <Compile Include="LayoutRenderers\ExceptionLayoutRendererTests.cs" />
     <Compile Include="LayoutRenderers\ExceptionTests.cs" />
     <Compile Include="LayoutRenderers\FileContentsTests.cs" />
     <Compile Include="LayoutRenderers\GDCTests.cs" />

diff --git a/tests/NLog.UnitTests/NLog.UnitTests.netfx45.csproj b/tests/NLog.UnitTests/NLog.UnitTests.netfx45.csproj
@@ -9,8 +9,10 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName></AssemblyKeyContainerName>
+    <ApplicationIcon>
+    </ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
     <AssemblyName>NLog.UnitTests</AssemblyName>
     <AssemblyOriginatorKeyFile>NLogTests.snk</AssemblyOriginatorKeyFile>
     <DelaySign>false</DelaySign>
@@ -116,7 +118,6 @@
     <Compile Include="LayoutRenderers\EnvironmentTests.cs" />
     <Compile Include="LayoutRenderers\EventContextTests.cs" />
     <Compile Include="LayoutRenderers\EventPropertiesTests.cs" />
-    <Compile Include="LayoutRenderers\ExceptionLayoutRendererTests.cs" />
     <Compile Include="LayoutRenderers\ExceptionTests.cs" />
     <Compile Include="LayoutRenderers\FileContentsTests.cs" />
     <Compile Include="LayoutRenderers\GDCTests.cs" />

diff --git a/tests/NLog.UnitTests/NLog.UnitTests.sl4.csproj b/tests/NLog.UnitTests/NLog.UnitTests.sl4.csproj
@@ -132,7 +132,6 @@
     <Compile Include="LayoutRenderers\EnvironmentTests.cs" />
     <Compile Include="LayoutRenderers\EventContextTests.cs" />
     <Compile Include="LayoutRenderers\EventPropertiesTests.cs" />
-    <Compile Include="LayoutRenderers\ExceptionLayoutRendererTests.cs" />
     <Compile Include="LayoutRenderers\ExceptionTests.cs" />
     <Compile Include="LayoutRenderers\FileContentsTests.cs" />
     <Compile Include="LayoutRenderers\GDCTests.cs" />

diff --git a/tests/NLog.UnitTests/NLog.UnitTests.sl5.csproj b/tests/NLog.UnitTests/NLog.UnitTests.sl5.csproj
@@ -134,7 +134,6 @@
     <Compile Include="LayoutRenderers\EnvironmentTests.cs" />
     <Compile Include="LayoutRenderers\EventContextTests.cs" />
     <Compile Include="LayoutRenderers\EventPropertiesTests.cs" />
-    <Compile Include="LayoutRenderers\ExceptionLayoutRendererTests.cs" />
     <Compile Include="LayoutRenderers\ExceptionTests.cs" />
     <Compile Include="LayoutRenderers\FileContentsTests.cs" />
     <Compile Include="LayoutRenderers\GDCTests.cs" />