Merge branch 'DapperLib:main' into main

Author: liuweizzuie

Dapper/SqlMapper.Async.cs

@@ -81,7 +81,7 @@ public static Task<dynamic> QuerySingleOrDefaultAsync(this IDbConnection cnn, Co
         /// <param name="commandTimeout">The command timeout (in seconds).</param>
         /// <param name="commandType">The type of command to execute.</param>
         /// <returns>
-        /// A sequence of data of <typeparamref name="T"/>; if a basic type (int, string, etc) is queried then the data from the first column in assumed, otherwise an instance is
+        /// A sequence of data of <typeparamref name="T"/>; if a basic type (int, string, etc) is queried then the data from the first column is assumed, otherwise an instance is
         /// created per row, and a direct column-name===member-name mapping is assumed (case insensitive).
         /// </returns>
         public static Task<IEnumerable<T>> QueryAsync<T>(this IDbConnection cnn, string sql, object param = null, IDbTransaction transaction = null, int? commandTimeout = null, CommandType? commandType = null) =>
@@ -276,7 +276,7 @@ public static Task<object> QuerySingleOrDefaultAsync(this IDbConnection cnn, Typ
         /// <param name="cnn">The connection to query on.</param>
         /// <param name="command">The command used to query on this connection.</param>
         /// <returns>
-        /// A sequence of data of <typeparamref name="T"/>; if a basic type (int, string, etc) is queried then the data from the first column in assumed, otherwise an instance is
+        /// A sequence of data of <typeparamref name="T"/>; if a basic type (int, string, etc) is queried then the data from the first column is assumed, otherwise an instance is
         /// created per row, and a direct column-name===member-name mapping is assumed (case insensitive).
         /// </returns>
         public static Task<IEnumerable<T>> QueryAsync<T>(this IDbConnection cnn, CommandDefinition command) =>

Readme.md

@@ -20,6 +20,18 @@ MyGet Pre-release feed: https://www.myget.org/gallery/dapper
 | [Dapper.SqlBuilder](https://www.nuget.org/packages/Dapper.SqlBuilder/) | [![Dapper.SqlBuilder](https://img.shields.io/nuget/v/Dapper.SqlBuilder.svg)](https://www.nuget.org/packages/Dapper.SqlBuilder/) | [![Dapper.SqlBuilder](https://img.shields.io/nuget/vpre/Dapper.SqlBuilder.svg)](https://www.nuget.org/packages/Dapper.SqlBuilder/) | [![Dapper.SqlBuilder](https://img.shields.io/nuget/dt/Dapper.SqlBuilder.svg)](https://www.nuget.org/packages/Dapper.SqlBuilder/) | [![Dapper.SqlBuilder MyGet](https://img.shields.io/myget/dapper/vpre/Dapper.SqlBuilder.svg)](https://www.myget.org/feed/dapper/package/nuget/Dapper.SqlBuilder) |
 | [Dapper.StrongName](https://www.nuget.org/packages/Dapper.StrongName/) | [![Dapper.StrongName](https://img.shields.io/nuget/v/Dapper.StrongName.svg)](https://www.nuget.org/packages/Dapper.StrongName/) | [![Dapper.StrongName](https://img.shields.io/nuget/vpre/Dapper.StrongName.svg)](https://www.nuget.org/packages/Dapper.StrongName/) | [![Dapper.StrongName](https://img.shields.io/nuget/dt/Dapper.StrongName.svg)](https://www.nuget.org/packages/Dapper.StrongName/) | [![Dapper.StrongName MyGet](https://img.shields.io/myget/dapper/vpre/Dapper.StrongName.svg)](https://www.myget.org/feed/dapper/package/nuget/Dapper.StrongName) |
 
+Package Purposes:
+* Dapper.EntityFramework
+  * Extension handlers for EntityFramework
+* Dapper.EntityFramework.StrongName
+  * Extension handlers for EntityFramework
+* Dapper.Rainbow
+  * Micro-ORM implemented on Dapper, provides CRUD helpers
+* Dapper.SqlBuilder
+  * Component for building SQL queries dynamically and composably
+* Dapper.StrongName
+  * High-performance micro-ORM supporting MySQL, Sqlite, SqlICE, and Firebird
+
 Features
 --------
 Dapper is a [NuGet library](https://www.nuget.org/packages/Dapper) that you can add in to your project that will extend your `IDbConnection` interface.
@@ -113,7 +125,7 @@ var foos = new List<Foo>
 {
     { new Foo { A = 1, B = 1 } }
     { new Foo { A = 2, B = 2 } }
-    { new Foo { A = 3, B = 3 } } 
+    { new Foo { A = 3, B = 3 } }
 };
 
 var count = connection.Execute(@"insert MyTable(colA, colB) values (@a, @b)", foos);

docs/index.md

@@ -1,4 +1,4 @@
-# Dapper - a simple object mapper for .Net
+# Dapper - a simple object mapper for .NET
 
 ## Overview
 

tests/Dapper.Tests/SqlBuilderTests.cs

@@ -52,9 +52,9 @@ public void TestSqlBuilderUpdateSet()
             var updatetime = DateTime.Parse("2020/01/01");
 
             var sb = new SqlBuilder()
-                   .Set("vip = @vip", new { vip })
-                   .Set("updatetime = @updatetime", new { updatetime })
-                   .Where("id = @id", new { id })
+                   .Set("Vip = @vip", new { vip })
+                   .Set("Updatetime = @updatetime", new { updatetime })
+                   .Where("Id = @id", new { id })
             ;
             var template = sb.AddTemplate("update #Users /**set**/ /**where**/");
 
@@ -69,7 +69,7 @@ public void TestSqlBuilderUpdateSet()
 
                 var result = connection.QueryFirst("select * from #Users where Id = 1");
 
-                Assert.Equal("update #Users SET vip = @vip , updatetime = @updatetime\n WHERE id = @id\n", template.RawSql);
+                Assert.Equal("update #Users SET Vip = @vip , Updatetime = @updatetime\n WHERE Id = @id\n", template.RawSql);
 
 
                 Assert.True((bool)result.Vip);

tests/Directory.Build.props

@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <ProjectReference Include="../../Dapper/Dapper.csproj" />
-    <PackageReference Include="GitHubActionsTestLogger" Version="1.1.2" />
+    <PackageReference Include="GitHubActionsTestLogger" Version="2.0.0" PrivateAssets="all" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />