Changes

Zek99 · Mar 15, 2017 · 6fbb573 · 6fbb573
1 parent 5043c2f
commit 6fbb573
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 29 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "fast-member"]
-	path = fast-member
-	url = https://github.com/mgravell/fast-member.git

diff --git a/SqlBulkTools/Helper/BulkOperationsHelper.cs b/SqlBulkTools/Helper/BulkOperationsHelper.cs
@@ -967,11 +967,11 @@ internal static void LoadFromTmpOutputTable<T>(SqlCommand command, string identi
                             /*p.SetValue(item, reader.GetInt32(1), null);*/
                             //  }
 
-                            if (identityMember.CanWrite)
+                            //if (identityMember.Type.CanWrite)
                                 typeAccessor[reader.GetInt32(1), identityColumn] = item;
 
-                            else
-                                throw new SqlBulkToolsException(GetPrivateSetterExceptionMessage(identityColumn));
+                           // else
+                               // throw new SqlBulkToolsException(GetPrivateSetterExceptionMessage(identityColumn));
 
                         }
 
@@ -1002,11 +1002,11 @@ internal static void LoadFromTmpOutputTable<T>(SqlCommand command, string identi
                         //else
                         //    throw new SqlBulkToolsException(GetPrivateSetterExceptionMessage(identityColumn));
 
-                        if (identityMember.CanWrite)
+                        //if (identityMember.CanWrite)
                             typeAccessor[reader.GetInt32(0), identityColumn] = items[counter];
 
-                        else
-                            throw new SqlBulkToolsException(GetPrivateSetterExceptionMessage(identityColumn));
+                        //else
+                            //throw new SqlBulkToolsException(GetPrivateSetterExceptionMessage(identityColumn));
 
                         counter++;
                     }
@@ -1051,10 +1051,10 @@ internal static async Task LoadFromTmpOutputTableAsync<T>(SqlCommand command, st
                             //else
                             //    throw new SqlBulkToolsException(GetPrivateSetterExceptionMessage(identityColumn));
 
-                            if (identityMember.CanWrite)
+                            //if (identityMember.CanWrite)
                                 typeAccessor[reader.GetInt32(1), identityColumn] = item;
 
-                            else
+                            //else
                                 throw new SqlBulkToolsException(GetPrivateSetterExceptionMessage(identityColumn));
                         }
 
@@ -1085,11 +1085,11 @@ internal static async Task LoadFromTmpOutputTableAsync<T>(SqlCommand command, st
                         //else
                         //    throw new SqlBulkToolsException(GetPrivateSetterExceptionMessage(identityColumn));
 
-                        if (identityMember.CanWrite)
+                        //if (identityMember.CanWrite)
                             typeAccessor[reader.GetInt32(0), identityColumn] = items[counter];
 
-                        else
-                            throw new SqlBulkToolsException(GetPrivateSetterExceptionMessage(identityColumn));
+                        //else
+                           // throw new SqlBulkToolsException(GetPrivateSetterExceptionMessage(identityColumn));
 
                         counter++;
                     }

diff --git a/SqlBulkTools/SqlBulkTools.csproj b/SqlBulkTools/SqlBulkTools.csproj
@@ -34,7 +34,15 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="FastMember, Version=1.0.0.9, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\FastMember.1.1.0\lib\net40\FastMember.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Microsoft.SqlServer.Types, Version=12.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL" />
+    <Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />
     <Reference Include="System.Core" />
@@ -52,21 +60,6 @@
     <Compile Include="BulkOperations\AbstractOperation.cs" />
     <Compile Include="BulkOperations\BulkCopyOptions.cs" />
     <Compile Include="Core\BulkOperationsUtility.cs" />
-    <Compile Include="fast-member\FastMember.Tests\Anons.cs" />
-    <Compile Include="fast-member\FastMember.Tests\BasicTests.cs" />
-    <Compile Include="fast-member\FastMember.Tests\ChainingPropertyDescriptor.cs" />
-    <Compile Include="fast-member\FastMember.Tests\DynamicTests.cs" />
-    <Compile Include="fast-member\FastMember.Tests\HyperTypeDescriptionProvider.cs" />
-    <Compile Include="fast-member\FastMember.Tests\HyperTypeDescriptor.cs" />
-    <Compile Include="fast-member\FastMember.Tests\Program.cs" />
-    <Compile Include="fast-member\FastMember.Tests\Properties\AssemblyInfo.cs" />
-    <Compile Include="fast-member\FastMember\CallSiteCache.cs" />
-    <Compile Include="fast-member\FastMember\MemberSet.cs" />
-    <Compile Include="fast-member\FastMember\ObjectAccessor.cs" />
-    <Compile Include="fast-member\FastMember\ObjectReader.cs" />
-    <Compile Include="fast-member\FastMember\Properties\AssemblyInfo.cs" />
-    <Compile Include="fast-member\FastMember\TypeAccessor.cs" />
-    <Compile Include="fast-member\FastMember\TypeHelpers.cs" />
     <Compile Include="Interface\IBulkOperations.cs" />
     <Compile Include="QueryOperations\Delete\DeleteQueryCondition.cs" />
     <Compile Include="QueryOperations\Delete\DeleteQueryReady.cs" />
@@ -137,6 +130,7 @@
     <None Include="fast-member\Nuget\FastMember.nuspec" />
     <None Include="fast-member\pack.cmd" />
     <None Include="fast-member\Readme.md" />
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/SqlBulkTools/packages.config b/SqlBulkTools/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="FastMember" version="1.1.0" targetFramework="net45" />
+</packages>