Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="AutoMapper.Extensions.ExpressionMapping" Version="[10.0.0,11.0.0)" />
<PackageReference Include="AutoMapper.Extensions.ExpressionMapping" Version="[10.1.0,11.0.0)" />
Comment thread
BlaiseD marked this conversation as resolved.
<PackageReference Include="LogicBuilder.Expressions.Utils" Version="7.0.0" />
<PackageReference Include="Microsoft.AspNetCore.OData" Version="9.4.1" />
<PackageReference Include="MinVer" Version="6.0.0">
Expand Down
5 changes: 4 additions & 1 deletion AutoMapper.AspNetCore.OData.EFCore/QueryableExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
{
public static class QueryableExtensions
{
[Obsolete("Use \"Task<IQueryable<TModel>> GetQueryAsync<TModel, TData>(this IQueryable<TData> query, IMapper mapper, ODataQueryOptions<TModel> options, QuerySettings querySettings = null)\" or \"IQueryable<TModel> GetQuery<TModel, TData>(this IQueryable<TData> query, IMapper mapper, ODataQueryOptions<TModel> options, QuerySettings querySettings = null)\" instead.")]
Comment thread
BlaiseD marked this conversation as resolved.
public static ICollection<TModel> Get<TModel, TData>(this IQueryable<TData> query, IMapper mapper, ODataQueryOptions<TModel> options, QuerySettings querySettings = null)
where TModel : class
{
Expand All @@ -31,6 +32,7 @@
);
}

[Obsolete("Use \"Task<IQueryable<TModel>> GetQueryAsync<TModel, TData>(this IQueryable<TData> query, IMapper mapper, ODataQueryOptions<TModel> options, QuerySettings querySettings = null)\" or \"IQueryable<TModel> GetQuery<TModel, TData>(this IQueryable<TData> query, IMapper mapper, ODataQueryOptions<TModel> options, QuerySettings querySettings = null)\" instead.")]
public static async Task<ICollection<TModel>> GetAsync<TModel, TData>(this IQueryable<TData> query, IMapper mapper, ODataQueryOptions<TModel> options, QuerySettings querySettings = null)
where TModel : class
{
Expand Down Expand Up @@ -72,6 +74,7 @@
return query.GetQueryable(mapper, options, querySettings, filter);
}

[Obsolete("This method was meant for internal use. The equivalent GetQueryable methods are private.")]
public static ICollection<TModel> Get<TModel, TData>(this IQueryable<TData> query, IMapper mapper,
Expression<Func<TModel, bool>> filter = null,
Expression<Func<IQueryable<TModel>, IQueryable<TModel>>> queryFunc = null,
Expand All @@ -81,7 +84,7 @@
query.GetDataQuery(mapper, filter, queryFunc, includeProperties).ToList()
).ToList();


[Obsolete("This method was meant for internal use. The equivalent GetQueryable methods are private.")]
public static async Task<ICollection<TModel>> GetAsync<TModel, TData>(this IQueryable<TData> query, IMapper mapper,
Expression<Func<TModel, bool>> filter = null,
Expression<Func<IQueryable<TModel>, IQueryable<TModel>>> queryFunc = null,
Expand Down Expand Up @@ -111,7 +114,7 @@
{
Expression<Func<TData, bool>> f = mapper.MapExpression<Expression<Func<TData, bool>>>(filter);
Func<IQueryable<TData>, IQueryable<TData>> mappedQueryFunc = mapper.MapExpression<Expression<Func<IQueryable<TData>, IQueryable<TData>>>>(queryFunc)?.Compile();
ICollection<Expression<Func<IQueryable<TData>, IIncludableQueryable<TData, object>>>> includes = mapper.MapIncludesList<Expression<Func<IQueryable<TData>, IIncludableQueryable<TData, object>>>>(includeProperties);

Check warning on line 117 in AutoMapper.AspNetCore.OData.EFCore/QueryableExtensions.cs

View workflow job for this annotation

GitHub Actions / build

'MapperExtensions.MapIncludesList<TDestDelegate>(IMapper, IEnumerable<LambdaExpression>)' is obsolete: 'Use ProjectTo with expansions instead of IMapper.MapIncludesList.'

Check warning on line 117 in AutoMapper.AspNetCore.OData.EFCore/QueryableExtensions.cs

View workflow job for this annotation

GitHub Actions / build

'MapperExtensions.MapIncludesList<TDestDelegate>(IMapper, IEnumerable<LambdaExpression>)' is obsolete: 'Use ProjectTo with expansions instead of IMapper.MapIncludesList.'

Check warning on line 117 in AutoMapper.AspNetCore.OData.EFCore/QueryableExtensions.cs

View workflow job for this annotation

GitHub Actions / build

'MapperExtensions.MapIncludesList<TDestDelegate>(IMapper, IEnumerable<LambdaExpression>)' is obsolete: 'Use ProjectTo with expansions instead of IMapper.MapIncludesList.'

Check warning on line 117 in AutoMapper.AspNetCore.OData.EFCore/QueryableExtensions.cs

View workflow job for this annotation

GitHub Actions / build

'MapperExtensions.MapIncludesList<TDestDelegate>(IMapper, IEnumerable<LambdaExpression>)' is obsolete: 'Use ProjectTo with expansions instead of IMapper.MapIncludesList.'

Check warning on line 117 in AutoMapper.AspNetCore.OData.EFCore/QueryableExtensions.cs

View workflow job for this annotation

GitHub Actions / build

'MapperExtensions.MapIncludesList<TDestDelegate>(IMapper, IEnumerable<LambdaExpression>)' is obsolete: 'Use ProjectTo with expansions instead of IMapper.MapIncludesList.'

Check warning on line 117 in AutoMapper.AspNetCore.OData.EFCore/QueryableExtensions.cs

View workflow job for this annotation

GitHub Actions / build

'MapperExtensions.MapIncludesList<TDestDelegate>(IMapper, IEnumerable<LambdaExpression>)' is obsolete: 'Use ProjectTo with expansions instead of IMapper.MapIncludesList.'

if (filter != null)
query = query.Where(f);
Expand Down
Loading