Merge branch 'ef-core-5' into master

Author: tonysneed

README.md

@@ -10,16 +10,16 @@ Before creating a pull request, please refer to the [Contributing Guidelines](ht
 
 ## Prerequisites
 
-- [Visual Studio 2019](https://www.visualstudio.com/downloads/) 16.4 or greater.
-- .[NET Core 3.1 SDK](https://www.microsoft.com/net/download/core).
-- [EF Core CLI](https://docs.microsoft.com/en-us/ef/core/miscellaneous/cli/dotnet).
+- [Visual Studio 2019](https://www.visualstudio.com/downloads/) 16.8 Preview 4.0 or greater.
+- .[NET Core 5.0 SDK](https://dotnet.microsoft.com/download/dotnet/5.0) RC2 or greater.
+- [EF Core CLI 5.0](https://devblogs.microsoft.com/dotnet/announcing-entity-framework-core-ef-core-5-rc2/) RC2 or greater.
   - Install global `dotnet-ef` tool.
     ```
-    dotnet tool install --global dotnet-ef
+    dotnet tool install --global dotnet-ef --version 5.0.0-rc.2.20475.6
     ```
   - Update global `dotnet-ef` tool.
     ```
-    dotnet tool update --global dotnet-ef
+    dotnet tool update --global dotnet-ef --version 5.0.0-rc.2.20475.6
     ```
 
 ## Database Setup
@@ -42,9 +42,18 @@ Before creating a pull request, please refer to the [Contributing Guidelines](ht
     - `Microsoft.EntityFrameworkCore.SqlServer`
     - `Microsoft.EntityFrameworkCore.Design`
 
+    ```
+    dotnet add package Microsoft.EntityFrameworkCore.SqlServer --version 5.0.0-rc.2.20475.6
+    dotnet add package Microsoft.EntityFrameworkCore.Design --version 5.0.0-rc.2.20475.6
+    ```
+
 3. Add the **EntityFrameworkCore.Scaffolding.Handlebars** NuGet package:
     - `EntityFrameworkCore.Scaffolding.Handlebars`
 
+    ```
+    dotnet add package EntityFrameworkCore.Scaffolding.Handlebars --version 5.0.0-rc.2
+    ```
+
 4. Remove Class1.cs and add a **ScaffoldingDesignTimeServices** class.
     - Implement `IDesignTimeServices` by adding a `ConfigureDesignTimeServices` method
       that calls `services.AddHandlebarsScaffolding`.

sample/ScaffoldingSample.Api/Controllers/EmployeeController.cs

@@ -21,7 +21,7 @@ public EmployeeController(NorthwindSlimContext context)
         [HttpGet]
         public async Task<ActionResult> Get()
         {
-            var employees = await _context.Employee
+            var employees = await _context.Employees
                 .OrderBy(e => e.LastName).ThenBy(e => e.FirstName)
                 .Select(e => new
                 {

sample/ScaffoldingSample.Api/ScaffoldingSample.Api.csproj

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

sample/ScaffoldingSample.Embedded/Contexts/NorthwindSlimContext.cs

@@ -7,15 +7,15 @@ namespace ScaffoldingSample.Embedded.Contexts
 {
     public partial class NorthwindSlimContext : DbContext
     {
-        public virtual DbSet<Category> Category { get; set; }
-        public virtual DbSet<Customer> Customer { get; set; }
-        public virtual DbSet<CustomerSetting> CustomerSetting { get; set; }
-        public virtual DbSet<Employee> Employee { get; set; }
-        public virtual DbSet<EmployeeTerritories> EmployeeTerritories { get; set; }
-        public virtual DbSet<Order> Order { get; set; }
-        public virtual DbSet<OrderDetail> OrderDetail { get; set; }
-        public virtual DbSet<Product> Product { get; set; }
-        public virtual DbSet<Territory> Territory { get; set; }
+        public virtual DbSet<Category> Categories { get; set; }
+        public virtual DbSet<Customer> Customers { get; set; }
+        public virtual DbSet<CustomerSetting> CustomerSettings { get; set; }
+        public virtual DbSet<Employee> Employees { get; set; }
+        public virtual DbSet<EmployeeTerritory> EmployeeTerritories { get; set; }
+        public virtual DbSet<Order> Orders { get; set; }
+        public virtual DbSet<OrderDetail> OrderDetails { get; set; }
+        public virtual DbSet<Product> Products { get; set; }
+        public virtual DbSet<Territory> Territories { get; set; }
 
         public NorthwindSlimContext(DbContextOptions<NorthwindSlimContext> options) : base(options)
         {
@@ -25,7 +25,7 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
             if (!optionsBuilder.IsConfigured)
             {
-//#warning To protect potentially sensitive information in your connection string, you should move it out of source code. See http://go.microsoft.com/fwlink/?LinkId=723263 for guidance on storing connection strings.
+#warning To protect potentially sensitive information in your connection string, you should move it out of source code. You can avoid scaffolding the connection string by using the Name= syntax to read it from configuration - see https://go.microsoft.com/fwlink/?linkid=2131148. For more guidance on storing connection strings, see http://go.microsoft.com/fwlink/?LinkId=723263.
                 optionsBuilder.UseSqlServer("Data Source=(localdb)\\MSSQLLocalDB; Initial Catalog=NorthwindSlim; Integrated Security=True");
             }
         }
@@ -34,16 +34,23 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
             modelBuilder.Entity<Category>(entity =>
             {
+                entity.ToTable("Category");
+
+                entity.HasComment("hello table Customer");
+
                 entity.Property(e => e.CategoryName)
                     .IsRequired()
-                    .HasMaxLength(15);
+                    .HasMaxLength(15)
+                    .HasComment("hello CompanyName");
             });
 
             modelBuilder.Entity<Customer>(entity =>
             {
+                entity.ToTable("Customer");
+
                 entity.Property(e => e.CustomerId)
                     .HasMaxLength(5)
-                    .IsFixedLength();
+                    .IsFixedLength(true);
 
                 entity.Property(e => e.City).HasMaxLength(15);
 
@@ -61,9 +68,11 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 entity.HasKey(e => e.CustomerId)
                     .HasName("PK_dbo.CustomerSetting");
 
+                entity.ToTable("CustomerSetting");
+
                 entity.Property(e => e.CustomerId)
                     .HasMaxLength(5)
-                    .IsFixedLength();
+                    .IsFixedLength(true);
 
                 entity.Property(e => e.Setting)
                     .IsRequired()
@@ -78,6 +87,8 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
 
             modelBuilder.Entity<Employee>(entity =>
             {
+                entity.ToTable("Employee");
+
                 entity.Property(e => e.BirthDate).HasColumnType("datetime");
 
                 entity.Property(e => e.City).HasMaxLength(15);
@@ -95,7 +106,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                     .HasMaxLength(20);
             });
 
-            modelBuilder.Entity<EmployeeTerritories>(entity =>
+            modelBuilder.Entity<EmployeeTerritory>(entity =>
             {
                 entity.HasKey(e => new { e.EmployeeId, e.TerritoryId })
                     .HasName("PK_dbo.EmployeeTerritories");
@@ -115,9 +126,11 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
 
             modelBuilder.Entity<Order>(entity =>
             {
+                entity.ToTable("Order");
+
                 entity.Property(e => e.CustomerId)
                     .HasMaxLength(5)
-                    .IsFixedLength();
+                    .IsFixedLength(true);
 
                 entity.Property(e => e.Freight)
                     .HasColumnType("money")
@@ -128,50 +141,58 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 entity.Property(e => e.ShippedDate).HasColumnType("datetime");
 
                 entity.HasOne(d => d.Customer)
-                    .WithMany(p => p.Order)
+                    .WithMany(p => p.Orders)
                     .HasForeignKey(d => d.CustomerId)
                     .HasConstraintName("FK_Orders_Customers");
             });
 
             modelBuilder.Entity<OrderDetail>(entity =>
             {
+                entity.ToTable("OrderDetail");
+
                 entity.Property(e => e.Quantity).HasDefaultValueSql("((1))");
 
                 entity.Property(e => e.UnitPrice).HasColumnType("money");
 
                 entity.HasOne(d => d.Order)
-                    .WithMany(p => p.OrderDetail)
+                    .WithMany(p => p.OrderDetails)
                     .HasForeignKey(d => d.OrderId)
                     .OnDelete(DeleteBehavior.ClientSetNull)
                     .HasConstraintName("FK_Order_Details_Orders");
 
                 entity.HasOne(d => d.Product)
-                    .WithMany(p => p.OrderDetail)
+                    .WithMany(p => p.OrderDetails)
                     .HasForeignKey(d => d.ProductId)
                     .OnDelete(DeleteBehavior.ClientSetNull)
                     .HasConstraintName("FK_Order_Details_Products");
             });
 
             modelBuilder.Entity<Product>(entity =>
             {
+                entity.ToTable("Product");
+
                 entity.Property(e => e.ProductName)
                     .IsRequired()
                     .HasMaxLength(40);
 
-                entity.Property(e => e.RowVersion).IsRowVersion();
+                entity.Property(e => e.RowVersion)
+                    .IsRowVersion()
+                    .IsConcurrencyToken();
 
                 entity.Property(e => e.UnitPrice)
                     .HasColumnType("money")
                     .HasDefaultValueSql("((0))");
 
                 entity.HasOne(d => d.Category)
-                    .WithMany(p => p.Product)
+                    .WithMany(p => p.Products)
                     .HasForeignKey(d => d.CategoryId)
                     .HasConstraintName("FK_Products_Categories");
             });
 
             modelBuilder.Entity<Territory>(entity =>
             {
+                entity.ToTable("Territory");
+
                 entity.Property(e => e.TerritoryId).HasMaxLength(20);
 
                 entity.Property(e => e.TerritoryDescription)

sample/ScaffoldingSample.Embedded/Models/Category.cs

@@ -3,16 +3,22 @@
 
 namespace ScaffoldingSample.Embedded.Models
 {
+    /// <summary>
+    /// hello table Customer
+    /// </summary>
     public partial class Category
     {
         public Category()
         {
-            Product = new HashSet<Product>();
+            Products = new HashSet<Product>();
         }
 
         public int CategoryId { get; set; }
+        /// <summary>
+        /// hello CompanyName
+        /// </summary>
         public string CategoryName { get; set; }
 
-        public virtual ICollection<Product> Product { get; set; }
+        public virtual ICollection<Product> Products { get; set; }
     }
 }

sample/ScaffoldingSample.Embedded/Models/Customer.cs

@@ -7,7 +7,7 @@ public partial class Customer
     {
         public Customer()
         {
-            Order = new HashSet<Order>();
+            Orders = new HashSet<Order>();
         }
 
         public string CustomerId { get; set; }
@@ -17,6 +17,6 @@ public Customer()
         public string Country { get; set; }
 
         public virtual CustomerSetting CustomerSetting { get; set; }
-        public virtual ICollection<Order> Order { get; set; }
+        public virtual ICollection<Order> Orders { get; set; }
     }
 }

sample/ScaffoldingSample.Embedded/Models/Employee.cs

@@ -7,7 +7,7 @@ public partial class Employee
     {
         public Employee()
         {
-            EmployeeTerritories = new HashSet<EmployeeTerritories>();
+            EmployeeTerritories = new HashSet<EmployeeTerritory>();
         }
 
         public int EmployeeId { get; set; }
@@ -18,6 +18,6 @@ public Employee()
         public string City { get; set; }
         public string Country { get; set; }
 
-        public virtual ICollection<EmployeeTerritories> EmployeeTerritories { get; set; }
+        public virtual ICollection<EmployeeTerritory> EmployeeTerritories { get; set; }
     }
 }

sample/ScaffoldingSample.Embedded/Models/EmployeeTerritory.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+
+namespace ScaffoldingSample.Embedded.Models
+{
+    public partial class EmployeeTerritory
+    {
+        public int EmployeeId { get; set; }
+        public string TerritoryId { get; set; }
+
+        public virtual Employee Employee { get; set; }
+        public virtual Territory Territory { get; set; }
+    }
+}

sample/ScaffoldingSample.Embedded/Models/Order.cs

@@ -7,7 +7,7 @@ public partial class Order
     {
         public Order()
         {
-            OrderDetail = new HashSet<OrderDetail>();
+            OrderDetails = new HashSet<OrderDetail>();
         }
 
         public int OrderId { get; set; }
@@ -18,6 +18,6 @@ public Order()
         public decimal? Freight { get; set; }
 
         public virtual Customer Customer { get; set; }
-        public virtual ICollection<OrderDetail> OrderDetail { get; set; }
+        public virtual ICollection<OrderDetail> OrderDetails { get; set; }
     }
 }

sample/ScaffoldingSample.Embedded/Models/Product.cs

@@ -7,7 +7,7 @@ public partial class Product
     {
         public Product()
         {
-            OrderDetail = new HashSet<OrderDetail>();
+            OrderDetails = new HashSet<OrderDetail>();
         }
 
         public int ProductId { get; set; }
@@ -18,6 +18,6 @@ public Product()
         public byte[] RowVersion { get; set; }
 
         public virtual Category Category { get; set; }
-        public virtual ICollection<OrderDetail> OrderDetail { get; set; }
+        public virtual ICollection<OrderDetail> OrderDetails { get; set; }
     }
 }