Update net core version to 3.1 (#1)

neonbones · Asylgareev Rustam · web-flow · commit bf88e4dbc09f · 2020-03-18T18:29:03.000+03:00
* Update net core version to 3.1

* Removed spaces

* Updated build and release versions

* Fixed build yaml

Co-authored-by: Asylgareev Rustam &lt;rustam@smarthead.ru&gt;
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,7 +12,7 @@ jobs:
     - name: Setup .NET Environment.
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '2.2.401'
+        dotnet-version: '3.1.101'
     - name: Build and run tests.
       run: |
         cd src/
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -10,7 +10,7 @@ jobs:
     - name: Setup .NET Environment.
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '2.2.401'
+        dotnet-version: '3.1.1'
     - name: Build package for Release.
       run: |
         cd src/
diff --git a/src/EF.DataProtection.Core.Tests/EF.DataProtection.Core.Tests.csproj b/src/EF.DataProtection.Core.Tests/EF.DataProtection.Core.Tests.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+﻿<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp2.2</TargetFramework>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
 
         <IsPackable>false</IsPackable>
     </PropertyGroup>
@@ -12,11 +12,7 @@
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
     </ItemGroup>
 
-    <ItemGroup>
-      <Folder Include="Fixtures" />
-    </ItemGroup>
-
-    <ItemGroup>
+  <ItemGroup>
       <ProjectReference Include="..\EF.DataProtection.Core\EF.DataProtection.Core.csproj" />
     </ItemGroup>
 
diff --git a/src/EF.DataProtection.Core/EF.DataProtection.Core.csproj b/src/EF.DataProtection.Core/EF.DataProtection.Core.csproj
@@ -1,17 +1,17 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
         <AssemblyName>EF.DataProtection.Core</AssemblyName>
         <PackageId>EF.DataProtection.Core</PackageId>
-        <Version>0.1.3</Version>
+        <Version>0.1.4</Version>
         <PackageProjectUrl>https://github.com/qdimka/EntityFramework.DataProtection</PackageProjectUrl>
         <IsTestProject>false</IsTestProject>
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.2.6" />
-      <PackageReference Include="Microsoft.Extensions.Options" Version="2.2.0" />
+      <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.1" />
+      <PackageReference Include="Microsoft.Extensions.Options" Version="3.1.1" />
     </ItemGroup>
 
 </Project>
diff --git a/src/EF.DataProtection.Sample.Tests/Controller/UsersControllerTests.cs b/src/EF.DataProtection.Sample.Tests/Controller/UsersControllerTests.cs
@@ -32,20 +32,19 @@ public async Task Should_CreateUser_WithoutError()
                     new StringContent(JsonConvert.SerializeObject(user), Encoding.UTF8, "application/json"));
 
             response.EnsureSuccessStatusCode();
-            
-            var userId = await response
-                .Content
-                .ReadAsAsync<long>();
+
+            var userId = await response.Content
+                .ReadAsStringAsync();
 
             var usersResponse = await _httpClient
                 .GetAsync($"api/users/{userId}");
             
             usersResponse.EnsureSuccessStatusCode();
 
-            var userFromDatabase = await usersResponse
-                .Content
-                .ReadAsAsync<UserDto>();
-            
+            var stream = await usersResponse.Content.ReadAsStringAsync();
+
+            var userFromDatabase = JsonConvert.DeserializeObject<UserDto>(stream);
+
             Assert.NotNull(userFromDatabase);
             Assert.Equal(user.Email, userFromDatabase.PersonalData.Email);
             Assert.Equal(user.SensitiveData, userFromDatabase.PersonalData.SensitiveData);
diff --git a/src/EF.DataProtection.Sample.Tests/EF.DataProtection.Sample.Tests.csproj b/src/EF.DataProtection.Sample.Tests/EF.DataProtection.Sample.Tests.csproj
@@ -1,15 +1,16 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp2.2</TargetFramework>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
 
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.AspNetCore.App" Version="2.2.0" />
-        <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="2.2.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
+        <PackageReference Include="Microsoft.AspNetCore.App" Version="3.1.1" />
+        <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.1" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
+        <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
         <PackageReference Include="xunit" Version="2.4.0" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
     </ItemGroup>
diff --git a/src/EF.DataProtection.Sample/EF.DataProtection.Sample.csproj b/src/EF.DataProtection.Sample/EF.DataProtection.Sample.csproj
@@ -1,14 +1,14 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp2.2</TargetFramework>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
         <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
     </PropertyGroup>
 
     <ItemGroup>
         <PackageReference Include="Microsoft.AspNetCore.App" />
         <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.1" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/EF.DataProtection.Sample/Startup.cs b/src/EF.DataProtection.Sample/Startup.cs
@@ -7,6 +7,7 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 
 namespace EF.DataProtection.Sample
 {
@@ -44,12 +45,12 @@ public void ConfigureServices(IServiceCollection services)
                 .UseSha512(opt => { opt.Password = "Really_Strong_Password_For_Data"; });
             
             services
-                .AddMvc()
-                .SetCompatibilityVersion(CompatibilityVersion.Version_2_2);
+                .AddControllers()
+                .SetCompatibilityVersion(CompatibilityVersion.Latest);
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IHostingEnvironment env, SampleDbContext dbContext)
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment env, SampleDbContext dbContext)
         {
             dbContext.Database.EnsureCreated();
             
@@ -62,9 +63,9 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, SampleDb
                 // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
                 app.UseHsts();
             }
-
+            app.UseRouting();
             app.UseHttpsRedirection();
-            app.UseMvc();
+            app.UseEndpoints(x => x.MapControllers());
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`using Microsoft.EntityFrameworkCore;`
`8`	`8`	`using Microsoft.Extensions.Configuration;`
`9`	`9`	`using Microsoft.Extensions.DependencyInjection;`
	`10`	`+using Microsoft.Extensions.Hosting;`
`10`	`11`
`11`	`12`	`namespace EF.DataProtection.Sample`
`12`	`13`	`{`
`@@ -44,12 +45,12 @@ public void ConfigureServices(IServiceCollection services)`
`44`	`45`	`.UseSha512(opt => { opt.Password = "Really_Strong_Password_For_Data"; });`
`45`	`46`
`46`	`47`	`services`
`47`		`- .AddMvc()`
`48`		`- .SetCompatibilityVersion(CompatibilityVersion.Version_2_2);`
	`48`	`+ .AddControllers()`
	`49`	`+ .SetCompatibilityVersion(CompatibilityVersion.Latest);`
`49`	`50`	`}`
`50`	`51`
`51`	`52`	`// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.`
`52`		`- public void Configure(IApplicationBuilder app, IHostingEnvironment env, SampleDbContext dbContext)`
	`53`	`+ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, SampleDbContext dbContext)`
`53`	`54`	`{`
`54`	`55`	`dbContext.Database.EnsureCreated();`
`55`	`56`
`@@ -62,9 +63,9 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, SampleDb`
`62`	`63`	`// The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.`
`63`	`64`	`app.UseHsts();`
`64`	`65`	`}`
`65`		`-`
	`66`	`+ app.UseRouting();`
`66`	`67`	`app.UseHttpsRedirection();`
`67`		`- app.UseMvc();`
	`68`	`+ app.UseEndpoints(x => x.MapControllers());`
`68`	`69`	`}`
`69`	`70`	`}`
`70`	`71`	`}`