Merge pull request #280 from sungam3r/style

Code cleanup

.editorconfig

@@ -5,6 +5,7 @@ trim_trailing_whitespace = true
 insert_final_newline = true
 indent_style = space
 indent_size = 4
+charset = utf-8
 
 [*.{csproj,json,config,yml,props}]
 indent_size = 2
@@ -14,3 +15,8 @@ end_of_line = lf
 
 [*.{cmd, bat}]
 end_of_line = crlf
+
+# C# formatting settings - Namespace options
+csharp_style_namespace_declarations = file_scoped:suggestion
+
+csharp_style_prefer_switch_expression = true:suggestion

Build.ps1

@@ -16,7 +16,7 @@ $commitHash = $(git rev-parse --short HEAD)
 $buildSuffix = @{ $true = "$($suffix)-$($commitHash)"; $false = "$($branch)-$($commitHash)" }[$suffix -ne ""]
 
 echo "build: Package version suffix is $suffix"
-echo "build: Build version suffix is $buildSuffix" 
+echo "build: Build version suffix is $buildSuffix"
 
 foreach ($src in ls src/*) {
     Push-Location $src
@@ -29,7 +29,7 @@ foreach ($src in ls src/*) {
     } else {
         & dotnet pack -c Release -o ..\..\artifacts --no-build
     }
-    if($LASTEXITCODE -ne 0) { exit 1 }    
+    if($LASTEXITCODE -ne 0) { exit 1 }
 
     Pop-Location
 }

Directory.Build.props

@@ -0,0 +1,16 @@
+<Project>
+  <PropertyGroup>
+    <LangVersion>latest</LangVersion>
+    <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
+    <SignAssembly>true</SignAssembly>
+    <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
+    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)assets/Serilog.snk</AssemblyOriginatorKeyFile>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+</Project>

Directory.Build.targets

@@ -0,0 +1,7 @@
+<Project>
+
+  <ItemGroup>
+    <Using Remove="System.Net.Http" />
+  </ItemGroup>
+
+</Project>

build.sh

@@ -1,6 +1,6 @@
-#!/bin/bash
+#!/bin/bash
 
-set -e 
+set -e
 dotnet --info
 dotnet --list-sdks
 dotnet restore

example/Sample/Program.cs

@@ -1,38 +1,35 @@
-using System;
-using System.IO;
 using Serilog;
 using Serilog.Debugging;
 
-namespace Sample
+namespace Sample;
+
+public class Program
 {
-    public class Program
+    public static void Main(string[] args)
     {
-        public static void Main(string[] args)
-        {
-            SelfLog.Enable(Console.Out);
+        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");
     }
 }

example/Sample/Sample.csproj

@@ -1,12 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>net48;net6.0</TargetFrameworks>
-    <LangVersion>8.0</LangVersion>
-    <Nullable>enable</Nullable>
-    <AssemblyName>Sample</AssemblyName>
     <OutputType>Exe</OutputType>
-    <PackageId>Sample</PackageId>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
 

serilog-sinks-file.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26730.15
+# Visual Studio Version 17
+VisualStudioVersion = 17.5.33424.131
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{037440DE-440B-4129-9F7A-09B42D00397E}"
 EndProject
@@ -11,6 +11,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "assets", "assets", "{E9D1B5
 		appveyor.yml = appveyor.yml
 		Build.ps1 = Build.ps1
 		build.sh = build.sh
+		Directory.Build.props = Directory.Build.props
+		Directory.Build.targets = Directory.Build.targets
 		README.md = README.md
 		assets\Serilog.snk = assets\Serilog.snk
 	EndProjectSection