Skip to content

Commit 4871096

Browse files
committed
Sample conversion WIP
1 parent 90452d9 commit 4871096

File tree

4 files changed

+19
-39
lines changed

4 files changed

+19
-39
lines changed

global.json

Lines changed: 1 addition & 1 deletion
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-preview8-013656"
44
}
55
}
Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +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-
<PackageReference Include="Serilog.Sinks.Console" Version="3.0.1" />
16-
<PackageReference Include="Serilog.Settings.Configuration" Version="2.4.0" />
17-
</ItemGroup>
18-
1911
</Project>

samples/EarlyInitializationSample/Program.cs

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using Microsoft.AspNetCore;
44
using Microsoft.AspNetCore.Hosting;
55
using Microsoft.Extensions.Configuration;
6+
using Microsoft.Extensions.Hosting;
67
using Serilog;
78

89
namespace EarlyInitializationSample
@@ -31,7 +32,7 @@ public static int Main(string[] args)
3132
{
3233
Log.Information("Getting the motors running...");
3334

34-
BuildWebHost(args).Run();
35+
CreateHostBuilder(args).Build().Run();
3536

3637
return 0;
3738
}
@@ -49,8 +50,15 @@ public static int Main(string[] args)
4950
public static IWebHost BuildWebHost(string[] args) =>
5051
WebHost.CreateDefaultBuilder(args)
5152
.UseStartup<Startup>()
52-
.UseConfiguration(Configuration)
53-
.UseSerilog()
5453
.Build();
54+
55+
public static IHostBuilder CreateHostBuilder(string[] args) =>
56+
Host.CreateDefaultBuilder(args)
57+
.ConfigureWebHostDefaults(webBuilder =>
58+
{
59+
webBuilder.UseStartup<Startup>();
60+
})
61+
.UseConfiguration(Configuration)
62+
.UseSerilog();
5563
}
5664
}
Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Threading.Tasks;
5-
using Microsoft.AspNetCore.Builder;
1+
using Microsoft.AspNetCore.Builder;
62
using Microsoft.AspNetCore.Hosting;
7-
using Microsoft.AspNetCore.Http;
8-
using Microsoft.AspNetCore.Mvc;
93
using Microsoft.Extensions.Configuration;
104
using Microsoft.Extensions.DependencyInjection;
5+
using Microsoft.Extensions.Hosting;
116
using Serilog;
127

138
namespace EarlyInitializationSample
@@ -21,22 +16,11 @@ public Startup(IConfiguration configuration)
2116

2217
public IConfiguration Configuration { get; }
2318

24-
// This method gets called by the runtime. Use this method to add services to the container.
2519
public void ConfigureServices(IServiceCollection services)
2620
{
27-
services.Configure<CookiePolicyOptions>(options =>
28-
{
29-
// This lambda determines whether user consent for non-essential cookies is needed for a given request.
30-
options.CheckConsentNeeded = context => true;
31-
options.MinimumSameSitePolicy = SameSiteMode.None;
32-
});
33-
34-
35-
services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_2);
3621
}
3722

38-
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
39-
public void Configure(IApplicationBuilder app, IHostingEnvironment env)
23+
public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
4024
{
4125
if (env.IsDevelopment())
4226
{
@@ -53,14 +37,10 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env)
5337
app.UseSerilogRequestLogging();
5438

5539
app.UseStaticFiles();
56-
app.UseCookiePolicy();
40+
41+
app.UseRouting();
5742

58-
app.UseMvc(routes =>
59-
{
60-
routes.MapRoute(
61-
name: "default",
62-
template: "{controller=Home}/{action=Index}/{id?}");
63-
});
43+
app.UseEndpoints(endpoints => endpoints.MapControllers());
6444
}
6545
}
6646
}

0 commit comments

Comments
 (0)