Merge pull request #336 from ddotlic/master

mythz · mythz · commit 325a44ce68a6 · 2013-06-01T12:23:47.000-07:00
Fixed SL5 build, but also other builds (please see comment below). Should be painless to integrate this. Also, please let me know next time you want to push a new NuGet build so that I can update SL5 binaries, thanks!
diff --git a/src/ServiceStack.Text.SL5/Properties/AssemblyInfo.cs b/src/ServiceStack.Text.SL5/Properties/AssemblyInfo.cs
@@ -21,4 +21,4 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("b058736d-b210-47e1-b16f-ba72d92e7c4e")]
-[assembly: AssemblyVersion("3.9.44.0")]
+[assembly: AssemblyVersion("3.9.48.0")]
diff --git a/src/ServiceStack.Text/DateTimeExtensions.cs b/src/ServiceStack.Text/DateTimeExtensions.cs
@@ -41,7 +41,7 @@ public static long ToUnixTimeMsAlt(this DateTime dateTime)
             return (dateTime.ToStableUniversalTime().Ticks - UnixEpoch) / TimeSpan.TicksPerMillisecond;
         }
 
-        private static TimeZone LocalTimeZone = TimeZone.CurrentTimeZone;
+        private static TimeZoneInfo LocalTimeZone = TimeZoneInfo.Local;
         public static long ToUnixTimeMs(this DateTime dateTime)
         {
             var dtUtc = dateTime;

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public static long ToUnixTimeMsAlt(this DateTime dateTime)`
`41`	`41`	`return (dateTime.ToStableUniversalTime().Ticks - UnixEpoch) / TimeSpan.TicksPerMillisecond;`
`42`	`42`	`}`
`43`	`43`
`44`		`- private static TimeZone LocalTimeZone = TimeZone.CurrentTimeZone;`
	`44`	`+ private static TimeZoneInfo LocalTimeZone = TimeZoneInfo.Local;`
`45`	`45`	`public static long ToUnixTimeMs(this DateTime dateTime)`
`46`	`46`	`{`
`47`	`47`	`var dtUtc = dateTime;`