Can set nullable values from LambdaBuilder. 1.7.2

JasperFx · Jun 10, 2024 · 859ffd7 · 859ffd7
1 parent 32624d4
commit 859ffd7
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/src/JasperFx.Core.Tests/Reflection/LambdaBuilderTests.cs b/src/JasperFx.Core.Tests/Reflection/LambdaBuilderTests.cs
@@ -46,6 +46,20 @@ public void can_build_setter_for_property()
 
             target.Number.ShouldBe(11);
         }
+
+        [Fact]
+        public void can_build_setter_for_nullable_property()
+        {
+            var target = new Target { NullableNumber = 5 };
+            var prop = ReflectionHelper.GetProperty<Target>(x => x.NullableNumber);
+
+            var setter = LambdaBuilder.SetProperty<Target, int>(prop);
+
+            setter(target, 11);
+
+
+            target.NullableNumber.Value.ShouldBe(11);
+        }
 
 
         [Fact]

diff --git a/src/JasperFx.Core/JasperFx.Core.csproj b/src/JasperFx.Core/JasperFx.Core.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <Description>Common extension methods and reflection helpers used by JasperFx projects</Description>
-        <Version>1.7.1</Version>
+        <Version>1.7.2</Version>
         <Authors>Jeremy D. Miller</Authors>
         <AssemblyName>JasperFx.Core</AssemblyName>
         <PackageId>JasperFx.Core</PackageId>

diff --git a/src/JasperFx.Core/Reflection/LambdaBuilder.cs b/src/JasperFx.Core/Reflection/LambdaBuilder.cs
@@ -38,8 +38,10 @@ public static Func<TTarget, TProperty> GetProperty<TTarget, TProperty>(PropertyI
             var method = property.SetMethod;
 
             if (method == null) return null;
+
+            Expression actualValue = property.PropertyType == typeof(TProperty) ? value : Expression.Convert(value, property.PropertyType);
 
-            var callSetMethod = Expression.Call(target, method, value);
+            var callSetMethod = Expression.Call(target, method, actualValue);
 
             var lambda = Expression.Lambda<Action<TTarget, TProperty>>(callSetMethod, target, value);