Update to .NET 5, EF Core 5

tonysneed · tonysneed · commit 838456ed1966 · 2020-11-24T16:55:58.000-06:00
diff --git a/ReadMe.md b/ReadMe.md
@@ -4,11 +4,11 @@ Sample using Unit of Work and Repository Framework (URF) with ASP.NET Core 3.x
 
 ## Prerequisites
 
-- .NET Core SDK [latest 3.x version](https://dotnet.microsoft.com/download/dotnet-core)
+- .NET Core SDK (https://dotnet.microsoft.com/download/dotnet-core)
 - EF Core CLI (specify current version)
     ```
     dotnet tool uninstall --global dotnet-ef
-    dotnet tool install --global dotnet-ef --version 3.1.2
+    dotnet tool install --global dotnet-ef
     ```
 
 ## EF Core Code First
diff --git a/URF.Core.Sample.v3.Abstractions/URF.Core.Sample.v3.Abstractions.csproj b/URF.Core.Sample.v3.Abstractions/URF.Core.Sample.v3.Abstractions.csproj
@@ -1,11 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="URF.Core.Abstractions" Version="3.1.0" />
+    <PackageReference Include="URF.Core.Abstractions" Version="3.1.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/URF.Core.Sample.v3.Api/URF.Core.Sample.v3.Api.csproj b/URF.Core.Sample.v3.Api/URF.Core.Sample.v3.Api.csproj
@@ -1,13 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
+    <LangVersion>Latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.2" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.1" />
-    <PackageReference Include="URF.Core.EF" Version="3.1.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="5.0.0" />
+    <PackageReference Include="URF.Core.EF" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/URF.Core.Sample.v3.EF/Migrations/20201124221503_initial.Designer.cs b/URF.Core.Sample.v3.EF/Migrations/20201124221503_initial.Designer.cs
diff --git a/URF.Core.Sample.v3.EF/Migrations/20201124221503_initial.cs b/URF.Core.Sample.v3.EF/Migrations/20201124221503_initial.cs
@@ -10,10 +10,10 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 name: "Products",
                 columns: table => new
                 {
-                    Id = table.Column<int>(nullable: false)
+                    Id = table.Column<int>(type: "int", nullable: false)
                         .Annotation("SqlServer:Identity", "1, 1"),
-                    ProductName = table.Column<string>(nullable: true),
-                    UnitPrice = table.Column<decimal>(nullable: false)
+                    ProductName = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    UnitPrice = table.Column<decimal>(type: "decimal(18,2)", nullable: false)
                 },
                 constraints: table =>
                 {
diff --git a/URF.Core.Sample.v3.EF/Migrations/UrfSampleContextModelSnapshot.cs b/URF.Core.Sample.v3.EF/Migrations/UrfSampleContextModelSnapshot.cs
@@ -14,16 +14,16 @@ protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "3.1.2")
+                .UseIdentityColumns()
                 .HasAnnotation("Relational:MaxIdentifierLength", 128)
-                .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+                .HasAnnotation("ProductVersion", "5.0.0");
 
             modelBuilder.Entity("URF.Core.Sample.v3.Models.Product", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("int")
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+                        .UseIdentityColumn();
 
                     b.Property<string>("ProductName")
                         .HasColumnType("nvarchar(max)");
diff --git a/URF.Core.Sample.v3.EF/URF.Core.Sample.v3.EF.csproj b/URF.Core.Sample.v3.EF/URF.Core.Sample.v3.EF.csproj
@@ -1,16 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.2">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.2" />
-    <PackageReference Include="URF.Core.EF" Version="3.1.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.0" />
+    <PackageReference Include="URF.Core.EF" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/URF.Core.Sample.v3.Models/URF.Core.Sample.v3.Models.csproj b/URF.Core.Sample.v3.Models/URF.Core.Sample.v3.Models.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "3.1.102"
+    "version": "5.0.100"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -10,10 +10,10 @@ protected override void Up(MigrationBuilder migrationBuilder)`
`10`	`10`	`name: "Products",`
`11`	`11`	`columns: table => new`
`12`	`12`	`{`
`13`		`- Id = table.Column<int>(nullable: false)`
	`13`	`+ Id = table.Column<int>(type: "int", nullable: false)`
`14`	`14`	`.Annotation("SqlServer:Identity", "1, 1"),`
`15`		`- ProductName = table.Column<string>(nullable: true),`
`16`		`- UnitPrice = table.Column<decimal>(nullable: false)`
	`15`	`+ ProductName = table.Column<string>(type: "nvarchar(max)", nullable: true),`
	`16`	`+ UnitPrice = table.Column<decimal>(type: "decimal(18,2)", nullable: false)`
`17`	`17`	`},`
`18`	`18`	`constraints: table =>`
`19`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "3.1.102"`
	`3`	`+ "version": "5.0.100"`
`4`	`4`	`}`
`5`	`5`	`}`