Fix test; update to use the 2019 build image

Author: nblumhardt

appveyor.yml

@@ -1,16 +1,15 @@
 version: '{build}'
 skip_tags: true
 image:
-  - Visual Studio 2017
-  - Ubuntu
-configuration: Release
+  - Visual Studio 2019
+  - Ubuntu1804
 build_script:
 - ps: ./Build.ps1
 for:
 -
   matrix:
     only:
-      - image: Ubuntu
+      - image: Ubuntu1804
   build_script:
     - sh build.sh
 test: off

serilog-sinks-file.sln.DotSettings

@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Serilog/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

src/Serilog.Sinks.File/Serilog.Sinks.File.csproj

@@ -6,11 +6,9 @@
     <Authors>Serilog Contributors</Authors>
     <TargetFrameworks>net45;netstandard1.3;netstandard2.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <AssemblyName>Serilog.Sinks.File</AssemblyName>
     <AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
-    <PackageId>Serilog.Sinks.File</PackageId>
     <PackageTags>serilog;file</PackageTags>
     <PackageIconUrl>http://serilog.net/images/serilog-sink-nuget.png</PackageIconUrl>
     <PackageProjectUrl>http://serilog.net</PackageProjectUrl>
@@ -20,10 +18,7 @@
     <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
     <RootNamespace>Serilog</RootNamespace>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <AssemblyName>Serilog.Sinks.File</AssemblyName>
-    <!-- Don't reference the full NETStandard.Library -->
     <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
-    <!-- SourceLink configuration -->
     <EnableSourceLink Condition="'$(EnableSourceLink)' == ''">false</EnableSourceLink>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>

src/Serilog.Sinks.File/Sinks/File/RollingFileSink.cs

@@ -20,7 +20,6 @@
 using Serilog.Debugging;
 using Serilog.Events;
 using Serilog.Formatting;
-using System.Collections.Generic;
 
 namespace Serilog.Sinks.File
 {
@@ -216,7 +215,7 @@ void ApplyRetentionPolicy(string currentFilePath, DateTime now)
 
         bool ShouldRetainFile(RollingLogFile file, int index, DateTime now)
         {
-            if (_retainedFileCountLimit.HasValue && index >= _retainedFileCountLimit.Value)
+            if (_retainedFileCountLimit.HasValue && index >= _retainedFileCountLimit.Value - 1)
                 return false;
 
             if (_retainedFileTimeLimit.HasValue && file.DateTime.HasValue &&

test/Serilog.Sinks.File.Tests/RollingFileSinkTests.cs

@@ -8,6 +8,7 @@
 using Serilog.Events;
 using Serilog.Sinks.File.Tests.Support;
 using Serilog.Configuration;
+using Serilog.Core;
 
 namespace Serilog.Sinks.File.Tests
 {
@@ -142,7 +143,7 @@ public void WhenRetentionCountAndArchivingHookIsSetOldFilesAreCopiedAndOriginalD
                 files =>
                 {
                     Assert.Equal(3, files.Count);
-                    Assert.True(!System.IO.File.Exists(files[0]));
+                    Assert.False(System.IO.File.Exists(files[0]));
                     Assert.True(System.IO.File.Exists(files[1]));
                     Assert.True(System.IO.File.Exists(files[2]));
                     Assert.True(System.IO.File.Exists(ArchiveOldLogsHook.AddTopDirectory(files[0], archiveDirectory)));
@@ -241,7 +242,7 @@ public void IfTheLogFolderDoesNotExistItWillBeCreated()
             var folder = Path.Combine(temp, Guid.NewGuid().ToString());
             var pathFormat = Path.Combine(folder, fileName);
 
-            ILogger log = null;
+            Logger log = null;
 
             try
             {
@@ -255,8 +256,7 @@ public void IfTheLogFolderDoesNotExistItWillBeCreated()
             }
             finally
             {
-                var disposable = (IDisposable)log;
-                if (disposable != null) disposable.Dispose();
+                log?.Dispose();
                 Directory.Delete(temp, true);
             }
         }