From b268a9c483933ea2799fe261c4abc0485733f0a5 Mon Sep 17 00:00:00 2001 From: Steven Rasmussen Date: Fri, 15 Sep 2023 09:50:02 -0600 Subject: [PATCH 1/2] Update action to use .Net 8 --- .github/workflows/dotnetcore.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml index fd30924..d1f5722 100644 --- a/.github/workflows/dotnetcore.yml +++ b/.github/workflows/dotnetcore.yml @@ -12,7 +12,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v1 with: - dotnet-version: 6.0.x + dotnet-version: 8.0.x include-prerelease: true - name: Build with dotnet run: dotnet build "./src/SimplerSoftware.EntityFrameworkCore.SqlServer.NodaTime.sln" --configuration Release From 50a268790abffb470922198020470714b158babf Mon Sep 17 00:00:00 2001 From: Steve Rasmussen Date: Tue, 10 Oct 2023 17:42:21 -0600 Subject: [PATCH 2/2] Fixed breaking changes with RC2. --- ...re.EntityFrameworkCore.SqlServer.NodaTime.Tests.csproj | 2 +- ...Software.EntityFrameworkCore.SqlServer.NodaTime.csproj | 4 ++-- .../Storage/SqlServerNodaTimeTypeMappingSourcePlugin.cs | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/SimplerSoftware.EntityFrameworkCore.SqlServer.NodaTime.Tests/SimplerSoftware.EntityFrameworkCore.SqlServer.NodaTime.Tests.csproj b/src/SimplerSoftware.EntityFrameworkCore.SqlServer.NodaTime.Tests/SimplerSoftware.EntityFrameworkCore.SqlServer.NodaTime.Tests.csproj index 08308f2..d0fa4da 100644 --- a/src/SimplerSoftware.EntityFrameworkCore.SqlServer.NodaTime.Tests/SimplerSoftware.EntityFrameworkCore.SqlServer.NodaTime.Tests.csproj +++ b/src/SimplerSoftware.EntityFrameworkCore.SqlServer.NodaTime.Tests/SimplerSoftware.EntityFrameworkCore.SqlServer.NodaTime.Tests.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/SimplerSoftware.EntityFrameworkCore.SqlServer.NodaTime/SimplerSoftware.EntityFrameworkCore.SqlServer.NodaTime.csproj b/src/SimplerSoftware.EntityFrameworkCore.SqlServer.NodaTime/SimplerSoftware.EntityFrameworkCore.SqlServer.NodaTime.csproj index 52a50ad..ba01c79 100644 --- a/src/SimplerSoftware.EntityFrameworkCore.SqlServer.NodaTime/SimplerSoftware.EntityFrameworkCore.SqlServer.NodaTime.csproj +++ b/src/SimplerSoftware.EntityFrameworkCore.SqlServer.NodaTime/SimplerSoftware.EntityFrameworkCore.SqlServer.NodaTime.csproj @@ -13,13 +13,13 @@ https://github.com/StevenRasmussen/EFCore.SqlServer.NodaTime git Entity Framework Core;entity-framework-core;EF;Data;O/RM;EntityFrameworkCore;EFCore;Noda;NodaTime;Noda Time - 8.0.0-rc.1.23419.6 + 8.0.0-rc.2.23480.1 README.md - + diff --git a/src/SimplerSoftware.EntityFrameworkCore.SqlServer.NodaTime/Storage/SqlServerNodaTimeTypeMappingSourcePlugin.cs b/src/SimplerSoftware.EntityFrameworkCore.SqlServer.NodaTime/Storage/SqlServerNodaTimeTypeMappingSourcePlugin.cs index 738d166..4759045 100644 --- a/src/SimplerSoftware.EntityFrameworkCore.SqlServer.NodaTime/Storage/SqlServerNodaTimeTypeMappingSourcePlugin.cs +++ b/src/SimplerSoftware.EntityFrameworkCore.SqlServer.NodaTime/Storage/SqlServerNodaTimeTypeMappingSourcePlugin.cs @@ -50,7 +50,7 @@ public SqlServerNodaTimeTypeMappingSourcePlugin() this.AddTypeMappingToDictionaries(this._durationTypeMapping); } - public virtual RelationalTypeMapping FindMapping(in RelationalTypeMappingInfo mappingInfo) + public RelationalTypeMapping FindMapping(in RelationalTypeMappingInfo mappingInfo) { var clrType = mappingInfo.ClrType; var storeTypeName = mappingInfo.StoreTypeName; @@ -73,11 +73,11 @@ public virtual RelationalTypeMapping FindMapping(in RelationalTypeMappingInfo ma if (StoreTypeMappings.TryGetValue(storeTypeNameBase!, out mappings)) { if (clrType == null) - return mappings[0].Clone(in mappingInfo); + return mappings[0].Clone(mappingInfo); foreach (var m in mappings) if (m.ClrType == clrType) - return m.Clone(in mappingInfo); + return m.Clone(mappingInfo); return null; } @@ -88,7 +88,7 @@ public virtual RelationalTypeMapping FindMapping(in RelationalTypeMappingInfo ma // TODO: Cache size/precision/scale mappings? return mappingInfo.Precision.HasValue && _hasPrecisionTypes.Contains(mapping.ClrType) - ? mapping.Clone($"{mapping.StoreType}({mappingInfo.Precision.Value})", null) + ? mapping.Clone(mappingInfo) : mapping; }