Merge branch 'main' into dependabot/nuget/Microsoft.EntityFrameworkCo…

…re-7.0.13
ardalis · Jan 16, 2024 · 5c534eb · 5c534eb
2 parents 64faf39 + 909b672
commit 5c534eb
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 4 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -15,6 +15,7 @@
 		<Features>strict</Features>
 	</PropertyGroup>
 	<PropertyGroup>
+		<SolutionDir Condition="'$(SolutionDir)'==''">$(MSBuildThisFileDirectory)</SolutionDir>
 		<RepoRelativeProjectDir>$([MSBuild]::MakeRelative($(RepoRoot), $(MSBuildProjectDirectory)))</RepoRelativeProjectDir>
 
 		<!-- Define useful flags based on project name conventions -->

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -4,7 +4,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="AutoFixture" Version="4.17.0" />
-    <PackageVersion Include="BenchmarkDotNet" Version="0.13.4" />
+    <PackageVersion Include="BenchmarkDotNet" Version="0.13.10" />
     <PackageVersion Include="Constant" Version="2.0.4" />
     <PackageVersion Include="coverlet.collector" Version="3.2.0" />
     <PackageVersion Include="coverlet.msbuild" Version="3.2.0" />
@@ -17,7 +17,7 @@
     <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="7.0.13" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.2" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.2" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
     <PackageVersion Include="Moq" Version="4.18.4" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.2" />

diff --git a/README.md b/README.md
@@ -98,7 +98,7 @@ Install-Package Ardalis.SmartEnum -Version 2.1.0
 
 ## Usage
 
-Define your smart enum by inheriting from `SmartEnum<TEnum>` where `TEnum` is the type you're declaring. For [example](/src/SmartEnum.UnitTests/TestEnum.cs):
+Define your smart enum by inheriting from `SmartEnum<TEnum>` where `TEnum` is the type you're declaring. For [example](/test/SmartEnum.UnitTests/TestEnum.cs):
 
 ```csharp
 using Ardalis.SmartEnum;

diff --git a/src/SmartEnum.EFCore/SmartEnumConverterExtensions.cs b/src/SmartEnum.EFCore/SmartEnumConverterExtensions.cs
@@ -6,7 +6,9 @@
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 
 namespace SmartEnum.EFCore
@@ -23,6 +25,7 @@ public static void ConfigureSmartEnum(this ModelConfigurationBuilder configurati
             var propertyTypes = modelBuilder.Model.GetEntityTypes()
                 .SelectMany(e => e.ClrType.GetProperties())
                 .Where(p => TypeUtil.IsDerived(p.PropertyType, typeof(SmartEnum<,>)))
+                .Where(p => p.GetCustomAttribute<NotMappedAttribute>() == null)
                 .Select(p => p.PropertyType)
                 .Distinct();
 
@@ -52,7 +55,8 @@ public static void ConfigureSmartEnum(this ModelBuilder modelBuilder)
             foreach (var entityType in modelBuilder.Model.GetEntityTypes())
             {
                 var properties = entityType.ClrType.GetProperties()
-                    .Where(p => TypeUtil.IsDerived(p.PropertyType, typeof(SmartEnum<,>)));
+                    .Where(p => TypeUtil.IsDerived(p.PropertyType, typeof(SmartEnum<,>)))
+                    .Where(p => p.GetCustomAttribute<NotMappedAttribute>() == null);
 
                 foreach (var property in properties)
                 {

diff --git a/test/SmartEnum.EFCore.IntegrationTests/Entities/SomeEntity.cs b/test/SmartEnum.EFCore.IntegrationTests/Entities/SomeEntity.cs
@@ -1,6 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace SmartEnum.EFCore.IntegrationTests.Entities
 {
@@ -24,6 +25,9 @@ public class SomeEntity
 
         public List<SomeOwnedEntity> OwnedEntities { get; set; }
 
+        [NotMapped]
+        public TestEnum NotMappedTest { get; set; }
+
         public class Configuration : IEntityTypeConfiguration<SomeEntity>
         {
             public void Configure(EntityTypeBuilder<SomeEntity> builder)

diff --git a/test/SmartEnum.EFCore.IntegrationTests/Entities/SomeOuterOwnedEntity.cs b/test/SmartEnum.EFCore.IntegrationTests/Entities/SomeOuterOwnedEntity.cs
@@ -1,5 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 
+using System.ComponentModel.DataAnnotations.Schema;
+
 namespace SmartEnum.EFCore.IntegrationTests.Entities
 {
     [Owned]
@@ -18,5 +20,8 @@ public class SomeOuterOwnedEntity
         public TestBaseEnumWithDerivedValues Test4 { get; set; }
 
         public SomeOwnedEntity InnerOwnedEntity { get; set; }
+
+        [NotMapped]
+        public TestEnum NotMappedTest { get; set; }
     }
 }
diff --git a/test/SmartEnum.EFCore.IntegrationTests/Entities/SomeOwnedEntity.cs b/test/SmartEnum.EFCore.IntegrationTests/Entities/SomeOwnedEntity.cs
@@ -1,5 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 
+using System.ComponentModel.DataAnnotations.Schema;
+
 namespace SmartEnum.EFCore.IntegrationTests.Entities
 {
     [Owned]
@@ -16,5 +18,8 @@ public class SomeOwnedEntity
         public TestStringEnum Test3 { get; set; }
 
         public TestBaseEnumWithDerivedValues Test4 { get; set; }
+
+        [NotMapped]
+        public TestEnum NotMappedTest { get; set; }
     }
 }
diff --git a/test/SmartEnum.EFCore.IntegrationTests/SmartEnumEFCoreDbTests.cs b/test/SmartEnum.EFCore.IntegrationTests/SmartEnumEFCoreDbTests.cs
@@ -85,6 +85,7 @@ private static SomeEntity CreateEntity()
                 Test2 = TestDerivedEnum.One,
                 Test3 = TestStringEnum.One,
                 Test4 = DerivedTestEnumWithValues1.A,
+                NotMappedTest = TestEnum.One,
                 OwnedEntity = new SomeOwnedEntity
                 {
                     Value = 2,
@@ -143,27 +144,31 @@ private static void VerifyEntity(SomeEntity entity)
             entity.Test2.Should().Be(TestDerivedEnum.One);
             entity.Test3.Should().Be(TestStringEnum.One);
             entity.Test4.Should().Be(DerivedTestEnumWithValues1.A);
+            entity.NotMappedTest.Should().BeNull();
 
             entity.OwnedEntity.Value.Should().Be(2);
             entity.OwnedEntity.Weekday.Should().Be(Weekday.Friday);
             entity.OwnedEntity.Test1.Should().Be(TestEnum.Two);
             entity.OwnedEntity.Test2.Should().Be(TestDerivedEnum.One);
             entity.OwnedEntity.Test3.Should().Be(TestStringEnum.Two);
             entity.OwnedEntity.Test4.Should().Be(DerivedTestEnumWithValues1.B);
+            entity.OwnedEntity.NotMappedTest.Should().BeNull();
 
             entity.OuterOwnedEntity.Value.Should().Be(3);
             entity.OuterOwnedEntity.Weekday.Should().Be(Weekday.Friday);
             entity.OuterOwnedEntity.Test1.Should().Be(TestEnum.Two);
             entity.OuterOwnedEntity.Test2.Should().Be(TestDerivedEnum.One);
             entity.OuterOwnedEntity.Test3.Should().Be(TestStringEnum.Two);
             entity.OuterOwnedEntity.Test4.Should().Be(DerivedTestEnumWithValues1.B);
+            entity.OuterOwnedEntity.NotMappedTest.Should().BeNull();
 
             entity.OuterOwnedEntity.InnerOwnedEntity.Value.Should().Be(4);
             entity.OuterOwnedEntity.InnerOwnedEntity.Weekday.Should().Be(Weekday.Friday);
             entity.OuterOwnedEntity.InnerOwnedEntity.Test1.Should().Be(TestEnum.Two);
             entity.OuterOwnedEntity.InnerOwnedEntity.Test2.Should().Be(TestDerivedEnum.One);
             entity.OuterOwnedEntity.InnerOwnedEntity.Test3.Should().Be(TestStringEnum.Two);
             entity.OuterOwnedEntity.InnerOwnedEntity.Test4.Should().Be(DerivedTestEnumWithValues1.B);
+            entity.OuterOwnedEntity.InnerOwnedEntity.NotMappedTest.Should().BeNull();
 
             entity.OwnedEntities.Should().SatisfyRespectively(
                 o =>
@@ -174,6 +179,7 @@ private static void VerifyEntity(SomeEntity entity)
                     o.Test2.Should().Be(TestDerivedEnum.One);
                     o.Test3.Should().Be(TestStringEnum.Three);
                     o.Test4.Should().Be(DerivedTestEnumWithValues1.A);
+                    o.NotMappedTest.Should().BeNull();
                 },
                 o =>
                 {
@@ -183,6 +189,7 @@ private static void VerifyEntity(SomeEntity entity)
                     o.Test2.Should().Be(TestDerivedEnum.One);
                     o.Test3.Should().Be(TestStringEnum.One);
                     o.Test4.Should().Be(DerivedTestEnumWithValues1.B);
+                    o.NotMappedTest.Should().BeNull();
                 });
         }
     }