Skip to content

Commit 20868fb

Browse files
catcherwongcatcherwong
authored
Merge pull request #48 from dotnetcore/dev
Update to .NET Core 2.1
2 parents dc71f6b + 158dbf5 commit 20868fb

File tree

30 files changed

+101
-119
lines changed

30 files changed

+101
-119
lines changed

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ solution: EasyCaching.sln
44

55
sudo: required
66

7-
dotnet: 2.0.0
7+
dotnet: 2.1.301
88

99
mono: none
1010

‎appveyor.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ skip_commits:
1818
- .gitignore
1919

2020
install:
21+
- ps: Invoke-WebRequest "https://raw.githubusercontent.com/dotnet/cli/master/scripts/obtain/dotnet-install.ps1" -OutFile "dotnet-install.ps1"
22+
- ps: .\dotnet-install.ps1 --Version 2.1.301
2123
- cmd: >-
2224
cd C:\projects\easycaching\tools\RedisConfigs\3.0.503
2325

‎sample/EasyCaching.Demo.Interceptors/EasyCaching.Demo.Interceptors.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.0</TargetFramework>
4+
<TargetFramework>netcoreapp2.1</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
88
<Folder Include="Services\" />
99
</ItemGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
13-
</ItemGroup>
14-
15-
<ItemGroup>
16-
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
12+
<PackageReference Include="Microsoft.AspNetCore.App" />
1713
</ItemGroup>
1814

1915
<ItemGroup>

‎sample/EasyCaching.Demo.Interceptors/Program.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@
55

66
public class Program
77
{
8-
public static void Main(string[] args)
8+
public static void Main(string[] args)
99
{
10-
BuildWebHost(args).Run();
10+
CreateWebHostBuilder(args).Build().Run();
1111
}
1212

13-
public static IWebHost BuildWebHost(string[] args) =>
13+
public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
1414
WebHost.CreateDefaultBuilder(args)
15-
.UseStartup<Startup>()
16-
.Build();
15+
.UseStartup<Startup>();
1716
}
1817
}

‎sample/EasyCaching.Demo.Interceptors/Startup.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using EasyCaching.InMemory;
77
using Microsoft.AspNetCore.Builder;
88
using Microsoft.AspNetCore.Hosting;
9+
using Microsoft.AspNetCore.Mvc;
910
using Microsoft.Extensions.Configuration;
1011
using Microsoft.Extensions.DependencyInjection;
1112
using System;
@@ -26,7 +27,7 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
2627

2728
services.AddDefaultInMemoryCache();
2829

29-
services.AddMvc();
30+
services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
3031

3132
//1.1. all default
3233
return services.ConfigureAspectCoreInterceptor();

‎sample/EasyCaching.Demo.Providers/EasyCaching.Demo.Providers.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.0</TargetFramework>
4+
<TargetFramework>netcoreapp2.1</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
9-
</ItemGroup>
10-
11-
<ItemGroup>
12-
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
8+
<PackageReference Include="Microsoft.AspNetCore.App" />
139
</ItemGroup>
1410

1511
<ItemGroup>

‎sample/EasyCaching.Demo.Providers/Program.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,13 @@ namespace EasyCaching.Demo.Providers
1212
{
1313
public class Program
1414
{
15-
public static void Main(string[] args)
15+
public static void Main(string[] args)
1616
{
17-
BuildWebHost(args).Run();
17+
CreateWebHostBuilder(args).Build().Run();
1818
}
1919

20-
public static IWebHost BuildWebHost(string[] args) =>
20+
public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
2121
WebHost.CreateDefaultBuilder(args)
22-
.UseStartup<Startup>()
23-
.Build();
22+
.UseStartup<Startup>();
2423
}
2524
}

‎sample/EasyCaching.Demo.Providers/Startup.cs

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1-
namespace EasyCaching.Demo.Providers
1+
namespace EasyCaching.Demo.Providers
22
{
33
using EasyCaching.Core;
44
using EasyCaching.Core.Internal;
55
using EasyCaching.InMemory;
6-
using EasyCaching.HybridCache;
7-
using EasyCaching.Memcached;
6+
using EasyCaching.HybridCache;
7+
using EasyCaching.Memcached;
88
using EasyCaching.Redis;
9-
using EasyCaching.SQLite;
10-
using Microsoft.AspNetCore.Builder;
11-
using Microsoft.AspNetCore.Hosting;
9+
using EasyCaching.SQLite;
10+
using Microsoft.AspNetCore.Builder;
11+
using Microsoft.AspNetCore.Hosting;
12+
using Microsoft.AspNetCore.Mvc;
1213
using Microsoft.Extensions.Configuration;
13-
using Microsoft.Extensions.DependencyInjection;
14+
using Microsoft.Extensions.DependencyInjection;
1415
using Microsoft.Extensions.Logging;
1516
using System;
1617

@@ -25,7 +26,7 @@ public Startup(IConfiguration configuration)
2526

2627
public void ConfigureServices(IServiceCollection services)
2728
{
28-
services.AddMvc();
29+
services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
2930

3031
//1. Important step for using InMemory Cache
3132
services.AddDefaultInMemoryCache(x => { x.EnableLogging = true; });
@@ -91,5 +92,5 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
9192

9293
app.UseMvc();
9394
}
94-
}
95-
}
95+
}
96+
}

‎sample/EasyCaching.Demo.ResponseCaching/EasyCaching.Demo.ResponseCaching.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.0</TargetFramework>
4+
<TargetFramework>netcoreapp2.1</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
8+
<PackageReference Include="Microsoft.AspNetCore.App" />
99
</ItemGroup>
1010

11-
<ItemGroup>
12-
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
13-
</ItemGroup>
1411

1512
<ItemGroup>
1613
<Content Remove="Views\Home\Contact.cshtml" />

‎sample/EasyCaching.Demo.ResponseCaching/Program.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,11 @@ public class Program
1414
{
1515
public static void Main(string[] args)
1616
{
17-
BuildWebHost(args).Run();
17+
CreateWebHostBuilder(args).Build().Run();
1818
}
1919

20-
public static IWebHost BuildWebHost(string[] args) =>
20+
public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
2121
WebHost.CreateDefaultBuilder(args)
22-
.UseStartup<Startup>()
23-
.Build();
22+
.UseStartup<Startup>();
2423
}
2524
}

0 commit comments

Comments
 (0)