From 95dd0c0ba4230ce57268c15c4944730857eaa907 Mon Sep 17 00:00:00 2001
From: James Newton-King <james@newtonking.com>
Date: Sat, 2 Feb 2013 21:16:15 +1300
Subject: [PATCH] -Build

---
 Build/build.ps1                               |  5 +++--
 Build/runbuild.cmd                            |  2 +-
 .../Serialization/JsonSerializerTest.cs       | 20 +++++++++++++++++++
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/Build/build.ps1 b/Build/build.ps1
index ab8e0a8b..b93028eb 100644
--- a/Build/build.ps1
+++ b/Build/build.ps1
@@ -5,8 +5,9 @@
   $version = GetVersion $majorWithReleaseVersion
   $signAssemblies = $false
   $signKeyPath = "D:\Development\Releases\newtonsoft.snk"
-  $buildDocumentation = $true
+  $buildDocumentation = $false
   $buildNuGet = $false
+  $treatWarningsAsErrors = $false
   
   $baseDir  = resolve-path ..
   $buildDir = "$baseDir\Build"
@@ -59,7 +60,7 @@ task Build -depends Clean {
     Write-Host -ForegroundColor Green "Building " $name
     Write-Host -ForegroundColor Green "Signed " $sign
     Write-Host
-    exec { msbuild "/t:Clean;Rebuild" /p:Configuration=Release "/p:Platform=Any CPU" /p:OutputPath=bin\Release\$finalDir\ /p:AssemblyOriginatorKeyFile=$signKeyPath "/p:SignAssembly=$sign" (GetConstants $build.Constants $sign) ".\Src\$name.sln" | Out-Default } "Error building $name"
+    exec { msbuild "/t:Clean;Rebuild" /p:Configuration=Release "/p:Platform=Any CPU" /p:OutputPath=bin\Release\$finalDir\ /p:AssemblyOriginatorKeyFile=$signKeyPath "/p:SignAssembly=$sign" "/p:TreatWarningsAsErrors=$treatWarningsAsErrors" (GetConstants $build.Constants $sign) ".\Src\$name.sln" | Out-Default } "Error building $name"
   }
 }
 
diff --git a/Build/runbuild.cmd b/Build/runbuild.cmd
index 6cf75102..7b8f7c4d 100644
--- a/Build/runbuild.cmd
+++ b/Build/runbuild.cmd
@@ -1,2 +1,2 @@
-powershell -Command "& { [Console]::WindowWidth = 200; [Console]::WindowHeight = 50; Start-Transcript runbuild.txt; Import-Module ..\Tools\PSake\psake.psm1; Invoke-psake .\build.ps1 %*; Stop-Transcript; }"
+powershell -Command "& { [Console]::WindowWidth = 150; [Console]::WindowHeight = 50; Start-Transcript runbuild.txt; Import-Module ..\Tools\PSake\psake.psm1; Invoke-psake .\build.ps1 %*; Stop-Transcript; }"
 pause
\ No newline at end of file
diff --git a/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs b/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs
index b900236f..226dc6e6 100644
--- a/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs
+++ b/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs
@@ -7145,6 +7145,26 @@ Parameter name: value",
 ]", json);
     }
 
+    [Test]
+    public void DateFormatStringForInternetExplorer()
+    {
+      IList<object> dates = new List<object>
+        {
+          new DateTime(2000, 12, 12, 12, 12, 12, DateTimeKind.Utc),
+          new DateTimeOffset(2000, 12, 12, 12, 12, 12, TimeSpan.FromHours(1))
+        };
+
+      string json = JsonConvert.SerializeObject(dates, Formatting.Indented, new JsonSerializerSettings
+      {
+        DateFormatString = @"yyyy'-'MM'-'dd'T'HH':'mm':'ss.fffK"
+      });
+
+      Assert.AreEqual(@"[
+  ""2000-12-12T12:12:12.000Z"",
+  ""2000-12-12T12:12:12.000+01:00""
+]", json);
+    }
+
     [Test]
     public void JsonSerializerDateFormatString()
     {