Merge branch 'master' of https://github.com/MikaelEliasson/EntityFramework.Utilities.git

Author: MikaelEliasson

EntityFramework.Utilities/EntityFramework.Utilities/MappingHelper.cs

@@ -198,7 +198,7 @@ public EfMapping(DbContext db)
                     {
                         tableMapping.TPHConfiguration.Mappings.Add(
                             getClr(item.Fragments[0]),
-                            GetNonPublicPropertyValue(item.Fragments[0].Conditions[0], "Value").ToString()
+                            ((ValueConditionMapping)item.Fragments[0].Conditions[0]).Value.ToString()
                             );
                     }
                 }
@@ -245,14 +245,6 @@ private Type GetClrTypeFromTypeMapping(MetadataWorkspace metadata, ObjectItemCol
             return GetClrType(metadata, objectItemCollection, mapping.EntityType ?? mapping.IsOfEntityTypes.First());
         }
 
-
-        static object GetNonPublicPropertyValue(object o, string propertyName)
-        {
-            return o.GetType()
-              .GetProperty(propertyName, BindingFlags.NonPublic | BindingFlags.Instance)
-              .GetValue(o, null);
-        }
-
         private static dynamic GetProperty(string property, object instance)
         {
             var type = instance.GetType();

EntityFramework.Utilities/PerformanceTests/PerformanceTests.csproj

@@ -34,11 +34,11 @@
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\EntityFramework.6.1.1\lib\net40\EntityFramework.dll</HintPath>
+      <HintPath>..\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\EntityFramework.6.1.1\lib\net40\EntityFramework.SqlServer.dll</HintPath>
+      <HintPath>..\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
     <Reference Include="ServiceStack.Text">
       <HintPath>..\packages\ServiceStack.Text.3.8.3\lib\net35\ServiceStack.Text.dll</HintPath>

EntityFramework.Utilities/PerformanceTests/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="EntityFramework" version="6.1.1" targetFramework="net40" />
+  <package id="EntityFramework" version="6.1.3" targetFramework="net40" />
   <package id="ServiceStack.Text" version="3.8.3" />
 </packages>

EntityFramework.Utilities/Tests/Tests.csproj

@@ -37,11 +37,11 @@
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\EntityFramework.6.1.1\lib\net40\EntityFramework.dll</HintPath>
+      <HintPath>..\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\EntityFramework.6.1.1\lib\net40\EntityFramework.SqlServer.dll</HintPath>
+      <HintPath>..\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.SqlServerCompact">
       <HintPath>..\packages\EntityFramework.SqlServerCompact.6.0.2\lib\net40\EntityFramework.SqlServerCompact.dll</HintPath>

EntityFramework.Utilities/Tests/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="EntityFramework" version="6.1.1" targetFramework="net40" />
+  <package id="EntityFramework" version="6.1.3" targetFramework="net40" />
   <package id="EntityFramework.SqlServerCompact" version="6.0.2" targetFramework="net40" />
   <package id="Microsoft.SqlServer.Compact" version="4.0.8876.1" targetFramework="net40" />
   <package id="ServiceStack.Text" version="3.8.3" />