Upgrade to .NET 8 (rc1)

It has much better scaffolding capabilities for SQLite since dotnet/efcore#30816
0xced · Oct 13, 2023 · d9710f1 · d9710f1
1 parent e93b24a
commit d9710f1
Show file tree

Hide file tree

Showing 26 changed files with 341 additions and 221 deletions.
diff --git a/global.json b/global.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/global",
   "sdk": {
-    "version": "7.0.400",
+    "version": "8.0.100-rc.1.23463.5",
     "allowPrerelease": false,
     "rollForward": "latestFeature"
   }

diff --git a/src/EFCore.Scaffolding.csproj b/src/EFCore.Scaffolding.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Label="Compiling">
@@ -65,17 +65,17 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="EntityFrameworkCore.Jet" Version="7.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.12" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.12" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.12" />
+    <PackageReference Include="EntityFrameworkCore.Jet" Version="8.0.0-alpha.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0-rc.1.23419.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0-rc.1.23419.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0-rc.1.23419.6" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" />
     <PackageReference Include="MinVer" Version="4.3.0" PrivateAssets="all" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.11" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0-rc.1" />
     <PackageReference Include="Oracle.EntityFrameworkCore" Version="7.21.12" />
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="7.0.0" />
-    <PackageReference Include="System.Data.Odbc" Version="7.0.0" />
-    <PackageReference Include="System.Data.OleDb" Version="7.0.0" />
+    <PackageReference Include="System.Data.Odbc" Version="8.0.0-rc.1.23419.4" />
+    <PackageReference Include="System.Data.OleDb" Version="8.0.0-rc.1.23419.4" />
   </ItemGroup>
 
   <Target Name="ValidateNuGetPackage" AfterTargets="Pack">

diff --git a/src/packages.lock.json b/src/packages.lock.json
diff --git a/tests/EFCore.Scaffolding.Tests.csproj b/tests/EFCore.Scaffolding.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/tests/PublicApi.net6.0.verified.cs → tests/PublicApi.net8.0.verified.cs b/tests/PublicApi.net6.0.verified.cs → tests/PublicApi.net8.0.verified.cs
@@ -1,6 +1,6 @@
 [assembly: System.CLSCompliant(false)]
 [assembly: System.Reflection.AssemblyMetadata("RepositoryUrl", "https://github.com/0xced/EFCore.Scaffolding")]
-[assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v6.0", FrameworkDisplayName=".NET 6.0")]
+[assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v8.0", FrameworkDisplayName=".NET 8.0")]
 namespace EFCore.Scaffolding
 {
     public class ColumnNameComparer : System.Collections.Generic.IComparer<Microsoft.EntityFrameworkCore.Scaffolding.Metadata.DatabaseColumn>

diff --git a/tests/SqliteTest.Scaffold/Album.verified.cs b/tests/SqliteTest.Scaffold/Album.verified.cs
@@ -18,11 +18,11 @@ namespace Scaffold;
 
 public partial class Album
 {
-    public long AlbumId { get; set; }
+    public int AlbumId { get; set; }
 
     public string Title { get; set; } = null!;
 
-    public long ArtistId { get; set; }
+    public int ArtistId { get; set; }
 
     public virtual Artist Artist { get; set; } = null!;
 

diff --git a/tests/SqliteTest.Scaffold/Artist.verified.cs b/tests/SqliteTest.Scaffold/Artist.verified.cs
@@ -18,7 +18,7 @@ namespace Scaffold;
 
 public partial class Artist
 {
-    public long ArtistId { get; set; }
+    public int ArtistId { get; set; }
 
     public string? Name { get; set; }
 

diff --git a/tests/SqliteTest.Scaffold/Customer.verified.cs b/tests/SqliteTest.Scaffold/Customer.verified.cs
@@ -18,7 +18,7 @@ namespace Scaffold;
 
 public partial class Customer
 {
-    public long CustomerId { get; set; }
+    public int CustomerId { get; set; }
 
     public string FirstName { get; set; } = null!;
 
@@ -42,7 +42,7 @@ public partial class Customer
 
     public string Email { get; set; } = null!;
 
-    public long? SupportRepId { get; set; }
+    public int? SupportRepId { get; set; }
 
     public virtual ICollection<Invoice> Invoices { get; set; } = new List<Invoice>();
 

diff --git a/tests/SqliteTest.Scaffold/Employee.verified.cs b/tests/SqliteTest.Scaffold/Employee.verified.cs
@@ -18,19 +18,19 @@ namespace Scaffold;
 
 public partial class Employee
 {
-    public long EmployeeId { get; set; }
+    public int EmployeeId { get; set; }
 
     public string LastName { get; set; } = null!;
 
     public string FirstName { get; set; } = null!;
 
     public string? Title { get; set; }
 
-    public long? ReportsTo { get; set; }
+    public int? ReportsTo { get; set; }
 
-    public byte[]? BirthDate { get; set; }
+    public DateTime? BirthDate { get; set; }
 
-    public byte[]? HireDate { get; set; }
+    public DateTime? HireDate { get; set; }
 
     public string? Address { get; set; }
 

diff --git a/tests/SqliteTest.Scaffold/Genre.verified.cs b/tests/SqliteTest.Scaffold/Genre.verified.cs
@@ -18,7 +18,7 @@ namespace Scaffold;
 
 public partial class Genre
 {
-    public long GenreId { get; set; }
+    public int GenreId { get; set; }
 
     public string? Name { get; set; }
 

diff --git a/tests/SqliteTest.Scaffold/Invoice.verified.cs b/tests/SqliteTest.Scaffold/Invoice.verified.cs
@@ -18,11 +18,11 @@ namespace Scaffold;
 
 public partial class Invoice
 {
-    public long InvoiceId { get; set; }
+    public int InvoiceId { get; set; }
 
-    public long CustomerId { get; set; }
+    public int CustomerId { get; set; }
 
-    public byte[] InvoiceDate { get; set; } = null!;
+    public DateTime InvoiceDate { get; set; }
 
     public string? BillingAddress { get; set; }
 
@@ -34,7 +34,7 @@ public partial class Invoice
 
     public string? BillingPostalCode { get; set; }
 
-    public byte[] Total { get; set; } = null!;
+    public decimal Total { get; set; }
 
     public virtual Customer Customer { get; set; } = null!;
 

diff --git a/tests/SqliteTest.Scaffold/InvoiceLine.verified.cs b/tests/SqliteTest.Scaffold/InvoiceLine.verified.cs
@@ -18,15 +18,15 @@ namespace Scaffold;
 
 public partial class InvoiceLine
 {
-    public long InvoiceLineId { get; set; }
+    public int InvoiceLineId { get; set; }
 
-    public long InvoiceId { get; set; }
+    public int InvoiceId { get; set; }
 
-    public long TrackId { get; set; }
+    public int TrackId { get; set; }
 
-    public byte[] UnitPrice { get; set; } = null!;
+    public decimal UnitPrice { get; set; }
 
-    public long Quantity { get; set; }
+    public int Quantity { get; set; }
 
     public virtual Invoice Invoice { get; set; } = null!;
 

diff --git a/tests/SqliteTest.Scaffold/MediaType.verified.cs b/tests/SqliteTest.Scaffold/MediaType.verified.cs
@@ -18,7 +18,7 @@ namespace Scaffold;
 
 public partial class MediaType
 {
-    public long MediaTypeId { get; set; }
+    public int MediaTypeId { get; set; }
 
     public string? Name { get; set; }
 

diff --git a/tests/SqliteTest.Scaffold/Playlist.verified.cs b/tests/SqliteTest.Scaffold/Playlist.verified.cs
@@ -18,7 +18,7 @@ namespace Scaffold;
 
 public partial class Playlist
 {
-    public long PlaylistId { get; set; }
+    public int PlaylistId { get; set; }
 
     public string? Name { get; set; }
 

diff --git a/tests/SqliteTest.Scaffold/Track.verified.cs b/tests/SqliteTest.Scaffold/Track.verified.cs
@@ -18,23 +18,23 @@ namespace Scaffold;
 
 public partial class Track
 {
-    public long TrackId { get; set; }
+    public int TrackId { get; set; }
 
     public string Name { get; set; } = null!;
 
-    public long? AlbumId { get; set; }
+    public int? AlbumId { get; set; }
 
-    public long MediaTypeId { get; set; }
+    public int MediaTypeId { get; set; }
 
-    public long? GenreId { get; set; }
+    public int? GenreId { get; set; }
 
     public string? Composer { get; set; }
 
-    public long Milliseconds { get; set; }
+    public int Milliseconds { get; set; }
 
-    public long? Bytes { get; set; }
+    public int? Bytes { get; set; }
 
-    public byte[] UnitPrice { get; set; } = null!;
+    public decimal UnitPrice { get; set; }
 
     public virtual Album? Album { get; set; }
 

diff --git a/tests/SqliteTest.ScaffoldOneTableOrderedColumns/Customer.verified.cs b/tests/SqliteTest.ScaffoldOneTableOrderedColumns/Customer.verified.cs
@@ -26,7 +26,7 @@ public partial class Customer
 
     public string? Country { get; set; }
 
-    public long CustomerId { get; set; }
+    public int CustomerId { get; set; }
 
     public string Email { get; set; } = null!;
 
@@ -40,5 +40,5 @@ public partial class Customer
 
     public string? State { get; set; }
 
-    public long? SupportRepId { get; set; }
+    public int? SupportRepId { get; set; }
 }
diff --git a/tests/SqliteTest.ScaffoldRename/Album.verified.cs b/tests/SqliteTest.ScaffoldRename/Album.verified.cs
@@ -18,11 +18,11 @@ namespace ScaffoldOneTableOrderedColumns;
 
 public partial class Album
 {
-    public long AlbumId { get; set; }
+    public int AlbumId { get; set; }
 
     public string Title { get; set; } = null!;
 
-    public long ArtistId { get; set; }
+    public int ArtistId { get; set; }
 
     public virtual Artist Artist { get; set; } = null!;
 

diff --git a/tests/SqliteTest.ScaffoldRename/Artist.verified.cs b/tests/SqliteTest.ScaffoldRename/Artist.verified.cs
@@ -18,7 +18,7 @@ namespace ScaffoldOneTableOrderedColumns;
 
 public partial class Artist
 {
-    public long ArtistId { get; set; }
+    public int ArtistId { get; set; }
 
     public string? Name { get; set; }
 

diff --git a/tests/SqliteTest.ScaffoldRename/Client.verified.cs b/tests/SqliteTest.ScaffoldRename/Client.verified.cs
@@ -18,7 +18,7 @@ namespace ScaffoldOneTableOrderedColumns;
 
 public partial class Client
 {
-    public long CustomerId { get; set; }
+    public int CustomerId { get; set; }
 
     public string FirstName { get; set; } = null!;
 
@@ -42,7 +42,7 @@ public partial class Client
 
     public string Email { get; set; } = null!;
 
-    public long? SupportRepId { get; set; }
+    public int? SupportRepId { get; set; }
 
     public virtual ICollection<Invoice> Invoices { get; set; } = new List<Invoice>();
 

diff --git a/tests/SqliteTest.ScaffoldRename/Employee.verified.cs b/tests/SqliteTest.ScaffoldRename/Employee.verified.cs
@@ -18,19 +18,19 @@ namespace ScaffoldOneTableOrderedColumns;
 
 public partial class Employee
 {
-    public long EmployeeId { get; set; }
+    public int EmployeeId { get; set; }
 
     public string LastName { get; set; } = null!;
 
     public string FirstName { get; set; } = null!;
 
     public string? Title { get; set; }
 
-    public long? ReportsTo { get; set; }
+    public int? ReportsTo { get; set; }
 
-    public byte[]? BirthDate { get; set; }
+    public DateTime? BirthDate { get; set; }
 
-    public byte[]? HireDate { get; set; }
+    public DateTime? HireDate { get; set; }
 
     public string? Address { get; set; }
 

diff --git a/tests/SqliteTest.ScaffoldRename/Genre.verified.cs b/tests/SqliteTest.ScaffoldRename/Genre.verified.cs
@@ -18,7 +18,7 @@ namespace ScaffoldOneTableOrderedColumns;
 
 public partial class Genre
 {
-    public long GenreId { get; set; }
+    public int GenreId { get; set; }
 
     public string? Name { get; set; }
 

diff --git a/tests/SqliteTest.ScaffoldRename/Invoice.verified.cs b/tests/SqliteTest.ScaffoldRename/Invoice.verified.cs
@@ -18,11 +18,11 @@ namespace ScaffoldOneTableOrderedColumns;
 
 public partial class Invoice
 {
-    public long InvoiceId { get; set; }
+    public int InvoiceId { get; set; }
 
-    public long CustomerId { get; set; }
+    public int CustomerId { get; set; }
 
-    public byte[] InvoiceDate { get; set; } = null!;
+    public DateTime InvoiceDate { get; set; }
 
     public string? BillingAddress { get; set; }
 
@@ -34,7 +34,7 @@ public partial class Invoice
 
     public string? BillingZipCode { get; set; }
 
-    public byte[] Total { get; set; } = null!;
+    public decimal Total { get; set; }
 
     public virtual Client Customer { get; set; } = null!;
 

diff --git a/tests/SqliteTest.ScaffoldRename/InvoiceLine.verified.cs b/tests/SqliteTest.ScaffoldRename/InvoiceLine.verified.cs
@@ -18,15 +18,15 @@ namespace ScaffoldOneTableOrderedColumns;
 
 public partial class InvoiceLine
 {
-    public long InvoiceLineId { get; set; }
+    public int InvoiceLineId { get; set; }
 
-    public long InvoiceId { get; set; }
+    public int InvoiceId { get; set; }
 
-    public long TrackId { get; set; }
+    public int TrackId { get; set; }
 
-    public byte[] UnitPrice { get; set; } = null!;
+    public decimal UnitPrice { get; set; }
 
-    public long Quantity { get; set; }
+    public int Quantity { get; set; }
 
     public virtual Invoice Invoice { get; set; } = null!;
 

diff --git a/tests/SqliteTest.ScaffoldRename/MediaType.verified.cs b/tests/SqliteTest.ScaffoldRename/MediaType.verified.cs
@@ -18,7 +18,7 @@ namespace ScaffoldOneTableOrderedColumns;
 
 public partial class MediaType
 {
-    public long MediaTypeId { get; set; }
+    public int MediaTypeId { get; set; }
 
     public string? Name { get; set; }
 

diff --git a/tests/SqliteTest.ScaffoldRename/Playlist.verified.cs b/tests/SqliteTest.ScaffoldRename/Playlist.verified.cs
@@ -18,7 +18,7 @@ namespace ScaffoldOneTableOrderedColumns;
 
 public partial class Playlist
 {
-    public long PlaylistId { get; set; }
+    public int PlaylistId { get; set; }
 
     public string? Name { get; set; }