LiRuochen_WorkFlow/Newtonsoft.Json
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

-Fixed build

Browse Source
This commit is contained in:
James Newton-King
2012-12-31 01:47:43 +13:00
parent 204b8260f1
commit 7c59e211b6
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Build/build.ps1
+2 -2
View File
@@ -17,8 +17,8 @@
$workingDir = "$baseDir\Working"
$builds = @(
@{Name = "Newtonsoft.Json"; TestsName = "Newtonsoft.Json.Tests"; Constants=""; FinalDir="Net40"; NuGetDir = "net40"; Framework="net-4.0"; Sign=$true},
#@{Name = "Newtonsoft.Json.Portable"; TestsName = "Newtonsoft.Json.Tests.Portable"; Constants="PORTABLE"; FinalDir="Portable"; NuGetDir = "portable-net40+sl4+wp7+win8"; Framework="net-4.0"; Sign=$true},
#@{Name = "Newtonsoft.Json.WinRT"; TestsName = $null; Constants="NETFX_CORE"; FinalDir="WinRT"; NuGetDir = "winrt45"; Framework="net-4.5"; Sign=$true},
@{Name = "Newtonsoft.Json.Portable"; TestsName = "Newtonsoft.Json.Tests.Portable"; Constants="PORTABLE"; FinalDir="Portable"; NuGetDir = "portable-net40+sl4+wp7+win8"; Framework="net-4.0"; Sign=$true},
@{Name = "Newtonsoft.Json.WinRT"; TestsName = $null; Constants="NETFX_CORE"; FinalDir="WinRT"; NuGetDir = "winrt45"; Framework="net-4.5"; Sign=$true},
@{Name = "Newtonsoft.Json.WindowsPhone"; TestsName = $null; Constants="SILVERLIGHT;WINDOWS_PHONE"; FinalDir="WindowsPhone"; NuGetDir = "sl3-wp,sl4-windowsphone71"; Framework="net-4.0"; Sign=$true},
@{Name = "Newtonsoft.Json.Silverlight"; TestsName = "Newtonsoft.Json.Tests.Silverlight"; Constants="SILVERLIGHT"; FinalDir="Silverlight"; NuGetDir = "sl4"; Framework="net-4.0"; Sign=$true},
@{Name = "Newtonsoft.Json.Net35"; TestsName = "Newtonsoft.Json.Tests.Net35"; Constants="NET35"; FinalDir="Net35"; NuGetDir = "net35"; Framework="net-2.0"; Sign=$true},
Src/Newtonsoft.Json.Tests/Linq/JValueTests.cs
+2 -2
View File
@@ -376,7 +376,7 @@ namespace Newtonsoft.Json.Tests.Linq
var obj = JObject.Load(jsonReader);
var d = (JValue)obj["d"];
Assert.IsInstanceOfType(typeof(DateTimeOffset), d.Value);
CustomAssert.IsInstanceOfType(typeof(DateTimeOffset), d.Value);
TimeSpan offset = ((DateTimeOffset)d.Value).Offset;
Assert.AreEqual(TimeSpan.FromHours(1), offset);
@@ -394,7 +394,7 @@ namespace Newtonsoft.Json.Tests.Linq
object startDateTime = obj["startDateTime"];
Assert.IsInstanceOfType(typeof(DateTimeOffset), startDateTime);
CustomAssert.IsInstanceOfType(typeof(DateTimeOffset), startDateTime);
}
#endif
}