diff --git a/Build/runbuild.ps1 b/Build/runbuild.ps1 index 43d7e352..cd468ecb 100644 --- a/Build/runbuild.ps1 +++ b/Build/runbuild.ps1 @@ -3,5 +3,19 @@ $path = Split-Path -Path $MyInvocation.MyCommand.Path Import-Module ($path + '\..\Tools\PSake\psake.psm1') -Invoke-psake ($path + '\build.ps1') Test -framework 3.5 -Remove-Module psake \ No newline at end of file + +Try +{ + Invoke-psake ($path + '\build.ps1') Test -framework 3.5 + + if ($error -ne '') + { + $exitCode = $error.Count + write-host "build.ps1 exit code: $exitCode" -fore RED + exit $exitCode + } +} +Finally +{ + Remove-Module psake +} \ No newline at end of file diff --git a/Src/Newtonsoft.Json.Tests/Converters/XmlNodeConverterTest.cs b/Src/Newtonsoft.Json.Tests/Converters/XmlNodeConverterTest.cs index 5b35d3cc..40b61cb4 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/XmlNodeConverterTest.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/XmlNodeConverterTest.cs @@ -151,7 +151,7 @@ namespace Newtonsoft.Json.Tests.Converters string json = JsonConvert.SerializeObject(d, Formatting.Indented); - Assert.AreEqual(@"{ + StringAssert.AreEqual(@"{ ""result"": { ""@xp_0:end"": ""2014-08-15 13:12:11.9184"", ""@xp_0:start"": ""2014-08-15 13:11:49.3140"", @@ -166,7 +166,7 @@ namespace Newtonsoft.Json.Tests.Converters XDocument doc = JsonConvert.DeserializeObject(json); - Assert.AreEqual(xml, doc.ToString()); + StringAssert.AreEqual(xml, doc.ToString()); } #endif @@ -195,7 +195,7 @@ namespace Newtonsoft.Json.Tests.Converters XmlDocument doc = JsonConvert.DeserializeObject(json); - Assert.AreEqual(xml, doc.OuterXml); + StringAssert.AreEqual(xml, doc.OuterXml); } [Test] diff --git a/Src/Newtonsoft.Json.Tests/Linq/LinqToJsonTest.cs b/Src/Newtonsoft.Json.Tests/Linq/LinqToJsonTest.cs index f2d670fb..b0727656 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/LinqToJsonTest.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/LinqToJsonTest.cs @@ -922,7 +922,7 @@ keyword such as type of business."" } }); - Assert.AreEqual(@"{ + StringAssert.AreEqual(@"{ ""channel"": { ""title"": ""James Newton-King"", ""link"": ""http://james.newtonking.com"",