update all dependencies to .net 5

Tomasz Dłuski · Tomasz Dłuski · commit 83d851182b94 · 2021-12-07T11:00:20.000+01:00
diff --git a/EntityFrameworkCore.Diagrams/EntityFrameworkCore.Diagrams.Demo/EntityFrameworkCore.Diagrams.Demo.csproj b/EntityFrameworkCore.Diagrams/EntityFrameworkCore.Diagrams.Demo/EntityFrameworkCore.Diagrams.Demo.csproj
@@ -1,22 +1,24 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>
     <PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8+wp8+wpa81;</PackageTargetFallback>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore" Version="1.1.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.3" />
-    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.2" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="1.1.2" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="1.1.2" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.2" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="1.1.2" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="1.1.0" />
+    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
+    <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.12" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.12">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="5.0.10" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.Design" Version="1.1.0" />
   </ItemGroup>
   <ItemGroup>
diff --git a/EntityFrameworkCore.Diagrams/EntityFrameworkCore.Diagrams.Demo/Migrations/20170713212439_Initial.Designer.cs b/EntityFrameworkCore.Diagrams/EntityFrameworkCore.Diagrams.Demo/Migrations/20170713212439_Initial.Designer.cs
diff --git a/EntityFrameworkCore.Diagrams/EntityFrameworkCore.Diagrams.Demo/Migrations/20170713212439_Initial.cs b/EntityFrameworkCore.Diagrams/EntityFrameworkCore.Diagrams.Demo/Migrations/20170713212439_Initial.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Metadata;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 
 namespace EntityFrameworkCore.Diagrams.Demo.Migrations
 {
diff --git a/EntityFrameworkCore.Diagrams/EntityFrameworkCore.Diagrams.Demo/Migrations/ApplicationDbContextModelSnapshot.cs b/EntityFrameworkCore.Diagrams/EntityFrameworkCore.Diagrams.Demo/Migrations/ApplicationDbContextModelSnapshot.cs
@@ -4,6 +4,7 @@
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
 using EntityFrameworkCore.Diagrams.Demo.Models;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 
 namespace EntityFrameworkCore.Diagrams.Demo.Migrations
 {
diff --git a/EntityFrameworkCore.Diagrams/EntityFrameworkCore.Diagrams.Demo/Startup.cs b/EntityFrameworkCore.Diagrams/EntityFrameworkCore.Diagrams.Demo/Startup.cs
@@ -1,18 +1,9 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Builder;
+﻿using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using EntityFrameworkCore.Diagrams;
 using EntityFrameworkCore.Diagrams.Demo.Models;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Storage;
-using Npgsql.EntityFrameworkCore.PostgreSQL;
-using Npgsql.EntityFrameworkCore;
-using Npgsql;
 using Microsoft.EntityFrameworkCore;
 
 namespace EntityFrameworkCore.Diagrams.Demo
@@ -44,13 +35,10 @@ public void ConfigureServices(IServiceCollection services)
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
         public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
         {
-            loggerFactory.AddConsole(Configuration.GetSection("Logging"));
-            loggerFactory.AddDebug();
 
             if (env.IsDevelopment())
             {
                 app.UseDeveloperExceptionPage();
-                app.UseBrowserLink();
                 app.AddEfDiagrams<ApplicationDbContext>();
             }
             else
diff --git a/EntityFrameworkCore.Diagrams/EntityFrameworkCore.Diagrams/EfDiagramsOptions.cs b/EntityFrameworkCore.Diagrams/EntityFrameworkCore.Diagrams/EfDiagramsOptions.cs
@@ -36,6 +36,10 @@ internal static string GetEfDiagramsContentRoot()
                 //  NOTE: this means that we are not installed as NuGet packange
                 contentRoot = Path.Combine(dllPath, "..", "..", "..", "..", "EntityFrameworkCore.Diagrams");
             }
+            if (!Directory.Exists(contentRoot))
+            {
+                Directory.CreateDirectory(contentRoot);
+            }
             contentRoot = Path.Combine(contentRoot, "wwwroot", "db-diagrams");
             return contentRoot;
         }
diff --git a/EntityFrameworkCore.Diagrams/EntityFrameworkCore.Diagrams/EntityFrameworkCore.Diagrams.csproj b/EntityFrameworkCore.Diagrams/EntityFrameworkCore.Diagrams/EntityFrameworkCore.Diagrams.csproj
@@ -30,7 +30,7 @@ https://github.com/EvAlex/ef-db-diagrams
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <AssemblyVersion>0.4.2.0</AssemblyVersion>
     <FileVersion>0.4.2.0</FileVersion>

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using Microsoft.EntityFrameworkCore.Migrations;`
`4`	`4`	`using Microsoft.EntityFrameworkCore.Metadata;`
	`5`	`+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;`
`5`	`6`
`6`	`7`	`namespace EntityFrameworkCore.Diagrams.Demo.Migrations`
`7`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`using Microsoft.EntityFrameworkCore.Metadata;`
`5`	`5`	`using Microsoft.EntityFrameworkCore.Migrations;`
`6`	`6`	`using EntityFrameworkCore.Diagrams.Demo.Models;`
	`7`	`+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;`
`7`	`8`
`8`	`9`	`namespace EntityFrameworkCore.Diagrams.Demo.Migrations`
`9`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,10 @@ internal static string GetEfDiagramsContentRoot()`
`36`	`36`	`// NOTE: this means that we are not installed as NuGet packange`
`37`	`37`	`contentRoot = Path.Combine(dllPath, "..", "..", "..", "..", "EntityFrameworkCore.Diagrams");`
`38`	`38`	`}`
	`39`	`+ if (!Directory.Exists(contentRoot))`
	`40`	`+ {`
	`41`	`+ Directory.CreateDirectory(contentRoot);`
	`42`	`+ }`
`39`	`43`	`contentRoot = Path.Combine(contentRoot, "wwwroot", "db-diagrams");`
`40`	`44`	`return contentRoot;`
`41`	`45`	`}`