Merge pull request #11 from reloni/reloni/ch215/update-to-net-core-2-1

reloni · web-flow · commit 4750b7e61528 · 2018-07-02T19:28:04.000+03:00
Update to .net core 2.1
diff --git a/.gitignore b/.gitignore
@@ -43,3 +43,4 @@ Thumbs.db
 /Scripts/restore.log
 /restore.log
 /.vs/SimpleToDoService/xs/UserPrefs.xml
+/.vs
diff --git a/Dockerfile.debug b/Dockerfile.debug
@@ -1,7 +1,8 @@
-FROM microsoft/aspnetcore:2.0.5-stretch
+FROM microsoft/dotnet:2.1.1-aspnetcore-runtime-stretch-slim
 
 # Install the AWS CLI
 RUN apt-get update && \
+    mkdir -p /usr/share/man/man1 /usr/share/man/man7 && \
     apt-get install -y postgresql-client-9.6 && \
     apt-get -y install python curl unzip && cd /tmp && \
     curl "https://s3.amazonaws.com/aws-cli/awscli-bundle.zip" \
diff --git a/Dockerfile.release b/Dockerfile.release
@@ -1,4 +1,4 @@
-FROM microsoft/aspnetcore:2.0.5-stretch
+FROM microsoft/dotnet:2.1.1-aspnetcore-runtime-stretch-slim
 
 # Install the AWS CLI
 RUN apt-get update && \
diff --git a/RequestTests.paw b/RequestTests.paw
diff --git a/Scripts/Publish.sh b/Scripts/Publish.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-export DOTNETSDK="2.0.5-sdk-2.1.4-stretch"
+export DOTNETSDK="2.1.301-sdk-stretch"
 
 docker run -it -d --name builder microsoft/dotnet:"$DOTNETSDK" tail -f /dev/null
 
diff --git a/src/SimpleToDoService/Middleware/CheckUserMiddleware.cs b/src/SimpleToDoService/Middleware/CheckUserMiddleware.cs
@@ -10,31 +10,29 @@ namespace SimpleToDoService.Middleware
 	public class CheckUserMiddleware
 	{
 		private readonly RequestDelegate next;
-		private IToDoRepository repository;
 
 		public CheckUserMiddleware() { }
 
-		public CheckUserMiddleware(RequestDelegate next, IToDoRepository repository)
+		public CheckUserMiddleware(RequestDelegate next)
 		{
 			this.next = next;
-			this.repository = repository;
 		}
 
 		public void Configure(IApplicationBuilder applicationBuilder)
 		{
 			applicationBuilder.UseMiddleware<CheckUserMiddleware>();
 		}
 
-		public async System.Threading.Tasks.Task Invoke(HttpContext context)
+		public async System.Threading.Tasks.Task Invoke(HttpContext context, IToDoRepository repository)
 		{
 			if (context.User.Identity.IsAuthenticated && !context.Items.Keys.Contains("UserUuid"))
 			{
-				context.Items.Add("UserUuid", LoadUserGuid(context));
+				context.Items.Add("UserUuid", LoadUserGuid(context, repository));
 			}
 			await next.Invoke(context);
 		}
 
-		private Guid LoadUserGuid(HttpContext context)
+		private Guid LoadUserGuid(HttpContext context, IToDoRepository repository)
 		{
 			var providerId = context.User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.NameIdentifier).Value;
 			var currentUser = repository.UserByProviderId(providerId);
diff --git a/src/SimpleToDoService/Program.cs b/src/SimpleToDoService/Program.cs
@@ -1,23 +1,23 @@
-﻿using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
+﻿using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
+using NLog.Web;
 
 namespace SimpleToDoService
 {
 	public class Program
 	{
 		public static void Main(string[] args)
 		{
-			var host = new WebHostBuilder()
+			CreateWebHostBuilder(args)
 				.UseKestrel()
-				//.UseContentRoot(Directory.GetCurrentDirectory())
-				.UseStartup<Startup>()
-				.Build();
-
-			host.Run();
+				.Build()
+				.Run();
 		}
+
+		public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
+			WebHost.CreateDefaultBuilder(args)
+				.UseStartup<Startup>()
+				.UseNLog();
 	}
 }
+
diff --git a/src/SimpleToDoService/SimpleToDoService.csproj b/src/SimpleToDoService/SimpleToDoService.csproj
@@ -1,17 +1,17 @@
-﻿<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+﻿<Project Sdk="Microsoft.NET.Sdk.Web" ToolsVersion="15.0">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <PreserveCompilationContext>true</PreserveCompilationContext>
 	  <DebugType>Portable</DebugType>
     <RootNamespace>SimpleToDoService</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
-    <PackageReference Include="NLog.Web.AspNetCore" Version="4.4.1" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="2.0.0-preview2-final" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="2.3.0" />
+    <PackageReference Include="Microsoft.AspNetCore.App" />
+    <PackageReference Include="NLog.Web.AspNetCore" Version="4.5.4" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.1.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/SimpleToDoService/Startup.cs b/src/SimpleToDoService/Startup.cs
@@ -99,7 +99,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
 			loggerFactory.AddNLog();
 
 			//add NLog.Web
-			app.AddNLogWeb();
+			//app.AddNLogWeb();
 
 			//configure nlog.config in your project root.
 			env.ConfigureNLog("nlog.config");
diff --git a/src/SimpleToDoServiceTests/SimpleToDoServiceTests.csproj b/src/SimpleToDoServiceTests/SimpleToDoServiceTests.csproj
@@ -1,13 +1,15 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="xunit" Version="2.2.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
+    <PackageReference Include="xunit" Version="2.3.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="2.1.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="2.1.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/SimpleToDoServiceTests/TasksControllerTests.cs b/src/SimpleToDoServiceTests/TasksControllerTests.cs
@@ -173,7 +173,7 @@ public async System.Threading.Tasks.Task TestBatchUpdate_CreateWithSpecifiedProt
 			Assert.True(context.TaskPrototypes.Count() == 5);
 			Assert.True(context.Tasks.Count() == 5);
 			Assert.Equal("CRON", context.TaskPrototypes.Where(o => o.Uuid == taskToCreate.Prototype.Uuid).First().CronExpression);
-			Assert.Equal(1, context.TaskPrototypes.Where(o => o.Uuid == taskToCreate.Prototype.Uuid).First().Tasks.Count());
+			Assert.Single(context.TaskPrototypes.Where(o => o.Uuid == taskToCreate.Prototype.Uuid).First().Tasks);
 		}
 
 		[Fact]

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM microsoft/aspnetcore:2.0.5-stretch`
	`1`	`+FROM microsoft/dotnet:2.1.1-aspnetcore-runtime-stretch-slim`
`2`	`2`
`3`	`3`	`# Install the AWS CLI`
`4`	`4`	`RUN apt-get update && \`
Original file line number	Diff line number	Diff line change
`@@ -10,31 +10,29 @@ namespace SimpleToDoService.Middleware`
`10`	`10`	`public class CheckUserMiddleware`
`11`	`11`	`{`
`12`	`12`	`private readonly RequestDelegate next;`
`13`		`- private IToDoRepository repository;`
`14`	`13`
`15`	`14`	`public CheckUserMiddleware() { }`
`16`	`15`
`17`		`- public CheckUserMiddleware(RequestDelegate next, IToDoRepository repository)`
	`16`	`+ public CheckUserMiddleware(RequestDelegate next)`
`18`	`17`	`{`
`19`	`18`	`this.next = next;`
`20`		`- this.repository = repository;`
`21`	`19`	`}`
`22`	`20`
`23`	`21`	`public void Configure(IApplicationBuilder applicationBuilder)`
`24`	`22`	`{`
`25`	`23`	`applicationBuilder.UseMiddleware<CheckUserMiddleware>();`
`26`	`24`	`}`
`27`	`25`
`28`		`- public async System.Threading.Tasks.Task Invoke(HttpContext context)`
	`26`	`+ public async System.Threading.Tasks.Task Invoke(HttpContext context, IToDoRepository repository)`
`29`	`27`	`{`
`30`	`28`	`if (context.User.Identity.IsAuthenticated && !context.Items.Keys.Contains("UserUuid"))`
`31`	`29`	`{`
`32`		`- context.Items.Add("UserUuid", LoadUserGuid(context));`
	`30`	`+ context.Items.Add("UserUuid", LoadUserGuid(context, repository));`
`33`	`31`	`}`
`34`	`32`	`await next.Invoke(context);`
`35`	`33`	`}`
`36`	`34`
`37`		`- private Guid LoadUserGuid(HttpContext context)`
	`35`	`+ private Guid LoadUserGuid(HttpContext context, IToDoRepository repository)`
`38`	`36`	`{`
`39`	`37`	`var providerId = context.User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.NameIdentifier).Value;`
`40`	`38`	`var currentUser = repository.UserByProviderId(providerId);`
Original file line number	Diff line number	Diff line change
`@@ -1,23 +1,23 @@`
`1`		`-using System;`
`2`		`-using System.Collections.Generic;`
`3`		`-using System.IO;`
`4`		`-using System.Linq;`
`5`		`-using System.Threading.Tasks;`
	`1`	`+using Microsoft.AspNetCore;`
`6`	`2`	`using Microsoft.AspNetCore.Hosting;`
	`3`	`+using NLog.Web;`
`7`	`4`
`8`	`5`	`namespace SimpleToDoService`
`9`	`6`	`{`
`10`	`7`	`public class Program`
`11`	`8`	`{`
`12`	`9`	`public static void Main(string[] args)`
`13`	`10`	`{`
`14`		`- var host = new WebHostBuilder()`
	`11`	`+ CreateWebHostBuilder(args)`
`15`	`12`	`.UseKestrel()`
`16`		`- //.UseContentRoot(Directory.GetCurrentDirectory())`
`17`		`- .UseStartup<Startup>()`
`18`		`- .Build();`
`19`		`-`
`20`		`- host.Run();`
	`13`	`+ .Build()`
	`14`	`+ .Run();`
`21`	`15`	`}`
	`16`	`+`
	`17`	`+ public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>`
	`18`	`+ WebHost.CreateDefaultBuilder(args)`
	`19`	`+ .UseStartup<Startup>()`
	`20`	`+ .UseNLog();`
`22`	`21`	`}`
`23`	`22`	`}`
	`23`	`+`