Remove skip-nav-properties from Properties.hbs.

Fix GenerateImports in TypeScript entity generator.
Update version to 6.0.0-preview2.
Mark EnableNullableReferenceTypes as obsolete.
Update ReadMe with v6 upgrade instructions.

Author: tonysneed

README.md

@@ -14,14 +14,14 @@ Before creating a pull request, please refer to the [Contributing Guidelines](ht
 
 ## Prerequisites
 
-- [Visual Studio 2022](https://www.visualstudio.com/downloads/) or greater.
-- [.NET Core 6.0 SDK](https://dotnet.microsoft.com/download/dotnet/6.0) RC2 or greater.
+- [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.
   - Install global `dotnet-ef` tool.
     ```
     dotnet tool install --global dotnet-ef
     ```
-  - Update global `dotnet-ef` tool.
+  - Or update global `dotnet-ef` tool.
     ```
     dotnet tool update --global dotnet-ef
     ```
@@ -35,6 +35,21 @@ 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
+
+1. Upgrade `TargetFramework` in **.csproj** file to `net6.0`.
+   - Optional: Set `ImplicitUsings` to `enable`.
+   - Optional: Set `Nullable` ro `enable`.
+2. Update the following NuGet packages to `6.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).
+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.
@@ -94,8 +109,7 @@ Take advantage of C# nullable reference types by enabling them in your .csproj f
 
 ```xml
 <PropertyGroup>
-  <TargetFramework>netcoreapp3.1</TargetFramework>
-  <LangVersion>8.0</LangVersion>
+  <TargetFramework>net6.0</TargetFramework>
   <Nullable>enable</Nullable>
 </PropertyGroup>
 ```

sample/ScaffoldingSample.TypeScript/CodeTemplates/TypeScriptDbContext/Partials/DbConstructor.hbs

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

sample/ScaffoldingSample.TypeScript/CodeTemplates/TypeScriptDbContext/Partials/DbImports.hbs

@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+{{#if model-namespace}}
+using {{model-namespace}};
+{{/if}}
+{{#each model-imports}}
+using {{model-import}};
+{{/each}}

sample/ScaffoldingSample.TypeScript/CodeTemplates/TypeScriptDbContext/Partials/DbOnConfiguring.hbs

@@ -0,0 +1,10 @@
+        protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
+        {
+            if (!optionsBuilder.IsConfigured)
+            {
+{{#if connectionstring-warning}}
+{{connectionstring-warning}}
+{{/if}}
+                optionsBuilder{{options-builder-provider}};
+            }
+        }

sample/ScaffoldingSample.TypeScript/CodeTemplates/TypeScriptDbContext/Partials/DbSets.hbs

@@ -0,0 +1,3 @@
+{{#each dbsets}}
+        public virtual DbSet<{{set-property-type}}> {{set-property-name}} { get; set; }{{#if nullable-reference-types }} = default!;{{/if}}
+{{/each}}

sample/ScaffoldingSample.TypeScript/CodeTemplates/TypeScriptEntityType/Partials/Properties.hbs

@@ -14,13 +14,4 @@
     {{nav-property-name}}: {{nav-property-type}};
 {{/if}}
 {{/each}}
-{{/if}}
-{{#if skip-nav-properties}}
-{{#each skip-nav-properties}}
-{{#if nav-property-collection}}
-    {{nav-property-name}}: {{nav-property-type}}[];
-{{else}}
-    {{nav-property-name}}: {{nav-property-type}};
-{{/if}}
-{{/each}}
 {{/if}}

sample/ScaffoldingSample.TypeScript/Models/Category.ts

@@ -1,13 +1,7 @@
 import { Product } from './Product';
 
-/**
-* hello table Customer
-*/
 export interface Category {
     categoryId: number;
-    /**
-    * hello CompanyName
-    */
     categoryName: string;
     products: Product[];
 }

sample/ScaffoldingSample.TypeScript/Models/Employee.ts

@@ -1,4 +1,4 @@
-import { EmployeeTerritory } from './EmployeeTerritory';
+import { Territory } from './Territory';
 
 export interface Employee {
     employeeId: number;
@@ -8,5 +8,5 @@ export interface Employee {
     hireDate: Date;
     city: string;
     country: string;
-    employeeTerritories: EmployeeTerritory[];
+    territories: Territory[];
 }

sample/ScaffoldingSample.TypeScript/Models/EmployeeTerritory.ts

@@ -1,9 +1,5 @@
-import { Employee } from './Employee';
-import { Territory } from './Territory';
-
+
 export interface EmployeeTerritory {
     employeeId: number;
     territoryId: string;
-    employee: Employee;
-    territory: Territory;
 }

sample/ScaffoldingSample.TypeScript/Models/Territory.ts

@@ -1,7 +1,7 @@
-import { EmployeeTerritory } from './EmployeeTerritory';
+import { Employee } from './Employee';
 
 export interface Territory {
     territoryId: string;
     territoryDescription: string;
-    employeeTerritories: EmployeeTerritory[];
+    employees: Employee[];
 }