Update major version

examples/AspNetCoreWebAPI/AspNetCoreWebAPI.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 

src/Csg.ListQuery.AspNetCore/Csg.ListQuery.AspNetCore.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
@@ -18,4 +18,8 @@
     <ProjectReference Include="..\Csg.ListQuery\Csg.ListQuery.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Nerdbank.GitVersioning" Version="3.5.113" />
+  </ItemGroup>
+
 </Project>

src/Csg.ListQuery.Client.Abstractions/Csg.ListQuery.Client.Abstractions.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net461;net471;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <RootNamespace>Csg.ListQuery.Client</RootNamespace>
   </PropertyGroup>
@@ -10,4 +10,8 @@
     <ProjectReference Include="..\Csg.ListQuery.Server.Abstractions\Csg.ListQuery.Server.Abstractions.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Nerdbank.GitVersioning" Version="3.5.113" />
+  </ItemGroup>
+
 </Project>

src/Csg.ListQuery.JsonApi.Abstractions/Csg.ListQuery.JsonApi.Abstractions.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net461;net471;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 
@@ -13,4 +13,8 @@
     <ProjectReference Include="..\Csg.ListQuery.Server.Abstractions\Csg.ListQuery.Server.Abstractions.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Nerdbank.GitVersioning" Version="3.5.113" />
+  </ItemGroup>
+
 </Project>

src/Csg.ListQuery.Server.Abstractions/Csg.ListQuery.Server.Abstractions.csproj

@@ -1,12 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net461;net471;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Csg.ListQuery\Csg.ListQuery.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Nerdbank.GitVersioning" Version="3.5.113" />
+  </ItemGroup>
+
 </Project>

src/Csg.ListQuery.Sql/Csg.ListQuery.Sql.csproj

@@ -1,20 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net461;net471;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Csg.Data" Version="3.3.14-rc3" />
-    <PackageReference Include="Csg.Data.Dapper" Version="2.0.4-rc4" />
-    <PackageReference Include="Dapper" Version="1.60.6" />
+    <PackageReference Include="Csg.Data" Version="3.3.23" />
+    <PackageReference Include="Csg.Data.Dapper" Version="3.0.9-rc1" />
+    <PackageReference Include="Dapper" Version="2.0.123" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.4.1" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Csg.ListQuery\Csg.ListQuery.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Nerdbank.GitVersioning" Version="3.5.113" />
+  </ItemGroup>
+
 
 </Project>

src/Csg.ListQuery.Sql/DapperListDataAdapter.cs

@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace Csg.ListQuery.Sql
@@ -19,18 +20,18 @@ public DapperListDataAdapter(System.Data.IDbConnection connection, System.Data.I
             _transaction = transaction;
         }
 
-        public async Task<IEnumerable<T>> GetResultsAsync<T>(SqlStatementBatch batch, bool stream, int commandTimeout)
+        public async Task<IEnumerable<T>> GetResultsAsync<T>(SqlStatementBatch batch, bool stream, int commandTimeout, CancellationToken cancellationToken = default)
         {
             var cmdFlags = stream ? Dapper.CommandFlags.Pipelined : Dapper.CommandFlags.Buffered;
-            var cmd = batch.ToDapperCommand(_transaction, commandTimeout, commandFlags: cmdFlags);
+            var cmd = batch.ToDapperCommand(_transaction, commandTimeout, commandFlags: cmdFlags, cancellationToken);
 
             return await Dapper.SqlMapper.QueryAsync<T>(_connection, cmd).ConfigureAwait(false);
         }
 
-        public async Task<BatchResult<T>> GetTotalCountAndResultsAsync<T>(SqlStatementBatch batch, bool stream, int commandTimeout)
+        public async Task<BatchResult<T>> GetTotalCountAndResultsAsync<T>(SqlStatementBatch batch, bool stream, int commandTimeout, CancellationToken cancellationToken = default)
         {
             var cmdFlags = stream ? Dapper.CommandFlags.Pipelined : Dapper.CommandFlags.Buffered;
-            var cmd = batch.ToDapperCommand(_transaction, commandTimeout, commandFlags: cmdFlags);
+            var cmd = batch.ToDapperCommand(_transaction, commandTimeout, commandFlags: cmdFlags, cancellationToken);
 
             var result = new BatchResult<T>();
 

src/Csg.ListQuery.Sql/IListQueryDataAdapter.cs

@@ -4,15 +4,16 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace Csg.ListQuery.Sql
 {
     public interface IListQueryDataAdapter
     {
-        Task<IEnumerable<T>> GetResultsAsync<T>(SqlStatementBatch batch, bool stream, int commandTimeout);
+        Task<IEnumerable<T>> GetResultsAsync<T>(SqlStatementBatch batch, bool stream, int commandTimeout, CancellationToken cancellationToken = default);
 
-        Task<BatchResult<T>> GetTotalCountAndResultsAsync<T>(SqlStatementBatch batch, bool stream, int commandTimeout);
+        Task<BatchResult<T>> GetTotalCountAndResultsAsync<T>(SqlStatementBatch batch, bool stream, int commandTimeout, CancellationToken cancellationToken = default);
     }
 
     public class BatchResult<T>

src/Csg.ListQuery.Sql/ListQueryExtensions.cs

@@ -6,6 +6,7 @@
 using Csg.Data;
 using Csg.Data.Sql;
 using Csg.ListQuery.Sql.Internal;
+using System.Threading;
 
 namespace Csg.ListQuery.Sql
 {
@@ -152,7 +153,7 @@ public static IListQueryBuilder AfterApply(this IListQueryBuilder builder, Actio
                 action(e.Configuration, e.QueryBuilder);
             };
 
-            return builder;
+            return builder;                                   
         }
 
         public static void ApplyFilters(IListQueryBuilder listQuery, IDbQueryBuilder queryBuilder)
@@ -300,7 +301,7 @@ public static SqlStatementBatch Render(this Csg.ListQuery.Sql.IListQueryBuilder
             }
         }
 
-        public async static System.Threading.Tasks.Task<ListQueryResult<T>> GetResultAsync<T>(this Csg.ListQuery.Sql.IListQueryBuilder builder, bool getTotalWhenLimiting = true)
+        public async static System.Threading.Tasks.Task<ListQueryResult<T>> GetResultAsync<T>(this Csg.ListQuery.Sql.IListQueryBuilder builder, bool getTotalWhenLimiting = true, CancellationToken cancellationToken = default)
         {
             var stmt = builder.Render(getTotalWhenLimiting);
             int? totalCount = null;
@@ -313,11 +314,11 @@ public async static System.Threading.Tasks.Task<ListQueryResult<T>> GetResultAsy
 
             if (stmt.Count == 1)
             {
-                data = await builder.Configuration.DataAdapter.GetResultsAsync<T>(stmt, builder.Configuration.UseStreamingResult, builder.Configuration.QueryBuilder.CommandTimeout).ConfigureAwait(false);
+                data = await builder.Configuration.DataAdapter.GetResultsAsync<T>(stmt, builder.Configuration.UseStreamingResult, builder.Configuration.QueryBuilder.CommandTimeout, cancellationToken).ConfigureAwait(false);
             }
             else if (stmt.Count == 2)
             {
-                var batchResult = await builder.Configuration.DataAdapter.GetTotalCountAndResultsAsync<T>(stmt, builder.Configuration.UseStreamingResult, builder.Configuration.QueryBuilder.CommandTimeout).ConfigureAwait(false);
+                var batchResult = await builder.Configuration.DataAdapter.GetTotalCountAndResultsAsync<T>(stmt, builder.Configuration.UseStreamingResult, builder.Configuration.QueryBuilder.CommandTimeout, cancellationToken).ConfigureAwait(false);
                 data = batchResult.Items;
                 totalCount = batchResult.TotalCount;
             }

src/Csg.ListQuery/Csg.ListQuery.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net461;net471;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 
@@ -10,7 +10,11 @@
     <NoWarn>1701;1702;1591</NoWarn>
   </PropertyGroup>
   <ItemGroup>
+    <PackageReference Include="Csg.Data.Dapper" Version="3.0.9-rc1" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.1.0" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Update="Nerdbank.GitVersioning" Version="3.5.113" />
+  </ItemGroup>
 
 </Project>

tests/Csg.ListQuery.AspNetCore.Tests/Csg.ListQuery.AspNetCore.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>

tests/Csg.ListQuery.Tests/Csg.ListQuery.Tests.csproj

@@ -1,13 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
+    <PackageReference Include="Moq" Version="4.18.2" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.4.0" />
     <PackageReference Include="MSTest.TestFramework" Version="1.4.0" />
   </ItemGroup>

tests/Csg.ListQuery.Tests/ListQueryTests.cs

@@ -8,6 +8,10 @@
 using System.Data;
 using Csg.ListQuery.Tests.Mock;
 using Dapper;
+using System.Threading;
+using System;
+using System.Threading.Tasks;
+using Moq;
 
 namespace Csg.ListQuery.Tests
 {
@@ -33,7 +37,7 @@ public void Test_ListQuery_BuildThrowsExceptionWhenNoConfig()
             {
                 var stmt = ListQueryBuilder.Create(query, request)
                     .Apply();
-            });            
+            });
         }
 
         [TestMethod]
@@ -298,7 +302,7 @@ public void Test_ListQuery_InlineHandler()
         {
             var expectedSql = "SELECT * FROM [dbo].[Person] AS [t0] WHERE ([t0].[PersonID] IN (SELECT [t1].[PersonID] FROM [dbo].[PersonPhoneNumber] AS [t1] WHERE ([t1].[PhoneNumber] LIKE @p0) AND ([t1].[PersonID]=[t0].[PersonID])));";
             //                 SELECT * FROM [dbo].[Person] AS [t0] WHERE ([t0].[PersonID] IN (SELECT [t1].[PersonID] FROM [dbo].[PersonPhoneNumber] AS [t1] WHERE ([t1].[PhoneNumber] LIKE @p0) AND ([t1].[PersonID]=[t0].[PersonID])));
-            IDbQueryBuilder query = new Csg.Data.DbQueryBuilder("dbo.Person", new Mock.MockConnection());            
+            IDbQueryBuilder query = new Csg.Data.DbQueryBuilder("dbo.Person", new Mock.MockConnection());
             var queryDef = new ListQueryDefinition();
 
             queryDef.Filters = new List<ListFilter>(new ListFilter[] {
@@ -557,8 +561,10 @@ public void Test_ListQuery_FluentWithParametersFromQueryBuilder()
                 .ToDapperCommand();
 
             Assert.AreEqual(2, (dapperCmd.Parameters as DynamicParameters).ParameterNames.Count());
-                //.GetResultAsync<Person>().ConfigureAwait(false).GetAwaiter().GetResult();
+            //.GetResultAsync<Person>().ConfigureAwait(false).GetAwaiter().GetResult();
         }
 
+
     }
 }
+

version.json

@@ -1,6 +1,6 @@
 {
-  "version": "1.0-preview", // required (unless the "inherit" field is set to true and a parent version.json file sets this.)
-  "assemblyVersion": "1.0", // optional. Use when x.y for AssemblyVersionAttribute differs from the default version property.
+  "version": "2.0", // required (unless the "inherit" field is set to true and a parent version.json file sets this.)
+  "assemblyVersion": "2.0", // optional. Use when x.y for AssemblyVersionAttribute differs from the default version property.
   "nugetPackageVersion": {
     "semVer": 1 // optional. Set to either 1 or 2 to control how the NuGet package version string is generated. Default is 1.
   },