Update nuget packages, fix some merge issues

Author: ericdc1

Dapper.SimpleCRUD/Dapper.SimpleCRUD.csproj

@@ -5,12 +5,12 @@
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
-    <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
   </ItemGroup>
 
 
   <ItemGroup>
-    <PackageReference Include="Dapper" Version="2.0.4" />
+    <PackageReference Include="Dapper" Version="2.0.78" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">

Dapper.SimpleCRUD/SimpleCRUD.cs

@@ -91,6 +91,12 @@ public static void SetDialect(Dialect dialect)
                     _getIdentitySql = string.Format("SELECT LAST_INSERT_ID() AS id");
                     _getPagedListSql = "Select {SelectColumns} from {TableName} {WhereClause} Order By {OrderBy} LIMIT {Offset},{RowsPerPage}";
                     break;
+                case Dialect.Oracle:
+                    _dialect = Dialect.Oracle;
+                    _encapsulation = "\"{0}\"";
+                    _getIdentitySql = "";
+                    _getPagedListSql = "SELECT * FROM (SELECT ROWNUM PagedNUMBER, u.* FROM(SELECT {SelectColumns} from {TableName} {WhereClause} Order By {OrderBy}) u) WHERE PagedNUMBER BETWEEN (({PageNumber}-1) * {RowsPerPage} + 1) AND ({PageNumber} * {RowsPerPage})";
+                    break;
                 case Dialect.DB2:
                     _dialect = Dialect.DB2;
                     _encapsulation = "\"{0}\"";
@@ -1002,6 +1008,7 @@ public enum Dialect
             PostgreSQL,
             SQLite,
             MySQL,
+            Oracle,
             DB2
         }
 

Dapper.SimpleCRUDTests/Dapper.SimpleCRUDTests.csproj

@@ -8,11 +8,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
-    <PackageReference Include="MySql.Data" Version="8.0.11" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="MySql.Data" Version="8.0.23" />
     <PackageReference Include="Npgsql" Version="4.0.2" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.6.1" />
-    <PackageReference Include="System.Data.SQLite" Version="1.0.109.2" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.2" />
+    <PackageReference Include="System.Data.SQLite" Version="1.0.113.7" />
 	<PackageReference Include="IBM.Data.DB2.Core" Version="1.2.2.100" />
 	<PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
 	<PackageReference Include="System.Runtime.Handles" Version="4.3.0" />
@@ -24,7 +24,7 @@
 
 
   <ItemGroup>
-    <PackageReference Include="Dapper" Version="2.0.4" />
+    <PackageReference Include="Dapper" Version="2.0.78" />
   </ItemGroup>
 
   <ItemGroup>

Dapper.SimpleCRUDTests/Program.cs

@@ -16,11 +16,11 @@ class Program
 
         static void Main()
         {
-            //Setup();
-            //RunTests();
+            Setup();
+            RunTests();
 
-            //SetupSqLite();
-            //RunTestsSqLite();
+            SetupSqLite();
+            RunTestsSqLite();
 
             //PostgreSQL tests assume port 5432 with username postgres and password postgrespass
             //they are commented out by default since postgres setup is required to run tests
@@ -34,8 +34,8 @@ static void Main()
 
             //DB2 tests assume port 50000 with username db2admin and password db2admin
             //they are commented out by default since db2 setup is required to run tests
-            SetupDB2();
-            RunTestsDB2();
+            //SetupDB2();
+            //RunTestsDB2();
         }
 
         private static void Setup()