From 224900414a8eb4a8cde0f1140ca77d1e0f0f17b6 Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Sun, 13 Oct 2013 22:30:40 +1300 Subject: [PATCH] -Fixed WinRT --- .../Converters/JsonValueConverterTests.cs | 4 ---- Src/Newtonsoft.Json.Tests/Linq/JTokenTests.cs | 2 +- .../Newtonsoft.Json.Tests.WinRT.csproj | 2 +- ...wtonsoft.Json.Tests.WinRT_TemporaryKey.pfx | Bin 2504 -> 2504 bytes 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Src/Newtonsoft.Json.Tests/Converters/JsonValueConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/JsonValueConverterTests.cs index 4beff927..fee7dcd0 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/JsonValueConverterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/JsonValueConverterTests.cs @@ -319,8 +319,6 @@ namespace Newtonsoft.Json.Tests.Converters string jsonnet = timer.Elapsed.TotalSeconds.ToString(); throw new Exception(string.Format("winrt: {0}, jsonnet: {1}, jsonnet linq: {2}", winrt, jsonnet, linq)); - Console.WriteLine(winrt); - Console.WriteLine(jsonnet); } [Test] @@ -368,8 +366,6 @@ namespace Newtonsoft.Json.Tests.Converters string jsonnet = timer.Elapsed.TotalSeconds.ToString(); throw new Exception(string.Format("winrt: {0}, jsonnet: {1}, jsonnet linq: {2}", winrt, jsonnet, linq)); - Console.WriteLine(winrt); - Console.WriteLine(jsonnet); } [Test] diff --git a/Src/Newtonsoft.Json.Tests/Linq/JTokenTests.cs b/Src/Newtonsoft.Json.Tests/Linq/JTokenTests.cs index 02d9e549..270f13c5 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JTokenTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JTokenTests.cs @@ -324,7 +324,7 @@ namespace Newtonsoft.Json.Tests.Linq CollectionAssert.AreEquivalent((byte[])Encoding.UTF8.GetBytes("hi"), (byte[])(new JValue(Convert.ToBase64String(Encoding.UTF8.GetBytes("hi"))))); Assert.AreEqual(new Guid("46EFE013-B56A-4E83-99E4-4DCE7678A5BC"), (Guid)(new JValue(new Guid("46EFE013-B56A-4E83-99E4-4DCE7678A5BC").ToByteArray()))); Assert.AreEqual(new Guid("46EFE013-B56A-4E83-99E4-4DCE7678A5BC"), (Guid?)(new JValue(new Guid("46EFE013-B56A-4E83-99E4-4DCE7678A5BC").ToByteArray()))); - Assert.AreEqual(1, (sbyte?)(new JValue((short?)1))); + Assert.AreEqual((sbyte?)1, (sbyte?)(new JValue((short?)1))); Assert.AreEqual(null, (Uri)(JValue)null); Assert.AreEqual(null, (int?)(JValue)null); diff --git a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.WinRT.csproj b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.WinRT.csproj index 41f93939..a4ae6f7b 100644 --- a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.WinRT.csproj +++ b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.WinRT.csproj @@ -15,7 +15,7 @@ 512 {BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Newtonsoft.Json.Tests.WinRT_TemporaryKey.pfx - E58487D6BF8E40BC44C9BE962D19FB3EFBEB81BD + AEA73E2A196157405965DDB6EC14CE11CEE9A331 true diff --git a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.WinRT_TemporaryKey.pfx b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.WinRT_TemporaryKey.pfx index 5daa45a9ea7af5e0e3ca393fc66b610590554732..640f064a88c4f44fa27a212093cfc32030216dd4 100644 GIT binary patch delta 2250 zcmV;*2sQV}6UY;gXn&m?oIY`|0UQDX2haq91laV+@~^wDFFrk|ea`csBnJQQ!zM&L_ zi|iWN{>Dk1L(qNZgZ{q-K1Q}y0kdt=liQ&lkQ@VUy+Z+1M6SY!(+?&k)=9z>G6)cl}~m zCp-EZzxAU7(gSp6nYhJiEKehdimti(aT+alZQ@_pG!->^(5SMhab>Ws*xOXOGsVJe zfuvQuTm8t+@mdlBtAB-V&$}|h%0l|G7F~#Ajz0oq6@RW10m}pv&XT-qT$GYN`LQKF z*GmxS%!Q`Tm;JV>G*Sxe9#v z{9XB#o=*1h5@&4C$tNvE|9&T|MqGpOdvT$>RC^+4XURnA@@)?ayo|Am(+e(DKY-yPGOH4!Fv zxHIE(;wj!nsRa2tsNfBmWwW$)F&)-Oqchr-94bWA&VF>W)cR0t;*kW#t^H!!;HN*q&?0LaQ`=h%=u{{@2Q?Za&CZnpQbNYr z$?<^l-~cqh0@N*tE_Pbj79FOGqz96dlj!epwBY3NMB?^`F+4A@9G2Wu-^8?Wbsvr!*$1Lv%zH{54Z6JV5%aDQo3LR^Z#q`|tX(pK}zGA)<_=#BkL7E|5?;xT~q zDUQx$VFM?e-7{t4y14#m&LNQUq=g2c8MtrZO5rr&~Rm3mOy`jouU@84&%1Aova#a-5*B(C^iH)DJsKg9* zU+aFS15#F0G^$9Y=tD37Zi;3?NRz-G8vrm@2D1=I7cLBV?V&FH@?OL!J%1OZ#))*t zqvk^d)8F+T{>#XWM2dqcDIk?BRBxmm!kT4Qa@rj9y+y!Mrby_AqiKbIUH zc_R{S;?}s|@4oir?wCjx$5jUt3xs;!`Al~v51Z$e*SEk+f;`J7!T&TY< zDJo8Ise=>O8#SI3p|it6KY!A1t|13eT63%(P*yn?VHtuk=wu(O!==YH>yR)l;iBi` z`P^HXL@pQqy|!6L51px@a<_N%O4;)i+TgOp8*Sh|mH1JLMHI;1Ale?nhV8vCDYTSpeA=5`J%2~7^klni-h_Lrhx}l z0wgizWHxK;0g;7-BY%nlYS@j20^RRIVsR7Lm$Am>UE#{Ju8U)meiIow_{kgQ_U6}fi2qrTo#pXH|WPcewb5JwX*Db(k7hUb^ zov(fUH~C4$!y_hMV^ca0{qN2>$lY%>>Fg3WH6HexKD|0QefAFOv8lVn|#fC5oN!omPvdTzrcle*@;(F}Z7%}xn0*s50E z&NKGrE!*0=`MFgq|GFb4(&D-Ht!8Uz%5;+19-F!Y$)EqF6?nwH9pz6rT|_ Y^Ok;^QAEM55K&WiBcEyhegXmq(ASAYYXATM delta 2250 zcmV;*2sQV}6UY;gXn!)(BlJD|%UuEj2haq91lZxph2Vkeh!&RGb@;-y`QjJ3mdmI$ ztg&M7_vOgTBPau~xe*TaAU*ie=WbY%F;|i$@W0T6h-R;w5@{3L5bHf}f9>w_782I( zm)^OB?@ zgX(TbUimN`kuH2UBV2OTZHerwG_f;(@SUOf#eLCKZC1$Sbf2{!`gx8!mBvkVbnih+ z2-erYg_M@SOt=Ln!z%ogJVQ$qCgtv|W!$S|M1*^Q8WUSLO!1(*>dA9og(XRY>MxGjQh$QmM~K`RoLh$%W}*VF;g3Zi+E|i=qV?Lb^Vz237}`$En$gA8OfoEd zmicH-BPTI&9r);mB?bJDOu@c;Dv4KiUQWK2S=XVGy`dHS{nd9f=HRL!e9FTQzyX(B zXv+Ykqle zh>$4%y*-9;aRuGVM)$Fy-FPWeQ!#vwIj7^?g*yk$ywj!GkZd>)83NihogY6Y!r{?c zZOOlVXMd!{ro@}xmOv$ZpR3Gx6T67ACAE7^-=2iSn5mp!LLeG7JoktaX7V{Gn`;yK}^DAlB+j)=mOtQ zS&Sy(qkl4Ii^P?!i6^h-i*XgnU%RX4b+PtOBUe;N?d$O8<;wqAr1x5|TBjj{7vdD@ zD#im_!HU{$%76CxO>4ZxNsR~*Nx!+dIdgGda);6m7_ul}>k*oQ0A2QN-Cr^GFf|Il zI)59M>f90-@Ay6VRmO8e#(c7_$71W=0Bc`R-xm~Wp?c$*r8{~D1^k)Wq`7DF3vG=* z4Rt26$n-HyQku=2ILh-BNNq+|>?YA&9T8~u60?M1A8q*i{p(yR0HC~&J*8}P<=?$5 zMAe?hwogjzq3Wc5UdzXFcz14`RvPlpYkyNu#Ej@wUHPD5WhF2Myq4W|Nh$~$Ci4E$ zyRtCbt(yj3q{icdd%$a2A5^4GZ@9p~+lWyY)(r1;0uYq<$yvE~G3G*%N6isE%h!6) z*Gs3=#2z7wSWyyq&=A9}<_WjjwZdSAnhkYhbrnjM2g7RB6T(|#Iq;*K*b^s{w}0_$ zNp}Fo6%eJrRB0Cp2tJB^Z1S1c!us@}GGJRA_$u~>)jJ^ux*Rxu)X9HF+C8bIk4703 zdBb=(%9CQPX7D2@(5|jnF!4AK@H#*bq^-r&(Ryh~S#4s6ixMT;DvX9+kDZ+owZx!( zaMO;86DbBRHaYh0EU!lx5%HzeH_X*gk!8mu~s^3LJFZlaK&LNQUt&l2l8l)F&Ej=Q+sNX%SEu70pTgslZSb`*p0v z-g%bGFy*;TV$p`|I?`-hm)&jkn0v&ezbOE)|9m|#2-cWgsz}XOaQ!Kn2Y;u7(4xjp z#Na&ZS7J?9sc{dEHz!TshdV;0#7#iQMKok6ICJij` zLoz>j0#PhPd3f_#En9=Y!CoPC4NnhrjjOO`u*m#D(jlR1vh{hY&Kg0Lg!Dy(G33b3 zM-cAt40Q(5rZhzr8HyzTH7N*6D zx{cv|B01exjRz(Hxj?4WLh9*d!yBEh;?;El_PVX8fO7>2h_+Aex%5fsS4`<( zbmt-mAs>Fguw~%R%YUka$%Bt9himIdQ5g~`@)%v>Snm|EY-Bzc;to4^Y2niDWbOV` zt1L8{B18prYa3_GM0mWGwReod_rTcqz%9&e7j7Z$f4v`9$2nZPZ;ZLDaSExvqR zA}H~T(X^exkaH#K;+0TB3-tr7l45!F56h6Z=}uN49+ULfII7ODO2Zlwp%7^A=top% zt^6+k>7F6aeRY|-Fgq|GFb4(&D-Ht!8Uz#)Ur