Merge pull request #310 from enisn/4.1-ignore-differenttype-comparison

Ignoring diffretent type comparison in validators
enisn · Sep 17, 2022 · fd79c35 · fd79c35
2 parents aa4b258 + 36d047b
commit fd79c35
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/src/InputKit.Maui/InputKit.Maui.csproj b/src/InputKit.Maui/InputKit.Maui.csproj
@@ -8,7 +8,7 @@
 		<SingleProject>true</SingleProject>
 		<MauiVersion>6.0.486</MauiVersion>
 		<PackageId>InputKit.Maui</PackageId>
-		<Version>4.1.0</Version>
+		<Version>4.1.1</Version>
     <DefineConstants Condition="$(TargetFramework.Contains('-windows'))">$(DefineConstants);UWP</DefineConstants>
 
     <!-- NuGet Package Info -->

diff --git a/src/InputKit.Maui/Shared/Validations/MaxValueValidation.cs b/src/InputKit.Maui/Shared/Validations/MaxValueValidation.cs
@@ -13,7 +13,7 @@ public bool Validate(object value)
         }
 
         var converted = ComparableTypeConverter.Instance.ConvertFrom(value);
-        if (converted is IComparable comparable)
+        if (converted is IComparable comparable && converted.GetType() == comparable.GetType())
         {
             return comparable.CompareTo(MaxValue) <= 0;
         }

diff --git a/src/InputKit.Maui/Shared/Validations/MinValueValidation.cs b/src/InputKit.Maui/Shared/Validations/MinValueValidation.cs
@@ -19,7 +19,7 @@ public bool Validate(object value)
 
         var converted = ComparableTypeConverter.Instance.ConvertFrom(value);
 
-        if (converted is IComparable comparable)
+        if (converted is IComparable comparable && converted.GetType() == comparable.GetType())
         {
             return comparable.CompareTo(MinValue) >= 0;
         }

diff --git a/src/Xamarin.Forms.InputKit/Shared/Validations/MaxValueValidation.cs b/src/Xamarin.Forms.InputKit/Shared/Validations/MaxValueValidation.cs
@@ -16,7 +16,7 @@ public bool Validate(object value)
             }
 
             var converted = ComparableTypeConverter.Instance.ConvertFrom(value);
-            if (converted is IComparable comparable)
+            if (converted is IComparable comparable && converted.GetType() == comparable.GetType())
             {
                 return comparable.CompareTo(MaxValue) <= 0;
             }

diff --git a/src/Xamarin.Forms.InputKit/Shared/Validations/MinValueValidation.cs b/src/Xamarin.Forms.InputKit/Shared/Validations/MinValueValidation.cs
@@ -21,7 +21,7 @@ public bool Validate(object value)
 
             var converted = ComparableTypeConverter.Instance.ConvertFrom(value);
 
-            if (converted is IComparable comparable)
+            if (converted is IComparable comparable && converted.GetType() == comparable.GetType())
             {
                 return comparable.CompareTo(MinValue) >= 0;
             }

diff --git a/src/Xamarin.Forms.InputKit/Xamarin.Forms.InputKit.csproj b/src/Xamarin.Forms.InputKit/Xamarin.Forms.InputKit.csproj
@@ -8,7 +8,7 @@
     <RootNamespace>Plugin.InputKit</RootNamespace>
     <PackageId>Xamarin.Forms.InputKit</PackageId>
     <Product>$(AssemblyName) ($(TargetFramework))</Product>
-    <Version>4.1.0</Version>
+    <Version>4.1.1</Version>
     <PackOnBuild>false</PackOnBuild>
     <NeutralLanguage>en-US</NeutralLanguage>
     <DefineConstants>$(DefineConstants);</DefineConstants>