Merge pull request #302 from msgpack/fix/#296

Fix Timestamp conversion

Author: yfakariya

CHANGES.txt

@@ -753,3 +753,8 @@ Release 1.0.0 2018-6-14
   * Fix map keys order emitted by asymmetric (serialization only) serializer are inconsistent across platform.
   * Fix Unity build does not honor serialization related attributes correctly.
   * Fix internal inconsitency between serialization related attributes detection and their parameter retrieval.
+
+Release 1.0.1 2018-09-09
+
+  BUG FIXES
+  * Fix conversion from DateTime[Offset] to Timestamp failure for before Unix epoc. #296

appveyor-release.yml

@@ -3,9 +3,7 @@ image: Visual Studio 2017
 branches:
   only:
   - master
-  - 0.7
-  - 0.8
-  - 0.9
+  - /[0-9]+\.[0-9]+(\.[xX])?/
 configuration: Release
 assembly_info:
   patch: true

build/Build.ps1

@@ -158,7 +158,7 @@ if ( $buildConfig -eq 'Release' )
 {
 	Write-Host "Build NuGet packages..."
 
-	& $msbuild ../src/MsgPack/MsgPack.csproj /t:pack /v:minimal /p:Configuration=$buildConfig /p:IncludeSource=true /p:NuspecProperties=version=$env:PackageVersion
+	& $msbuild ../src/MsgPack/MsgPack.csproj /t:pack /v:minimal /p:Configuration=$buildConfig /p:IncludeSource=true /p:IncludeSymbols=true /p:NuspecProperties=version=$env:PackageVersion
 
 	Move-Item ../bin/*.nupkg ../dist/
 	Copy-Item ../bin/* ./MsgPack-CLI/ -Recurse -Exclude @("*.vshost.*")

src/MsgPack/Timestamp.Conversion.cs

@@ -133,6 +133,14 @@ private static void FromOffsetTicks( long ticks, out long unixEpocSeconds, out i
 			long remaining;
 			unixEpocSeconds = DivRem( ticks, SecondsToTicks, out remaining );
 			nanoSeconds = unchecked( ( int )remaining ) * 100;
+			if ( nanoSeconds < 0 )
+			{
+				// In this case, we must adjust these values
+				// from "negative nanosec from nearest larger negative integer"
+				// to "positive nanosec from nearest smaller nagative integer".
+				unixEpocSeconds -= 1;
+				nanoSeconds = ( MaxNanoSeconds + 1 ) + nanoSeconds;
+			}
 		}
 
 		/// <summary>

test/MsgPack.UnitTest.BclExtensions.WinRT/MsgPack.UnitTest.BclExtensions.WinRT.csproj

@@ -15,15 +15,16 @@
     <PackageCertificateKeyFile>MsgPack.UnitTest.BclExtensions.WinRT_TemporaryKey.pfx</PackageCertificateKeyFile>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <PackageCertificateThumbprint>34322AD6CF171CC843FCCE936CB6B9B616B961E1</PackageCertificateThumbprint>
+    <PackageCertificateThumbprint>AA68CFB533B03B5B4FAD8AE85A404BD5936CB7C7</PackageCertificateThumbprint>
     <TargetPlatformVersion>8.1</TargetPlatformVersion>
     <MinimumVisualStudioVersion>12</MinimumVisualStudioVersion>
     <TargetFrameworkVersion />
     <AppxBundle>Never</AppxBundle>
   </PropertyGroup>
   <Import Project="..\..\MsgPack.Common.props" />
   <PropertyGroup>
-    <DocumentationFile></DocumentationFile>
+    <DocumentationFile>
+    </DocumentationFile>
     <DefineConstants>$(DefineConstants);NETFX_CORE;NETSTANDARD1_1;FEATURE_TAP;MSTEST</DefineConstants>
     <NoWarn>;2008</NoWarn>
   </PropertyGroup>

test/MsgPack.UnitTest.BclExtensions.WinRT/MsgPack.UnitTest.BclExtensions.WinRT_TemporaryKey.pfx

@@ -14,7 +14,7 @@
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <PackageCertificateKeyFile>MsgPack.UnitTest.Uwp.Aot_TemporaryKey.pfx</PackageCertificateKeyFile>
     <UnitTestPlatformVersion Condition="'$(UnitTestPlatformVersion)' == ''">14.0</UnitTestPlatformVersion>
-    <PackageCertificateThumbprint>C125CA52683091C62F7746FF9A159E44B2A18673</PackageCertificateThumbprint>
+    <PackageCertificateThumbprint>880646284800F8F3356B8C7E3E734562D8BB304F</PackageCertificateThumbprint>
   </PropertyGroup>
   <Import Project="..\..\MsgPack.Common.props" />
   <PropertyGroup>

test/MsgPack.UnitTest.Uwp.Aot/MsgPack.UnitTest.Uwp.Aot.csproj

@@ -14,11 +14,12 @@
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <PackageCertificateKeyFile>MsgPack.UnitTest.Uwp_TemporaryKey.pfx</PackageCertificateKeyFile>
     <UnitTestPlatformVersion Condition="'$(UnitTestPlatformVersion)' == ''">14.0</UnitTestPlatformVersion>
-    <PackageCertificateThumbprint>0CEFF2E3DC6DD3A7245B2FB641B6DE056C5A79D9</PackageCertificateThumbprint>
+    <PackageCertificateThumbprint>807856C98966D121CA69C33F7D6475CF03AA8633</PackageCertificateThumbprint>
   </PropertyGroup>
   <Import Project="..\..\MsgPack.Common.props" />
   <PropertyGroup>
-    <DocumentationFile></DocumentationFile>
+    <DocumentationFile>
+    </DocumentationFile>
     <DefineConstants>$(DefineConstants);NETFX_CORE;WINDOWS_UWP;NETSTANDARD1_3;FEATURE_TAP</DefineConstants>
     <NoWarn>;2008</NoWarn>
     <SignAssembly>false</SignAssembly>