Merge pull request #73 from jehhynes/master

Upgrade to Dapper 1.50.2
programcsharp · Sep 14, 2016 · 7a2d33b · 7a2d33b
2 parents 8a0dbf4 + d38aca6
commit 7a2d33b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/Build/CommonAssemblyInfo.cs b/Build/CommonAssemblyInfo.cs
@@ -15,6 +15,6 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.5.12")]
-[assembly: AssemblyFileVersion("1.5.12")]
+[assembly: AssemblyVersion("1.5.13")]
+[assembly: AssemblyFileVersion("1.5.13")]
 //[assembly: AssemblyInformationalVersion("1.4.5-editlyalpha2")]
diff --git a/Build/Griddly.Core.nuspec b/Build/Griddly.Core.nuspec
@@ -15,7 +15,7 @@
     <dependencies> 
       <group>
         <dependency id="CsvHelper" version="2.4.0" />
-        <dependency id="Dapper" version="1.13.0" />
+        <dependency id="Dapper" version="1.50.2" />
         <dependency id="EPPlus" version="3.1.3.3" />
       </group>
     </dependencies>

diff --git a/Griddly.Mvc/Griddly.Mvc.csproj b/Griddly.Mvc/Griddly.Mvc.csproj
@@ -39,8 +39,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\CsvHelper.2.4.1\lib\net40-client\CsvHelper.dll</HintPath>
     </Reference>
-    <Reference Include="Dapper">
-      <HintPath>..\packages\Dapper.1.13\lib\net45\Dapper.dll</HintPath>
+    <Reference Include="Dapper, Version=1.50.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Dapper.1.50.2\lib\net45\Dapper.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="EPPlus">
       <HintPath>..\packages\EPPlus.3.1.3.3\lib\net35\EPPlus.dll</HintPath>

diff --git a/Griddly.Mvc/packages.config b/Griddly.Mvc/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="CsvHelper" version="2.4.1" targetFramework="net45" />
-  <package id="Dapper" version="1.13" targetFramework="net45" />
+  <package id="Dapper" version="1.50.2" targetFramework="net45" />
   <package id="EPPlus" version="3.1.3.3" targetFramework="net45" />
   <package id="Microsoft.AspNet.Mvc" version="4.0.30506.0" targetFramework="net45" />
   <package id="Microsoft.AspNet.Razor" version="2.0.20710.0" targetFramework="net45" />