Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 5ca0d90

Browse files
Merge pull request #338 from sungam3r/cleanup
Remove obsolete APIs and little cleanup
2 parents 271db11 + bb77642 commit 5ca0d90

File tree

9 files changed

+17
-258
lines changed

9 files changed

+17
-258
lines changed

‎Build.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ foreach ($src in ls src/*) {
2525
} else {
2626
& dotnet pack -c Release --include-source -o ..\..\artifacts
2727
}
28-
29-
if($LASTEXITCODE -ne 0) { exit 1 }
28+
29+
if($LASTEXITCODE -ne 0) { exit 1 }
3030

3131
Pop-Location
3232
}

‎samples/Sample/Program.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public static int Main(string[] args)
2424
}
2525
catch (Exception ex)
2626
{
27-
Log.Fatal(ex, "An unhandled exception occured during bootstrapping");
27+
Log.Fatal(ex, "An unhandled exception occurred during bootstrapping");
2828
return 1;
2929
}
3030
finally
@@ -40,5 +40,5 @@ public static IHostBuilder CreateHostBuilder(string[] args) =>
4040
.ReadFrom.Services(services)
4141
.Enrich.FromLogContext()
4242
.WriteTo.Console())
43-
.ConfigureWebHostDefaults(webBuilder => {webBuilder.UseStartup<Startup>();});
43+
.ConfigureWebHostDefaults(webBuilder => webBuilder.UseStartup<Startup>());
4444
}

‎samples/Sample/Sample.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

3-
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
5-
</PropertyGroup>
3+
<PropertyGroup>
4+
<TargetFramework>net7.0</TargetFramework>
5+
</PropertyGroup>
66

7-
<ItemGroup>
8-
<ProjectReference Include="..\..\src\Serilog.AspNetCore\Serilog.AspNetCore.csproj" />
9-
</ItemGroup>
7+
<ItemGroup>
8+
<ProjectReference Include="..\..\src\Serilog.AspNetCore\Serilog.AspNetCore.csproj" />
9+
</ItemGroup>
1010

1111
</Project>

‎src/Serilog.AspNetCore/AspNetCore/SerilogLoggerFactory.cs

Lines changed: 0 additions & 71 deletions
This file was deleted.

‎src/Serilog.AspNetCore/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎src/Serilog.AspNetCore/Serilog.AspNetCore.csproj

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<Description>Serilog support for ASP.NET Core logging</Description>
@@ -19,16 +19,17 @@
1919

2020
<ItemGroup>
2121
<None Include="..\..\assets\icon.png" Pack="true" Visible="false" PackagePath="" />
22+
<InternalsVisibleTo Include="Serilog.AspNetCore.Tests" Key="0024000004800000940000000602000000240000525341310004000001000100fb8d13fd344a1c6fe0fe83ef33c1080bf30690765bc6eb0df26ebfdf8f21670c64265b30db09f73a0dea5b3db4c9d18dbf6d5a25af5ce9016f281014d79dc3b4201ac646c451830fc7e61a2dfd633d34c39f87b81894191652df5ac63cc40c77f3542f702bda692e6e8a9158353df189007a49da0f3cfd55eb250066b19485ec" />
2223
</ItemGroup>
23-
24+
2425
<ItemGroup>
2526
<PackageReference Include="Serilog" Version="2.12.0" />
2627
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
2728
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
2829
<PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />
2930
<PackageReference Include="Serilog.Formatting.Compact" Version="1.1.0" />
3031
</ItemGroup>
31-
32+
3233
<ItemGroup>
3334
<!-- The versions of all references in this group must match the major and minor components of the package version prefix. -->
3435
<PackageReference Include="Serilog.Extensions.Hosting" Version="7.0.0" />
@@ -41,10 +42,10 @@
4142
<!-- I.e. all modern/supported non-Framework .NET SKUs -->
4243
<FrameworkReference Include="Microsoft.AspNetCore.App" />
4344
</ItemGroup>
44-
45+
4546
<ItemGroup Condition=" '$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1' ">
4647
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.2.0" />
4748
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
4849
</ItemGroup>
49-
50+
5051
</Project>

‎src/Serilog.AspNetCore/SerilogWebHostBuilderExtensions.cs

Lines changed: 0 additions & 159 deletions
This file was deleted.

‎test/Serilog.AspNetCore.Tests/Serilog.AspNetCore.Tests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
<PropertyGroup>
44
<TargetFramework>net7.0</TargetFramework>
5-
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
65
</PropertyGroup>
76

87
<ItemGroup>

‎test/Serilog.AspNetCore.Tests/SerilogWebHostBuilderExtensionsTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ WebApplicationFactory<TestStartup> Setup(
160160
return Task.CompletedTask;
161161
}); // 200 OK
162162
})
163-
.UseSerilog(logger, dispose));
163+
.ConfigureServices(sc =>sc.AddSerilog(logger, dispose)));
164164

165165
return web;
166166
}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /