Merge pull request #220 from TrackableEntities/update-ef7

Upgrade to EF Core 7

Author: tonysneed

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017 Trackable Entities
+Copyright (c) 2022 Trackable Entities
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -14,9 +14,9 @@ Before creating a pull request, please refer to the [Contributing Guidelines](ht
 
 ## Prerequisites
 
-- [Visual Studio 2022](https://www.visualstudio.com/downloads/) or greater, [JetBrains Rider](https://www.jetbrains.com/rider) 2021.3 or greater.
-- [.NET Core 6.0 SDK](https://dotnet.microsoft.com/download/dotnet/6.0) or greater.
-- [EF Core CLI 6.0](https://docs.microsoft.com/en-us/ef/core/cli/dotnet) or greater.
+- [Visual Studio 2022](https://www.visualstudio.com/downloads/) or greater, [JetBrains Rider](https://www.jetbrains.com/rider) 2022.2 or greater.
+- [.NET 7.0 SDK](https://dotnet.microsoft.com/download/dotnet/7.0) or greater.
+- [EF Core CLI 7.0](https://docs.microsoft.com/en-us/ef/core/cli/dotnet) or greater.
   - Install global `dotnet-ef` tool.
     ```
     dotnet tool install --global dotnet-ef
@@ -35,24 +35,24 @@ Before creating a pull request, please refer to the [Contributing Guidelines](ht
     - Download the `NorthwindSlim.sql` file from <https://github.com/TrackableEntities/northwind-slim>.
     - Unzip **NorthwindSlim.sql** and run the script to create tables and populate them with data.
 
-## Upgrading from v5 to v6
+## Upgrading
 
-1. Upgrade `TargetFramework` in **.csproj** file to `net6.0`.
+1. Upgrade `TargetFramework` in **.csproj** file to `net6.0` or `net7.0`.
    - Optional: Set `ImplicitUsings` to `enable`.
    - Optional: Set `Nullable` ro `enable`.
-2. Update the following NuGet packages to `6.0.0` or later:
+2. Update the following NuGet packages to `7.0.0` or later:
    - Microsoft.EntityFrameworkCore.Design
    - Microsoft.EntityFrameworkCore.SqlServer
    - EntityFrameworkCore.Scaffolding.Handlebars
 3. Remove the `EnableNullableReferenceTypes` option from `services.AddHandlebarsScaffolding` in `ScaffoldingDesignTimeServices.ConfigureDesignTimeServices`.
-   - Version 6 relies on [support for nullable reference types in EF Core 6](https://docs.microsoft.com/en-us/ef/core/miscellaneous/nullable-reference-types).
+   - Version 6 or greater relies on [support for nullable reference types in EF Core 6](https://docs.microsoft.com/en-us/ef/core/miscellaneous/nullable-reference-types).
 4. Run `dotnet ef dbcontext scaffold` command to regenerate entities.
    - You may retain your customized Handlebars templates.
    - [Many-to-many relationships](https://docs.microsoft.com/en-us/ef/core/modeling/relationships?tabs=fluent-api%2Cfluent-api-simple-key%2Csimple-key#many-to-many) will be materialized without the need for an intermediate entity.
 
 ## Usage
 
-1. Create a new **.NET 6** class library.
+1. Create a new **.NET 6** or **.NET 7** class library.
 
 2. Add EF Core SQL Server and Tools NuGet packages.
     - `Microsoft.EntityFrameworkCore.SqlServer`
@@ -105,7 +105,7 @@ Before creating a pull request, please refer to the [Contributing Guidelines](ht
 
 ## Nullable Reference Types
 
-Take advantage of C# nullable reference types by enabling them in your .csproj file. (This is by default in .NET 6.)
+Take advantage of C# nullable reference types by enabling them in your .csproj file. (This is by default in .NET 6 or greater.)
 
 ```xml
 <PropertyGroup>

sample/ScaffoldingSample.Api/ScaffoldingSample.Api.csproj

@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>

sample/ScaffoldingSample.Embedded/Contexts/NorthwindSlimContext.cs

@@ -36,7 +36,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             {
                 entity.ToTable("Category");
 
-                entity.HasComment("hello table Customer");
+                entity.HasAnnotation("Relational: Comment", "A category of products");
 
                 entity.Property(e => e.CategoryName)
                     .IsRequired()

sample/ScaffoldingSample.Embedded/ScaffoldingSample.Embedded.csproj

@@ -6,10 +6,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.1">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.0">
+	    <PrivateAssets>all</PrivateAssets>
+	    <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </ItemGroup>
 

sample/ScaffoldingSample.TypeScript/ScaffoldingSample.TypeScript.csproj

@@ -6,10 +6,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.1">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.0">
+	    <PrivateAssets>all</PrivateAssets>
+	    <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </ItemGroup>
 

sample/ScaffoldingSample/CodeTemplates/CSharpDbContext/DbContext.hbs

@@ -5,12 +5,6 @@ namespace {{namespace}}
     public partial class {{class}} : DbContext
     {
 {{{> dbsets}}}
-{{#if entity-type-errors}}
-{{#each entity-type-errors}}
-        {{{entity-type-error}}}
-{{/each}}
-
-{{/if}}
 
 {{{> dbconstructor}}}
 

sample/ScaffoldingSample/CodeTemplates/CSharpDbContext/Partials/DbConstructor.hbs

@@ -1,3 +1,7 @@
-        public {{class}}(DbContextOptions<{{class}}> options) : base(options)
+        public {{class}}()
+        {
+        }
+
+        public {{class}}(DbContextOptions<{{class}}> options) : base(options)
         {
         }

sample/ScaffoldingSample/Contexts/NorthwindSlimContext.cs

@@ -25,6 +25,10 @@ public partial class NorthwindSlimContext : DbContext
         // My Handlebars Helper
         public virtual DbSet<dbo.Territory> Territories { get; set; } = null!;
 
+        public NorthwindSlimContext()
+        {
+        }
+
         public NorthwindSlimContext(DbContextOptions<NorthwindSlimContext> options) : base(options)
         {
         }

sample/ScaffoldingSample/Sample.ReadMe.md

@@ -4,8 +4,8 @@ Demonstrates how to reverse engineer an existing database using the EF Core tool
 
 ## Prerequisites
 
-- [Visual Studio 2019](https://www.visualstudio.com/downloads/) 16.4 or greater.
-- The .[NET Core 3.1 SDK](https://www.microsoft.com/net/download/core).
+- [Visual Studio 2022](https://www.visualstudio.com/downloads/) 17.4 or greater.
+- The .[NET SDK](https://www.microsoft.com/net/download/core).
 
 ## Database Setup