Skip to content

Commit fd6e613

Browse files
committed
Upgrade to ASP.NET Core 2.1.0 RC1
1 parent 5005dc1 commit fd6e613

7 files changed

Lines changed: 34 additions & 44 deletions

File tree

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
1+
<Project Sdk="Microsoft.NET.Sdk">
32
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.0</TargetFramework>
3+
<TargetFramework>netcoreapp2.1</TargetFramework>
54
</PropertyGroup>
6-
75
<ItemGroup>
8-
<PackageReference Include="Lib.Net.Http.WebPush" Version="1.2.0" />
6+
<PackageReference Include="Lib.Net.Http.WebPush" Version="1.3.0" />
97
</ItemGroup>
10-
118
</Project>

Demo.AspNetCore.PushNotifications.Services.PushService/Demo.AspNetCore.PushNotifications.Services.PushService.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netcoreapp2.0</TargetFramework>
3+
<TargetFramework>netcoreapp2.1</TargetFramework>
44
<LangVersion>latest</LangVersion>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageReference Include="Lib.Net.Http.WebPush" Version="1.2.0" />
8-
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="2.0.0" />
9-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.0.0" />
10-
<PackageReference Include="Microsoft.Extensions.Options" Version="2.0.0" />
7+
<PackageReference Include="Lib.Net.Http.WebPush" Version="1.3.0" />
8+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="2.1.0-rc1-final" />
9+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.0-rc1-final" />
10+
<PackageReference Include="Microsoft.Extensions.Options" Version="2.1.0-rc1-final" />
1111
</ItemGroup>
1212
<ItemGroup>
1313
<ProjectReference Include="..\Demo.AspNetCore.PushNotifications.Services.Abstractions\Demo.AspNetCore.PushNotifications.Services.Abstractions.csproj" />
Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
1+
<Project Sdk="Microsoft.NET.Sdk">
32
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.0</TargetFramework>
3+
<TargetFramework>netcoreapp2.1</TargetFramework>
54
</PropertyGroup>
6-
75
<ItemGroup>
8-
<PackageReference Include="Lib.Net.Http.WebPush" Version="1.2.0" />
9-
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.0.1" />
10-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.0.1" />
6+
<PackageReference Include="Lib.Net.Http.WebPush" Version="1.3.0" />
7+
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.1.0-rc1-final" />
8+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.0-rc1-final" />
119
</ItemGroup>
12-
1310
<ItemGroup>
1411
<ProjectReference Include="..\Demo.AspNetCore.PushNotifications.Services.Abstractions\Demo.AspNetCore.PushNotifications.Services.Abstractions.csproj" />
1512
</ItemGroup>
16-
1713
</Project>
Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
1+
<Project Sdk="Microsoft.NET.Sdk">
32
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.0</TargetFramework>
3+
<TargetFramework>netcoreapp2.1</TargetFramework>
54
</PropertyGroup>
6-
75
<ItemGroup>
8-
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.0.1" />
9-
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.0.1" />
10-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" />
6+
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.1.0-rc1-final" />
7+
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.1.0-rc1-final" />
8+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.0-rc1-final" />
119
</ItemGroup>
12-
1310
<ItemGroup>
1411
<ProjectReference Include="..\Demo.AspNetCore.PushNotifications.Services.Abstractions\Demo.AspNetCore.PushNotifications.Services.Abstractions.csproj" />
1512
<ProjectReference Include="..\Demo.AspNetCore.PushNotifications.Services.PushService\Demo.AspNetCore.PushNotifications.Services.PushService.csproj" />
1613
<ProjectReference Include="..\Demo.AspNetCore.PushNotifications.Services.Sqlite\Demo.AspNetCore.PushNotifications.Services.Sqlite.csproj" />
1714
</ItemGroup>
18-
1915
</Project>

Demo.AspNetCore.PushNotifications/Demo.AspNetCore.PushNotifications.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
<Project Sdk="Microsoft.NET.Sdk.Web">
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFramework>netcoreapp2.0</TargetFramework>
3+
<TargetFramework>netcoreapp2.1</TargetFramework>
44
</PropertyGroup>
55
<ItemGroup>
6-
<PackageReference Include="Lib.Net.Http.WebPush" Version="1.2.0" />
7-
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.5" />
6+
<PackageReference Include="Lib.Net.Http.WebPush" Version="1.3.0" />
7+
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0-rc1-final" />
88
</ItemGroup>
99
<ItemGroup>
1010
<ProjectReference Include="..\Demo.AspNetCore.PushNotifications.Services.Abstractions\Demo.AspNetCore.PushNotifications.Services.Abstractions.csproj" />

Demo.AspNetCore.PushNotifications/Program.cs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,13 @@ public class Program
77
{
88
public static void Main(string[] args)
99
{
10-
BuildWebHost(args).Run();
10+
CreateWebHostBuilder(args)
11+
.Build()
12+
.Run();
1113
}
1214

13-
public static IWebHost BuildWebHost(string[] args)
14-
{
15-
return WebHost.CreateDefaultBuilder(args)
16-
.UseStartup<Startup>()
17-
.Build();
18-
}
15+
public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
16+
WebHost.CreateDefaultBuilder(args)
17+
.UseStartup<Startup>();
1918
}
2019
}

Demo.AspNetCore.PushNotifications/Startup.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
using Microsoft.AspNetCore.Builder;
2-
using Microsoft.AspNetCore.Hosting;
1+
using Microsoft.AspNetCore.Mvc;
32
using Microsoft.AspNetCore.Http;
3+
using Microsoft.AspNetCore.Builder;
4+
using Microsoft.AspNetCore.Hosting;
45
using Microsoft.Extensions.Configuration;
56
using Microsoft.Extensions.DependencyInjection;
67
using Newtonsoft.Json.Converters;
@@ -30,7 +31,8 @@ public void ConfigureServices(IServiceCollection services)
3031
.AddJsonOptions(options =>
3132
{
3233
options.SerializerSettings.Converters.Add(new StringEnumConverter());
33-
});
34+
})
35+
.SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
3436
}
3537

3638
public void Configure(IApplicationBuilder app, IHostingEnvironment env)

0 commit comments

Comments
 (0)