From dc7716077f3d98fb16cac949e6ce057cb5af9e4e Mon Sep 17 00:00:00 2001
From: Cole Brown <code@brown.dev>
Date: Wed, 11 Aug 2021 18:09:30 -0700
Subject: [PATCH] Unit test fixes.

Bumped UnitTests to netcoreapp5.0

Nuked Microsoft.SourceLink.GitHub and GitVersionTask as they were
causing build errors I didn't want to sort.

Fixed 3 of 12 failing unit tests.
  - SerializableCacheItemPolicy was not serializing its time, only date.
  - SerializableCacheItemPolicy was messing up its expiration date when
    deserializing due to the SlidingExpiration setter.
---
 .../FileCache.UnitTests.csproj                   |  4 ++--
 src/FileCache/FileCache.csproj                   | 16 ++++++++--------
 src/FileCache/SerializableCacheItemPolicy.cs     |  5 +++--
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/FileCache.UnitTests/FileCache.UnitTests.csproj b/src/FileCache.UnitTests/FileCache.UnitTests.csproj
index 2743690..5ffe0f1 100644
--- a/src/FileCache.UnitTests/FileCache.UnitTests.csproj
+++ b/src/FileCache.UnitTests/FileCache.UnitTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net452;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net452;netcoreapp5.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
@@ -31,4 +31,4 @@
   <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/FileCache/FileCache.csproj b/src/FileCache/FileCache.csproj
index d1fd45b..5a22820 100644
--- a/src/FileCache/FileCache.csproj
+++ b/src/FileCache/FileCache.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>net45;net48;netstandard2.0;netstandard2.1</TargetFrameworks>
-	  <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
+    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <PackageTags>cache objectcache System.Runtime.Caching.ObjectCache</PackageTags>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <Authors>Adam Carter</Authors>
@@ -28,12 +28,12 @@
     <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-*" PrivateAssets="All" />
-    <PackageReference Include="GitVersionTask" Version="5.3.2">
-      <PrivateAssets>All</PrivateAssets>
-    </PackageReference>
-  </ItemGroup>
+  <!-- <ItemGroup> -->
+  <!--   <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-*" PrivateAssets="All" /> -->
+  <!--   <PackageReference Include="GitVersionTask" Version="5.3.2"> -->
+  <!--     <PrivateAssets>All</PrivateAssets> -->
+  <!--   </PackageReference> -->
+  <!-- </ItemGroup> -->
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
     <Reference Include="System.Runtime.Caching" />
@@ -100,4 +100,4 @@
       <Version>2.0.0</Version>
     </PackageReference>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/FileCache/SerializableCacheItemPolicy.cs b/src/FileCache/SerializableCacheItemPolicy.cs
index a93f864..eb3979b 100644
--- a/src/FileCache/SerializableCacheItemPolicy.cs
+++ b/src/FileCache/SerializableCacheItemPolicy.cs
@@ -66,7 +66,7 @@ public void Serialize(BinaryWriter writer)
         {
             writer.Write(CACHE_VERSION);
 
-            writer.Write(AbsoluteExpiration.Date.ToBinary());
+            writer.Write(AbsoluteExpiration.DateTime.ToBinary());
             writer.Write(AbsoluteExpiration.Offset.TotalMilliseconds);
 
             writer.Write(SlidingExpiration.TotalMilliseconds);
@@ -100,7 +100,8 @@ public static SerializableCacheItemPolicy Deserialize(BinaryReader reader, long
                 return new SerializableCacheItemPolicy {
                     AbsoluteExpiration = new DateTimeOffset(DateTime.FromBinary(reader.ReadInt64()),
                                                             TimeSpan.FromMilliseconds(reader.ReadDouble())),
-                    SlidingExpiration = TimeSpan.FromMilliseconds(reader.ReadDouble()),
+                    // Don't clobber absolute by using sliding's setter; set the private value instead.
+                    _slidingExpiration = TimeSpan.FromMilliseconds(reader.ReadDouble()),
                     Key = reader.ReadString(),
                 };
             }