Skip to content

Commit f6c0c3a

Browse files
BlaiseDBlaiseD
authored
Merge pull request #91 from AutoMapper/RefactorAsync
Removing Task.Run from non-async methods and adding CancellationToken…
2 parents e5c3e49 + 82b223d commit f6c0c3a

File tree

19 files changed

+1147
-482
lines changed

19 files changed

+1147
-482
lines changed

‎AutoMapper.AspNet.OData.EF6/AutoMapper.AspNet.OData.EF6.csproj‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<PackageId>AutoMapper.AspNet.OData.EF6</PackageId>
77
<Description>Creates LINQ expressions from ODataQueryOptions and executes the query.</Description>
88
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
9-
<PackageReleaseNotes>Supporting EF6 through .NetStandard 2.1.</PackageReleaseNotes>
9+
<PackageReleaseNotes>Removing Task.Run form non-async calls. CancellationToken support. Restring page size Server-side.</PackageReleaseNotes>
1010
<PackageTags>linq expressions odata ef</PackageTags>
1111
<PackageIconUrl>https://s3.amazonaws.com/automapper/icon.png</PackageIconUrl>
1212
<RepositoryUrl>https://github.com/AutoMapper/AutoMapper.Extensions.OData</RepositoryUrl>
@@ -19,6 +19,7 @@
1919

2020
<ItemGroup>
2121
<Compile Include="..\AutoMapper.AspNetCore.OData.EF6\QueryableExtensions.cs" Link="QueryableExtensions.cs" />
22+
<Compile Include="..\AutoMapper.AspNetCore.OData.EFCore\AsyncSettings.cs" Link="AsyncSettings.cs" />
2223
<Compile Include="..\AutoMapper.AspNetCore.OData.EFCore\Constants.cs" Link="Constants.cs" />
2324
<Compile Include="..\AutoMapper.AspNetCore.OData.EFCore\CustomMethodCache.cs" Link="CustomMethodCache.cs" />
2425
<Compile Include="..\AutoMapper.AspNetCore.OData.EFCore\EdmTypeStructure.cs" Link="EdmTypeStructure.cs" />
@@ -41,9 +42,9 @@
4142
</ItemGroup>
4243

4344
<ItemGroup>
44-
<PackageReference Include="AutoMapper.Extensions.ExpressionMapping" Version="4.1.1-preview.1.3" />
45+
<PackageReference Include="AutoMapper.Extensions.ExpressionMapping" Version="[4.1.1,5.0.0)" />
4546
<PackageReference Include="EntityFramework" Version="6.2.0" />
46-
<PackageReference Include="LogicBuilder.Expressions.Utils" Version="4.0.2" />
47+
<PackageReference Include="LogicBuilder.Expressions.Utils" Version="[4.1.1,5.0.0)" />
4748
<PackageReference Include="Microsoft.AspNet.OData" Version="7.4.1" />
4849
<PackageReference Include="MinVer" Version="2.3.0">
4950
<PrivateAssets>all</PrivateAssets>

‎AutoMapper.AspNet.OData.EF6/ODataQueryOptionsExtensions.cs‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,37 +6,37 @@ namespace AutoMapper.AspNet.OData
66
{
77
internal static class ODataQueryOptionsExtensions
88
{
9-
/// <summary>Adds the expand options to the result.</summary>
10-
/// <typeparam name="TModel">The type of the model.</typeparam>
11-
/// <param name="options">The odata options.</param>
12-
/// <autogeneratedoc />
9+
/// <summary>
10+
/// Adds the expand options to the result.
11+
/// </summary>
12+
/// <typeparam name="TModel"></typeparam>
13+
/// <param name="options"></param>
1314
public static void AddExpandOptionsResult<TModel>(this ODataQueryOptions<TModel> options)
1415
{
1516
if (options.SelectExpand == null)
1617
return;
1718
options.Request.ODataProperties().SelectExpandClause = options.SelectExpand.SelectExpandClause;
1819
}
1920

20-
/// <summary>Adds the count options to the result.</summary>
21-
/// <typeparam name="TModel">The type of the model.</typeparam>
22-
/// <typeparam name="TData">The type of the entity.</typeparam>
23-
/// <param name="options">The odata options.</param>
24-
/// <param name="query"></param>
25-
/// <autogeneratedoc />
26-
public static void AddCountOptionsResult<TModel, TData>(this ODataQueryOptions<TModel> options, long longCount)
21+
/// <summary>
22+
/// Adds the count options to the result.
23+
/// </summary>
24+
/// <param name="options"></param>
25+
/// <param name="longCount"></param>
26+
public static void AddCountOptionsResult(this ODataQueryOptions options, long longCount)
2727
{
2828
if (options.Count?.Value != true)
2929
return;
3030

3131
options.Request.ODataProperties().TotalCount = longCount;
3232
}
3333

34-
/// <summary>Adds the next link options to the result.</summary>
35-
/// <typeparam name="TModel">The type of the model.</typeparam>
36-
/// <param name="options">The odata options.</param>
37-
/// <param name="pageSize">The page size.</param>
38-
/// <autogeneratedoc />
39-
public static void AddNextLinkOptionsResult<TModel>(this ODataQueryOptions<TModel> options, int pageSize)
34+
/// <summary>
35+
/// Adds the next link options to the result.
36+
/// </summary>
37+
/// <param name="options"></param>
38+
/// <param name="pageSize"></param>
39+
public static void AddNextLinkOptionsResult(this ODataQueryOptions options, int pageSize)
4040
{
4141
if (options.Request == null)
4242
return;

‎AutoMapper.AspNetCore.OData.EF6/AutoMapper.AspNetCore.OData.EF6.csproj‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<PackageId>AutoMapper.AspNetCore.OData.EF6</PackageId>
77
<Description>Creates LINQ expressions from ODataQueryOptions and executes the query.</Description>
88
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
9-
<PackageReleaseNotes>Supporting EF6 through .NetStandard 2.1.</PackageReleaseNotes>
9+
<PackageReleaseNotes>Removing Task.Run form non-async calls. CancellationToken support. Restring page size Server-side.</PackageReleaseNotes>
1010
<PackageTags>linq expressions odata efcore</PackageTags>
1111
<PackageIconUrl>https://s3.amazonaws.com/automapper/icon.png</PackageIconUrl>
1212
<RepositoryUrl>https://github.com/AutoMapper/AutoMapper.Extensions.OData</RepositoryUrl>
@@ -18,6 +18,7 @@
1818
</PropertyGroup>
1919

2020
<ItemGroup>
21+
<Compile Include="..\AutoMapper.AspNetCore.OData.EFCore\AsyncSettings.cs" Link="AsyncSettings.cs" />
2122
<Compile Include="..\AutoMapper.AspNetCore.OData.EFCore\Constants.cs" Link="Constants.cs" />
2223
<Compile Include="..\AutoMapper.AspNetCore.OData.EFCore\CustomMethodCache.cs" Link="CustomMethodCache.cs" />
2324
<Compile Include="..\AutoMapper.AspNetCore.OData.EFCore\EdmTypeStructure.cs" Link="EdmTypeStructure.cs" />
@@ -41,9 +42,9 @@
4142
</ItemGroup>
4243

4344
<ItemGroup>
44-
<PackageReference Include="AutoMapper.Extensions.ExpressionMapping" Version="4.1.1-preview.1.3" />
45+
<PackageReference Include="AutoMapper.Extensions.ExpressionMapping" Version="[4.1.1,5.0.0)" />
4546
<PackageReference Include="EntityFramework" Version="6.3.0" />
46-
<PackageReference Include="LogicBuilder.Expressions.Utils" Version="4.0.2" />
47+
<PackageReference Include="LogicBuilder.Expressions.Utils" Version="[4.1.1,5.0.0)" />
4748
<PackageReference Include="Microsoft.AspNetCore.OData" Version="7.4.1" />
4849
<PackageReference Include="MinVer" Version="2.3.0">
4950
<PrivateAssets>all</PrivateAssets>

0 commit comments

Comments
 (0)