Update to EF Core 7 RC 2 (#11)

ErikEJ · web-flow · commit 32ff46df7727 · 2022-10-12T14:15:36.000+02:00
Co-authored-by: Erik Ejlskov Jensen &lt;eej@delegate.dk&gt;
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Setup .NET Core SDK
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: "6.0.x"
+          dotnet-version: "7.0.100-rc.2.22477.23"
 
       - name: Test
         run: dotnet test --collect:"XPlat Code Coverage"
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -15,6 +15,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
   </ItemGroup>
 </Project>
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -1,18 +1,17 @@
 <Project>
   <ItemGroup>
-    <PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.0" />
-    <PackageReference Update="NodaTime" Version="3.0.9" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.0-rc.2.22472.11" />
+    <PackageReference Update="NodaTime" Version="3.1.4" />
 
     <!-- Test -->
-    <PackageReference Update="Verify.Xunit" Version="18.0.0-beta.15" />
+    <PackageReference Update="Verify.Xunit" Version="18.0.0-beta.23" />
     <PackageReference Update="Verify.EntityFramework" Version="7.0.0-beta.2" />
     <PackageReference Update="xunit" Version="2.4.2" />
     <PackageReference Update="xunit.runner.visualstudio" Version="2.4.5" />
-    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.3.1" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Design" Version="6.0.8" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.8" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Specification.Tests" Version="6.0.8" />
-    <PackageReference Update="coverlet.collector" Version="3.1.0" />
+    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Design" Version="7.0.0-rc.2.22472.11" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.0-rc.2.22472.11" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Specification.Tests" Version="7.0.0-rc.2.22472.11" />
+    <PackageReference Update="coverlet.collector" Version="3.1.2" />
   </ItemGroup>
 </Project>
diff --git a/EFCore.Sqlite.NodaTime.Tests/EFCore.Sqlite.NodaTime.Tests.csproj b/EFCore.Sqlite.NodaTime.Tests/EFCore.Sqlite.NodaTime.Tests.csproj
@@ -2,8 +2,8 @@
   <PropertyGroup>
     <AssemblyName>EntityFrameworkCore.Sqlite.NodaTime.Tests</AssemblyName>
     <RootNamespace>Microsoft.EntityFrameworkCore.Sqlite</RootNamespace>
-    <TargetFramework>net6.0</TargetFramework>
-    <NoWarn>$(NoWarn);EF1001</NoWarn>
+    <TargetFramework>net7.0</TargetFramework>
+    <NoWarn>$(NoWarn);EF1001;CS9057</NoWarn>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/EFCore.Sqlite.NodaTime.Tests/LocalDateQueryTests.Update.verified.txt b/EFCore.Sqlite.NodaTime.Tests/LocalDateQueryTests.Update.verified.txt
@@ -9,14 +9,14 @@ LIMIT 2
   },
   {
     Type: ReaderExecuted,
-    HasTransaction: true,
+    HasTransaction: false,
     Parameters: {
       @p0 (String): 2020-10-12,
       @p1 (Int32): 1
     },
     Text:
 UPDATE "NodaTimeTypes" SET "LocalDate" = @p0
-WHERE "Id" = @p1;
-SELECT changes();
+WHERE "Id" = @p1
+RETURNING 1;
   }
 ]
diff --git a/EFCore.Sqlite.NodaTime.Tests/LocalDateTimeQueryTests.Update.verified.txt b/EFCore.Sqlite.NodaTime.Tests/LocalDateTimeQueryTests.Update.verified.txt
@@ -9,14 +9,14 @@ LIMIT 2
   },
   {
     Type: ReaderExecuted,
-    HasTransaction: true,
+    HasTransaction: false,
     Parameters: {
       @p0 (String): 2020-10-12 23:42:16.321,
       @p1 (Int32): 1
     },
     Text:
 UPDATE "NodaTimeTypes" SET "LocalDateTime" = @p0
-WHERE "Id" = @p1;
-SELECT changes();
+WHERE "Id" = @p1
+RETURNING 1;
   }
 ]
diff --git a/EFCore.Sqlite.NodaTime.Tests/LocalTimeQueryTests.Update.verified.txt b/EFCore.Sqlite.NodaTime.Tests/LocalTimeQueryTests.Update.verified.txt
@@ -9,14 +9,14 @@ LIMIT 2
   },
   {
     Type: ReaderExecuted,
-    HasTransaction: true,
+    HasTransaction: false,
     Parameters: {
       @p0 (String): 23:42:26.321,
       @p1 (Int32): 1
     },
     Text:
 UPDATE "NodaTimeTypes" SET "LocalTime" = @p0
-WHERE "Id" = @p1;
-SELECT changes();
+WHERE "Id" = @p1
+RETURNING 1;
   }
 ]
diff --git a/EFCore.Sqlite.NodaTime.Tests/MigrationTests.Migration_Generates_Correct_MigrationCode.verified.txt b/EFCore.Sqlite.NodaTime.Tests/MigrationTests.Migration_Generates_Correct_MigrationCode.verified.txt
@@ -4,8 +4,10 @@
 
 namespace Microsoft.EntityFrameworkCore.Sqlite.Migrations
 {
+    /// <inheritdoc />
     public partial class MigrationCode : Migration
     {
+        /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)
         {
             migrationBuilder.CreateTable(
@@ -30,6 +32,7 @@ namespace Microsoft.EntityFrameworkCore.Sqlite.Migrations
                 values: new object[] { 1, "2020-10-10 23:42:16.321", "2020-10-10", "2020-10-10 23:42:16.321", "23:42:16.321" });
         }
 
+        /// <inheritdoc />
         protected override void Down(MigrationBuilder migrationBuilder)
         {
             migrationBuilder.DropTable(
diff --git a/EFCore.Sqlite.NodaTime/EFCore.Sqlite.NodaTime.csproj b/EFCore.Sqlite.NodaTime/EFCore.Sqlite.NodaTime.csproj
@@ -1,12 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <PackageTags>Entity Framework Core;entity-framework-core;ef;efcore;orm;sql;sqlite;NodaTime</PackageTags>
     <Description>Adds support for NodaTime types when using SQLite with Entity Framework Core.</Description>
     <RootNamespace>Microsoft.EntityFrameworkCore.Sqlite</RootNamespace>
     <AssemblyName>EntityFrameworkCore.Sqlite.NodaTime</AssemblyName>
     <PackageId>EntityFrameworkCore.Sqlite.NodaTime</PackageId>
     <TargetFramework>net6.0</TargetFramework>
-    <VersionPrefix>6.0.0</VersionPrefix>
+    <VersionPrefix>7.0.0</VersionPrefix>
   </PropertyGroup>
 
   <ItemGroup>
@@ -17,7 +17,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" />
     <PackageReference Include="NodaTime" />
   </ItemGroup>
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.400",
+    "version": "7.0.100-rc.2",
     "rollForward": "latestFeature"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -9,14 +9,14 @@ LIMIT 2`
`9`	`9`	`},`
`10`	`10`	`{`
`11`	`11`	`Type: ReaderExecuted,`
`12`		`- HasTransaction: true,`
	`12`	`+ HasTransaction: false,`
`13`	`13`	`Parameters: {`
`14`	`14`	`@p0 (String): 2020-10-12,`
`15`	`15`	`@p1 (Int32): 1`
`16`	`16`	`},`
`17`	`17`	`Text:`
`18`	`18`	`UPDATE "NodaTimeTypes" SET "LocalDate" = @p0`
`19`		`-WHERE "Id" = @p1;`
`20`		`-SELECT changes();`
	`19`	`+WHERE "Id" = @p1`
	`20`	`+RETURNING 1;`
`21`	`21`	`}`
`22`	`22`	`]`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,10 @@`
`4`	`4`
`5`	`5`	`namespace Microsoft.EntityFrameworkCore.Sqlite.Migrations`
`6`	`6`	`{`
	`7`	`+ /// <inheritdoc />`
`7`	`8`	`public partial class MigrationCode : Migration`
`8`	`9`	`{`
	`10`	`+ /// <inheritdoc />`
`9`	`11`	`protected override void Up(MigrationBuilder migrationBuilder)`
`10`	`12`	`{`
`11`	`13`	`migrationBuilder.CreateTable(`
`@@ -30,6 +32,7 @@ namespace Microsoft.EntityFrameworkCore.Sqlite.Migrations`
`30`	`32`	`values: new object[] { 1, "2020-10-10 23:42:16.321", "2020-10-10", "2020-10-10 23:42:16.321", "23:42:16.321" });`
`31`	`33`	`}`
`32`	`34`
	`35`	`+ /// <inheritdoc />`
`33`	`36`	`protected override void Down(MigrationBuilder migrationBuilder)`
`34`	`37`	`{`
`35`	`38`	`migrationBuilder.DropTable(`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "6.0.400",`
	`3`	`+ "version": "7.0.100-rc.2",`
`4`	`4`	`"rollForward": "latestFeature"`
`5`	`5`	`}`
`6`	`6`	`}`