Merge pull request #414 from TrevorPilley/develop

MicroLite 6.2.5
MicroLite-ORM · Sep 27, 2015 · 6a1ca4b · 6a1ca4b
2 parents ae6709b + 1b20128
commit 6a1ca4b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/MicroLite.Tests/Properties/AssemblyInfo.cs b/MicroLite.Tests/Properties/AssemblyInfo.cs
@@ -30,6 +30,6 @@
 //      Build Number
 //      Revision
 [assembly: AssemblyVersion("6.2.0.0")]
-[assembly: AssemblyFileVersion("6.2.4.0")]
+[assembly: AssemblyFileVersion("6.2.5.0")]
 [assembly: CLSCompliant(true)]
 [assembly: NeutralResourcesLanguageAttribute("en-GB")]
diff --git a/MicroLite.Tests/TypeConverters/TypeConverterTests.cs b/MicroLite.Tests/TypeConverters/TypeConverterTests.cs
@@ -1,6 +1,7 @@
 namespace MicroLite.Tests.TypeConverters
 {
     using System;
+    using System.Collections.Generic;
     using System.Data;
     using System.Xml.Linq;
     using MicroLite.Tests.TestEntities;
@@ -187,6 +188,15 @@ public void AnArgumentNullExceptionIsThrown()
             }
         }
 
+        public class WhenCallingResolveActualTypeWithACollectionType
+        {
+            [Fact]
+            public void TheSameTypeIsReturned()
+            {
+                Assert.Equal(typeof(IList<string>), TypeConverter.ResolveActualType(typeof(IList<string>)));
+            }
+        }
+
         public class WhenCallingResolveActualTypeWithANonNullableType
         {
             [Fact]

diff --git a/MicroLite/Properties/AssemblyInfo.cs b/MicroLite/Properties/AssemblyInfo.cs
@@ -43,8 +43,8 @@
 //      Build Number
 //      Revision
 [assembly: AssemblyVersion("6.2.0.0")]
-[assembly: AssemblyFileVersion("6.2.4.0")]
-[assembly: AssemblyInformationalVersion("6.2.4.1136")]
+[assembly: AssemblyFileVersion("6.2.5.0")]
+[assembly: AssemblyInformationalVersion("6.2.5.1138")]
 [assembly: CLSCompliant(true)]
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
 [assembly: InternalsVisibleTo("MicroLite.Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010011797cd346943588cc5fcfc675b0aeba173df75154e20fc84652791f0c028ec2d3f5c9a311ea16a2a6b021788a5e66ffa0bdb6d38e7678e605284be34be5eabe5f924eb633e9a7cf4b98ab2d12532fae0da9eda77b9aec3cbd78b1e0a2ed9e359ae4e706f441d796d92d5488b1dfb7456817454acb68265ae98d94b5fc79a8c7")]

diff --git a/MicroLite/TypeConverters/TypeConverter.cs b/MicroLite/TypeConverters/TypeConverter.cs
@@ -167,7 +167,7 @@ public static Type ResolveActualType(Type type)
 
             var actualType = type;
 
-            if (type.IsGenericType)
+            if (type.IsGenericType && typeof(Nullable<>).IsAssignableFrom(type.GetGenericTypeDefinition()))
             {
                 actualType = Nullable.GetUnderlyingType(type);
             }