Skip to content

Commit 60e7df3

Browse files
nblumhardtnblumhardt
authored
Merge pull request #140 from serilog/dev
3.1.0 Release
2 parents a5c738a + 2d741c1 commit 60e7df3

17 files changed

+168
-144
lines changed

Diff for: ‎CHANGES.md

-4
This file was deleted.

Diff for: ‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,10 @@ Or [as JSON](https://github.com/serilog/serilog-formatting-compact):
109109
}
110110
```
111111

112-
To enable the middleware, first change the minimum level for `Microsoft` to `Warning` in your logger configuration or _appsettings.json_ file:
112+
To enable the middleware, first change the minimum level for `Microsoft.AspNetCore` to `Warning` in your logger configuration or _appsettings.json_ file:
113113

114114
```csharp
115-
.MinimumLevel.Override("Microsoft", LogEventLevel.Warning)
115+
.MinimumLevel.Override("Microsoft.AspNetCore", LogEventLevel.Warning)
116116
```
117117

118118
Then, in your application's _Startup.cs_, add the middleware with `UseSerilogRequestLogging()`:
@@ -205,7 +205,7 @@ Finally, pass the provider collection into `UseSerilog()`:
205205

206206
Providers registered in _Startup.cs_ with `AddLogging()` will then receive events from Serilog.
207207

208-
**Using iniline initialization:**
208+
**Using inline initialization:**
209209

210210
If [inline initialization](#inline-initialization) is used, providers can be enabled by adding `writeToProviders: true` to the `UseSerilog()` method call:
211211

Diff for: ‎Setup.ps1

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
$ErrorActionPreference = "Stop"
2+
3+
$RequiredDotnetVersion = $(cat ./global.json | convertfrom-json).sdk.version
4+
5+
mkdir "./build"
6+
7+
Invoke-WebRequest "https://dot.net/v1/dotnet-install.ps1" -OutFile "./build/installcli.ps1"
8+
& ./build/installcli.ps1 -InstallDir "$pwd/.dotnetcli" -NoPath -Version $RequiredDotnetVersion
9+
if ($LASTEXITCODE) { exit 1 }
10+
11+
$env:Path = "$pwd/.dotnetcli;$env:Path"

Diff for: ‎appveyor.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: '{build}'
22
skip_tags: true
33
image: Visual Studio 2017
44
install:
5-
- ps: mkdir -Force ".\build\" | Out-Null
5+
- ps: ./Setup.ps1
66
build_script:
77
- ps: ./Build.ps1
88
test: off

Diff for: ‎global.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "2.2.105"
3+
"version": "3.0.100"
44
}
5-
}
5+
}

Diff for: ‎samples/EarlyInitializationSample/EarlyInitializationSample.csproj

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.2</TargetFramework>
5-
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
4+
<TargetFramework>netcoreapp3.0</TargetFramework>
65
</PropertyGroup>
76

87
<ItemGroup>
98
<ProjectReference Include="..\..\src\Serilog.AspNetCore\Serilog.AspNetCore.csproj" />
109
</ItemGroup>
1110

12-
<ItemGroup>
13-
<PackageReference Include="Microsoft.AspNetCore.App" />
14-
<PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
15-
</ItemGroup>
16-
1711
</Project>

Diff for: ‎samples/EarlyInitializationSample/Program.cs

+10-11
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
using System;
22
using System.IO;
3-
using Microsoft.AspNetCore;
43
using Microsoft.AspNetCore.Hosting;
54
using Microsoft.Extensions.Configuration;
5+
using Microsoft.Extensions.Hosting;
66
using Serilog;
77

88
namespace EarlyInitializationSample
@@ -23,16 +23,14 @@ public static int Main(string[] args)
2323
.Enrich.FromLogContext()
2424
.WriteTo.Debug()
2525
.WriteTo.Console(
26-
// {Properties:j} added:
27-
outputTemplate: "[{Timestamp:HH:mm:ss} {Level:u3}] {Message:lj} " +
28-
"{Properties:j}{NewLine}{Exception}")
26+
outputTemplate: "[{Timestamp:HH:mm:ss} {Level:u3}] {Message:lj} {Properties:j}{NewLine}{Exception}")
2927
.CreateLogger();
3028

3129
try
3230
{
3331
Log.Information("Getting the motors running...");
3432

35-
BuildWebHost(args).Run();
33+
CreateHostBuilder(args).Build().Run();
3634

3735
return 0;
3836
}
@@ -47,11 +45,12 @@ public static int Main(string[] args)
4745
}
4846
}
4947

50-
public static IWebHost BuildWebHost(string[] args) =>
51-
WebHost.CreateDefaultBuilder(args)
52-
.UseStartup<Startup>()
53-
.UseConfiguration(Configuration)
54-
.UseSerilog()
55-
.Build();
48+
public static IHostBuilder CreateHostBuilder(string[] args) =>
49+
Host.CreateDefaultBuilder(args)
50+
.ConfigureWebHostDefaults(webBuilder =>
51+
{
52+
webBuilder.UseStartup<Startup>();
53+
})
54+
.UseSerilog();
5655
}
5756
}

Diff for: ‎samples/EarlyInitializationSample/Startup.cs

+10-27
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,19 @@
11
using Microsoft.AspNetCore.Builder;
22
using Microsoft.AspNetCore.Hosting;
3-
using Microsoft.AspNetCore.Http;
4-
using Microsoft.AspNetCore.Mvc;
5-
using Microsoft.Extensions.Configuration;
63
using Microsoft.Extensions.DependencyInjection;
4+
using Microsoft.Extensions.Hosting;
75
using Serilog;
86

97
namespace EarlyInitializationSample
108
{
119
public class Startup
1210
{
13-
public Startup(IConfiguration configuration)
14-
{
15-
Configuration = configuration;
16-
}
17-
18-
public IConfiguration Configuration { get; }
19-
20-
// This method gets called by the runtime. Use this method to add services to the container.
2111
public void ConfigureServices(IServiceCollection services)
2212
{
23-
services.Configure<CookiePolicyOptions>(options =>
24-
{
25-
// This lambda determines whether user consent for non-essential cookies is needed for a given request.
26-
options.CheckConsentNeeded = context => true;
27-
options.MinimumSameSitePolicy = SameSiteMode.None;
28-
});
29-
30-
31-
services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_2);
13+
services.AddControllersWithViews();
3214
}
3315

34-
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
35-
public void Configure(IApplicationBuilder app, IHostingEnvironment env)
16+
public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
3617
{
3718
if (env.IsDevelopment())
3819
{
@@ -41,21 +22,23 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env)
4122
else
4223
{
4324
app.UseExceptionHandler("/Home/Error");
25+
app.UseHsts();
4426
}
4527

28+
app.UseStaticFiles();
29+
4630
// Write streamlined request completion events, instead of the more verbose ones from the framework.
4731
// To use the default framework request logging instead, remove this line and set the "Microsoft"
4832
// level in appsettings.json to "Information".
4933
app.UseSerilogRequestLogging();
5034

51-
app.UseStaticFiles();
52-
app.UseCookiePolicy();
35+
app.UseRouting();
5336

54-
app.UseMvc(routes =>
37+
app.UseEndpoints(endpoints =>
5538
{
56-
routes.MapRoute(
39+
endpoints.MapControllerRoute(
5740
name: "default",
58-
template: "{controller=Home}/{action=Index}/{id?}");
41+
pattern: "{controller=Home}/{action=Index}/{id?}");
5942
});
6043
}
6144
}

Diff for: ‎samples/InlineInitializationSample/InlineInitializationSample.csproj

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.2</TargetFramework>
5-
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
4+
<TargetFramework>netcoreapp3.0</TargetFramework>
65
</PropertyGroup>
76

87
<ItemGroup>
98
<ProjectReference Include="..\..\src\Serilog.AspNetCore\Serilog.AspNetCore.csproj" />
109
</ItemGroup>
1110

12-
<ItemGroup>
13-
<PackageReference Include="Microsoft.AspNetCore.App" />
14-
<PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
15-
</ItemGroup>
16-
1711
</Project>

Diff for: ‎samples/InlineInitializationSample/Program.cs

+10-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
using Microsoft.AspNetCore;
2-
using Microsoft.AspNetCore.Hosting;
1+
using Microsoft.AspNetCore.Hosting;
2+
using Microsoft.Extensions.Hosting;
33
using Serilog;
44

55
namespace InlineInitializationSample
@@ -8,19 +8,20 @@ public class Program
88
{
99
public static void Main(string[] args)
1010
{
11-
CreateWebHostBuilder(args).Build().Run();
11+
CreateHostBuilder(args).Build().Run();
1212
}
1313

14-
public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
15-
WebHost.CreateDefaultBuilder(args)
16-
.UseStartup<Startup>()
14+
public static IHostBuilder CreateHostBuilder(string[] args) =>
15+
Host.CreateDefaultBuilder(args)
16+
.ConfigureWebHostDefaults(webBuilder =>
17+
{
18+
webBuilder.UseStartup<Startup>();
19+
})
1720
.UseSerilog((hostingContext, loggerConfiguration) => loggerConfiguration
1821
.ReadFrom.Configuration(hostingContext.Configuration)
1922
.Enrich.FromLogContext()
2023
.WriteTo.Debug()
2124
.WriteTo.Console(
22-
// {Properties:j} added:
23-
outputTemplate: "[{Timestamp:HH:mm:ss} {Level:u3}] {Message:lj} " +
24-
"{Properties:j}{NewLine}{Exception}"));
25+
outputTemplate: "[{Timestamp:HH:mm:ss} {Level:u3}] {Message:lj} {Properties:j}{NewLine}{Exception}"));
2526
}
2627
}

Diff for: ‎samples/InlineInitializationSample/Startup.cs

+13-28
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,21 @@
1-
using Microsoft.AspNetCore.Builder;
1+
using System.Net;
2+
using Microsoft.AspNetCore.Builder;
23
using Microsoft.AspNetCore.Hosting;
3-
using Microsoft.AspNetCore.Http;
4-
using Microsoft.AspNetCore.Mvc;
5-
using Microsoft.Extensions.Configuration;
64
using Microsoft.Extensions.DependencyInjection;
5+
using Microsoft.Extensions.Hosting;
76
using Serilog;
7+
using Serilog.Events;
88

99
namespace InlineInitializationSample
1010
{
1111
public class Startup
1212
{
13-
public Startup(IConfiguration configuration)
14-
{
15-
Configuration = configuration;
16-
}
17-
18-
public IConfiguration Configuration { get; }
19-
20-
// This method gets called by the runtime. Use this method to add services to the container.
2113
public void ConfigureServices(IServiceCollection services)
2214
{
23-
services.Configure<CookiePolicyOptions>(options =>
24-
{
25-
// This lambda determines whether user consent for non-essential cookies is needed for a given request.
26-
options.CheckConsentNeeded = context => true;
27-
options.MinimumSameSitePolicy = SameSiteMode.None;
28-
});
29-
30-
31-
services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_2);
15+
services.AddControllersWithViews();
3216
}
3317

34-
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
35-
public void Configure(IApplicationBuilder app, IHostingEnvironment env)
18+
public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
3619
{
3720
if (env.IsDevelopment())
3821
{
@@ -41,21 +24,23 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env)
4124
else
4225
{
4326
app.UseExceptionHandler("/Home/Error");
27+
app.UseHsts();
4428
}
4529

30+
app.UseStaticFiles();
31+
4632
// Write streamlined request completion events, instead of the more verbose ones from the framework.
4733
// To use the default framework request logging instead, remove this line and set the "Microsoft"
4834
// level in appsettings.json to "Information".
4935
app.UseSerilogRequestLogging();
5036

51-
app.UseStaticFiles();
52-
app.UseCookiePolicy();
37+
app.UseRouting();
5338

54-
app.UseMvc(routes =>
39+
app.UseEndpoints(endpoints =>
5540
{
56-
routes.MapRoute(
41+
endpoints.MapControllerRoute(
5742
name: "default",
58-
template: "{controller=Home}/{action=Index}/{id?}");
43+
pattern: "{controller=Home}/{action=Index}/{id?}");
5944
});
6045
}
6146
}

Diff for: ‎serilog-aspnetcore.sln

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26730.12
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.29209.62
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A1893BD1-333D-4DFE-A0F0-DDBB2FE526E0}"
77
EndProject
@@ -16,6 +16,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "assets", "assets", "{9C21B9
1616
global.json = global.json
1717
README.md = README.md
1818
assets\Serilog.snk = assets\Serilog.snk
19+
Setup.ps1 = Setup.ps1
1920
EndProjectSection
2021
EndProject
2122
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serilog.AspNetCore", "src\Serilog.AspNetCore\Serilog.AspNetCore.csproj", "{0549D23F-986B-4FB2-BACE-16FD7A7BC9EF}"

0 commit comments

Comments
 (0)