Update to .NET 8 GA

efcore · Nov 15, 2023 · e02dca2 · e02dca2
1 parent a3c6c55
commit e02dca2
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 8 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -18,7 +18,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 8.0.100-preview.2.23157.25
+        dotnet-version: 8.0.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Build

diff --git a/EFCore.InMemory.HierarchyId.Test/EFCore.InMemory.HierarchyId.Test.csproj b/EFCore.InMemory.HierarchyId.Test/EFCore.InMemory.HierarchyId.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <AssemblyName>EntityFrameworkCore.InMemory.HierarchyId.Test</AssemblyName>
     <RootNamespace>Microsoft.EntityFrameworkCore.InMemory</RootNamespace>

diff --git a/EFCore.InMemory.HierarchyId/EFCore.InMemory.HierarchyId.csproj b/EFCore.InMemory.HierarchyId/EFCore.InMemory.HierarchyId.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyName>EntityFrameworkCore.InMemory.HierarchyId</AssemblyName>
     <RootNamespace>Microsoft.EntityFrameworkCore.InMemory</RootNamespace>
     <Authors>Adrian Paul Nutiu</Authors>
@@ -21,8 +21,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.0-preview.2.23128.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Abstractions" Version="8.0.0-preview.2.23128.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Abstractions" Version="8.0.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" />
   </ItemGroup>
 

diff --git a/EFCore.InMemory.HierarchyId/Storage/InMemoryHierarchyIdTypeMapping.cs b/EFCore.InMemory.HierarchyId/Storage/InMemoryHierarchyIdTypeMapping.cs
@@ -1,5 +1,7 @@
 using System;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
 using Microsoft.EntityFrameworkCore.Storage;
+using Microsoft.EntityFrameworkCore.Storage.Json;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Microsoft.EntityFrameworkCore.InMemory.Storage
@@ -16,7 +18,21 @@ private InMemoryHierarchyIdTypeMapping(CoreTypeMappingParameters parameters)
         {
         }
 
-        public override CoreTypeMapping Clone(ValueConverter converter)
-            => new InMemoryHierarchyIdTypeMapping(Parameters.WithComposedConverter(converter));
+        public override CoreTypeMapping WithComposedConverter(
+            ValueConverter converter,
+            ValueComparer comparer = null,
+            ValueComparer keyComparer = null,
+            CoreTypeMapping elementMapping = null,
+            JsonValueReaderWriter jsonValueReaderWriter = null)
+            => new InMemoryHierarchyIdTypeMapping(
+                Parameters.WithComposedConverter(
+                    converter,
+                    comparer,
+                    keyComparer,
+                    elementMapping,
+                    jsonValueReaderWriter));
+
+        protected override CoreTypeMapping Clone(CoreTypeMappingParameters parameters)
+            => new InMemoryHierarchyIdTypeMapping(parameters);
     }
 }
diff --git a/NuGet.Config b/NuGet.Config
@@ -3,7 +3,6 @@
   <packageSources>
     <clear />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
-    <add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
     <clear />