Dependency updates, langversion, embed README

serilog · Jun 19, 2024 · 4688ab3 · 4688ab3
1 parent 08e9025
commit 4688ab3
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 462 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -7,6 +7,7 @@
  <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)assets/Serilog.snk</AssemblyOriginatorKeyFile>
  <Nullable>enable</Nullable>
  <ImplicitUsings>enable</ImplicitUsings>
+ <LangVersion>latest</LangVersion>
  </PropertyGroup>
  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
  <Reference Include="System" />

diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ Writes [Serilog](https://serilog.net) events to one or more text files.
 Install the [Serilog.Sinks.File](https://www.nuget.org/packages/Serilog.Sinks.File/) package from NuGet:
 
 ```powershell
-Install-Package Serilog.Sinks.File
+dotnet add package Serilog.Sinks.File
 ```
 
 To configure the sink in C# code, call `WriteTo.File()` during logger configuration:
@@ -36,7 +36,7 @@ The limit can be changed or removed using the `fileSizeLimitBytes` parameter.
 
 ```csharp
  .WriteTo.File("log.txt", fileSizeLimitBytes: null)
-``` 
+```
 
 For the same reason, only **the most recent 31 files** are retained by default (i.e. one long month). To change or remove this limit, pass the `retainedFileCountLimit` parameter.
 

diff --git a/example/Sample/Program.cs b/example/Sample/Program.cs
@@ -1,35 +1,27 @@
 using Serilog;
 using Serilog.Debugging;
 
-namespace Sample;
+SelfLog.Enable(Console.Out);
 
-public class Program
-{
- public static void Main(string[] args)
- {
- SelfLog.Enable(Console.Out);
-
- var sw = System.Diagnostics.Stopwatch.StartNew();
+var sw = System.Diagnostics.Stopwatch.StartNew();
 
- Log.Logger = new LoggerConfiguration()
-  .WriteTo.File("log.txt")
-  .CreateLogger();
+Log.Logger = new LoggerConfiguration()
+ .WriteTo.File("log.txt")
+ .CreateLogger();
 
- for (var i = 0; i < 1000000; ++i)
- {
-  Log.Information("Hello, file logger!");
- }
+for (var i = 0; i < 1000000; ++i)
+{
+ Log.Information("Hello, file logger!");
+}
 
- Log.CloseAndFlush();
+Log.CloseAndFlush();
 
- sw.Stop();
+sw.Stop();
 
- Console.WriteLine($"Elapsed: {sw.ElapsedMilliseconds} ms");
- Console.WriteLine($"Size: {new FileInfo("log.txt").Length}");
+Console.WriteLine($"Elapsed: {sw.ElapsedMilliseconds} ms");
+Console.WriteLine($"Size: {new FileInfo("log.txt").Length}");
 
- Console.WriteLine("Press any key to delete the temporary log file...");
- Console.ReadKey(true);
+Console.WriteLine("Press any key to delete the temporary log file...");
+Console.ReadKey(true);
 
- File.Delete("log.txt");
- }
-}
+File.Delete("log.txt");
diff --git a/example/Sample/Sample.csproj b/example/Sample/Sample.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
- <TargetFrameworks>net48;net6.0</TargetFrameworks>
+ <TargetFrameworks>net48;net8.0</TargetFrameworks>
  <OutputType>Exe</OutputType>
  <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
  </PropertyGroup>

diff --git a/src/Serilog.Sinks.File/Serilog.Sinks.File.csproj b/src/Serilog.Sinks.File/Serilog.Sinks.File.csproj
@@ -2,42 +2,45 @@
 
  <PropertyGroup>
  <Description>Write Serilog events to text files in plain or JSON format.</Description>
- <VersionPrefix>5.0.1</VersionPrefix>
+ <VersionPrefix>6.0.0</VersionPrefix>
  <Authors>Serilog Contributors</Authors>
- <TargetFrameworks>net45;netstandard1.3;netstandard2.0;netstandard2.1;net5.0;net6.0</TargetFrameworks>
+ <!-- .NET Framework version targeting is frozen at these two TFMs. -->
+ <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT'">net471;net462</TargetFrameworks>
+ <!-- Policy is to trim TFM-specific builds to `netstandard2.0`, `net6.0`,
+ all active LTS versions, and optionally the latest RTM version, when releasing new
+ major Serilog versions. -->
+ <TargetFrameworks>$(TargetFrameworks);net8.0;net6.0;netstandard2.0</TargetFrameworks>
  <GenerateDocumentationFile>true</GenerateDocumentationFile>
  <PackageTags>serilog;file</PackageTags>
- <PackageIcon>images\icon.png</PackageIcon>
+ <PackageIcon>serilog-sink-nuget.png</PackageIcon>
  <PackageIconUrl>https://serilog.net/images/serilog-sink-nuget.png</PackageIconUrl>
  <PackageProjectUrl>https://github.com/serilog/serilog-sinks-file</PackageProjectUrl>
  <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
  <RepositoryUrl>https://github.com/serilog/serilog-sinks-file</RepositoryUrl>
  <RepositoryType>git</RepositoryType>
  <RootNamespace>Serilog</RootNamespace>
- <DisableImplicitFrameworkReferences Condition=" '$(TargetFramework)' == 'netstandard1.3' ">true</DisableImplicitFrameworkReferences>
- <EnableSourceLink Condition="'$(EnableSourceLink)' == ''">false</EnableSourceLink>
  <PublishRepositoryUrl>true</PublishRepositoryUrl>
- <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
  <IncludeSymbols>True</IncludeSymbols>
  <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+ <PackageReadmeFile>README.md</PackageReadmeFile>
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
- <PackageReference Include="Serilog" Version="2.10.0" />
+ <PackageReference Include="Serilog" Version="4.0.0" />
  <PackageReference Include="Nullable" Version="1.3.1" PrivateAssets="All" />
  </ItemGroup>
 
- <PropertyGroup Condition=" '$(TargetFramework)' == 'net45' ">
+ <PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
  <DefineConstants>$(DefineConstants);ATOMIC_APPEND;HRESULTS</DefineConstants>
  </PropertyGroup>
 
- <PropertyGroup Condition=" '$(TargetFramework)' != 'net45' ">
+ <PropertyGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'">
  <DefineConstants>$(DefineConstants);OS_MUTEX</DefineConstants>
  </PropertyGroup>
 
  <ItemGroup>
- <None Include="..\..\assets\serilog-sink-nuget.png" Pack="true" Visible="false" PackagePath="images\icon.png" />
+ <None Include="..\..\assets\serilog-sink-nuget.png" Pack="true" Visible="false" PackagePath="/" />
+ <None Include="..\..\README.md" Pack="true" Visible="false" PackagePath="/" />
  </ItemGroup>
 
 </Project>
diff --git a/test/Serilog.Sinks.File.Tests/Serilog.Sinks.File.Tests.csproj b/test/Serilog.Sinks.File.Tests/Serilog.Sinks.File.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
- <TargetFrameworks>net48;net6.0</TargetFrameworks>
+ <TargetFrameworks>net48;net8.0</TargetFrameworks>
  <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
  </PropertyGroup>
 
@@ -10,12 +10,12 @@
  </ItemGroup>
 
  <ItemGroup>
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
- <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+ <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
  <PrivateAssets>all</PrivateAssets>
  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
  </PackageReference>
- <PackageReference Include="xunit" Version="2.4.2" />
+ <PackageReference Include="xunit" Version="2.8.1" />
  </ItemGroup>
 
 </Project>