Merge pull request #338 from sungam3r/cleanup

nblumhardt · web-flow · commit 5ca0d90c3f46 · 2023-09-27T12:29:03.000+10:00
Remove obsolete APIs and little cleanup
diff --git a/Build.ps1 b/Build.ps1
@@ -25,8 +25,8 @@ foreach ($src in ls src/*) {
     } else {
         & dotnet pack -c Release --include-source -o ..\..\artifacts
     }
-    
-    if($LASTEXITCODE -ne 0) { exit 1 }    
+
+    if($LASTEXITCODE -ne 0) { exit 1 }
 
     Pop-Location
 }
diff --git a/samples/Sample/Program.cs b/samples/Sample/Program.cs
@@ -24,7 +24,7 @@ public static int Main(string[] args)
         }
         catch (Exception ex)
         {
-            Log.Fatal(ex, "An unhandled exception occured during bootstrapping");
+            Log.Fatal(ex, "An unhandled exception occurred during bootstrapping");
             return 1;
         }
         finally
@@ -40,5 +40,5 @@ public static IHostBuilder CreateHostBuilder(string[] args) =>
                 .ReadFrom.Services(services)
                 .Enrich.FromLogContext()
                 .WriteTo.Console())
-            .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup<Startup>(); });
+            .ConfigureWebHostDefaults(webBuilder => webBuilder.UseStartup<Startup>());
 }
diff --git a/samples/Sample/Sample.csproj b/samples/Sample/Sample.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
-    <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+  </PropertyGroup>
 
-    <ItemGroup>
-      <ProjectReference Include="..\..\src\Serilog.AspNetCore\Serilog.AspNetCore.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Serilog.AspNetCore\Serilog.AspNetCore.csproj" />
+  </ItemGroup>
 
 </Project>
diff --git a/src/Serilog.AspNetCore/AspNetCore/SerilogLoggerFactory.cs b/src/Serilog.AspNetCore/AspNetCore/SerilogLoggerFactory.cs
diff --git a/src/Serilog.AspNetCore/Properties/AssemblyInfo.cs b/src/Serilog.AspNetCore/Properties/AssemblyInfo.cs
diff --git a/src/Serilog.AspNetCore/Serilog.AspNetCore.csproj b/src/Serilog.AspNetCore/Serilog.AspNetCore.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <Description>Serilog support for ASP.NET Core logging</Description>
@@ -19,16 +19,17 @@
 
   <ItemGroup>
     <None Include="..\..\assets\icon.png" Pack="true" Visible="false" PackagePath="" />
+    <InternalsVisibleTo Include="Serilog.AspNetCore.Tests" Key="0024000004800000940000000602000000240000525341310004000001000100fb8d13fd344a1c6fe0fe83ef33c1080bf30690765bc6eb0df26ebfdf8f21670c64265b30db09f73a0dea5b3db4c9d18dbf6d5a25af5ce9016f281014d79dc3b4201ac646c451830fc7e61a2dfd633d34c39f87b81894191652df5ac63cc40c77f3542f702bda692e6e8a9158353df189007a49da0f3cfd55eb250066b19485ec" />
   </ItemGroup>
-  
+
   <ItemGroup>
     <PackageReference Include="Serilog" Version="2.12.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
     <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
     <PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />
     <PackageReference Include="Serilog.Formatting.Compact" Version="1.1.0" />
   </ItemGroup>
-  
+
   <ItemGroup>
     <!-- The versions of all references in this group must match the major and minor components of the package version prefix. -->
     <PackageReference Include="Serilog.Extensions.Hosting" Version="7.0.0" />
@@ -41,10 +42,10 @@
     <!-- I.e. all modern/supported non-Framework .NET SKUs -->
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
-  
+
   <ItemGroup Condition=" '$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1' ">
     <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
   </ItemGroup>
-  
+
 </Project>
diff --git a/src/Serilog.AspNetCore/SerilogWebHostBuilderExtensions.cs b/src/Serilog.AspNetCore/SerilogWebHostBuilderExtensions.cs
diff --git a/test/Serilog.AspNetCore.Tests/Serilog.AspNetCore.Tests.csproj b/test/Serilog.AspNetCore.Tests/Serilog.AspNetCore.Tests.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
-    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/test/Serilog.AspNetCore.Tests/SerilogWebHostBuilderExtensionsTests.cs b/test/Serilog.AspNetCore.Tests/SerilogWebHostBuilderExtensionsTests.cs
@@ -160,7 +160,7 @@ WebApplicationFactory<TestStartup> Setup(
                         return Task.CompletedTask;
                     }); // 200 OK
                 })
-                .UseSerilog(logger, dispose));
+                .ConfigureServices(sc => sc.AddSerilog(logger, dispose)));
 
         return web;
     }

Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,8 @@ foreach ($src in ls src/*) {`
`25`	`25`	`} else {`
`26`	`26`	`& dotnet pack -c Release --include-source -o ..\..\artifacts`
`27`	`27`	`}`
`28`		`-`
`29`		`- if($LASTEXITCODE -ne 0) { exit 1 }`
	`28`	`+`
	`29`	`+ if($LASTEXITCODE -ne 0) { exit 1 }`
`30`	`30`
`31`	`31`	`Pop-Location`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public static int Main(string[] args)`
`24`	`24`	`}`
`25`	`25`	`catch (Exception ex)`
`26`	`26`	`{`
`27`		`- Log.Fatal(ex, "An unhandled exception occured during bootstrapping");`
	`27`	`+ Log.Fatal(ex, "An unhandled exception occurred during bootstrapping");`
`28`	`28`	`return 1;`
`29`	`29`	`}`
`30`	`30`	`finally`
`@@ -40,5 +40,5 @@ public static IHostBuilder CreateHostBuilder(string[] args) =>`
`40`	`40`	`.ReadFrom.Services(services)`
`41`	`41`	`.Enrich.FromLogContext()`
`42`	`42`	`.WriteTo.Console())`
`43`		`- .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup<Startup>(); });`
	`43`	`+ .ConfigureWebHostDefaults(webBuilder => webBuilder.UseStartup<Startup>());`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ WebApplicationFactory<TestStartup> Setup(`
`160`	`160`	`return Task.CompletedTask;`
`161`	`161`	`}); // 200 OK`
`162`	`162`	`})`
`163`		`- .UseSerilog(logger, dispose));`
	`163`	`+ .ConfigureServices(sc => sc.AddSerilog(logger, dispose)));`
`164`	`164`
`165`	`165`	`return web;`
`166`	`166`	`}`