Skip to content

Commit c196308

Browse files
authored
Merge pull request #104 from AutoMapper/v2.2
Microsoft.AspNetCore.OData v8.0.1
2 parents 9550608 + 5ef8cc6 commit c196308

File tree

21 files changed

+184
-133
lines changed

21 files changed

+184
-133
lines changed

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@
1515
<AssemblyOriginatorKeyFile>..\AutoMapper.snk</AssemblyOriginatorKeyFile>
1616
<SignAssembly>true</SignAssembly>
1717
<MinVerTagPrefix>v</MinVerTagPrefix>
18+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
19+
<IncludeSymbols>true</IncludeSymbols>
20+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
21+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
22+
<Deterministic>true</Deterministic>
23+
<ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
1824
</PropertyGroup>
1925

2026
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -52,12 +58,13 @@
5258
<ItemGroup>
5359
<PackageReference Include="AutoMapper.Extensions.ExpressionMapping" Version="[4.1.1,5.0.0)" />
5460
<PackageReference Include="EntityFramework" Version="6.2.0" />
55-
<PackageReference Include="LogicBuilder.Expressions.Utils" Version="[4.1.1,5.0.0)" />
61+
<PackageReference Include="LogicBuilder.Expressions.Utils" Version="[4.1.2,5.0.0)" />
5662
<PackageReference Include="Microsoft.AspNet.OData" Version="7.4.1" />
57-
<PackageReference Include="MinVer" Version="2.3.0">
63+
<PackageReference Include="MinVer" Version="2.5.0">
5864
<PrivateAssets>all</PrivateAssets>
5965
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
6066
</PackageReference>
67+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
6168
</ItemGroup>
6269

6370
<ItemGroup>

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

Lines changed: 11 additions & 4 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 Microsoft.AspNetCore.OData v8.0.0-rc.</PackageReleaseNotes>
9+
<PackageReleaseNotes>Supporting Microsoft.AspNetCore.OData v8.0.1.</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>
@@ -15,6 +15,12 @@
1515
<AssemblyOriginatorKeyFile>..\AutoMapper.snk</AssemblyOriginatorKeyFile>
1616
<SignAssembly>true</SignAssembly>
1717
<MinVerTagPrefix>v</MinVerTagPrefix>
18+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
19+
<IncludeSymbols>true</IncludeSymbols>
20+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
21+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
22+
<Deterministic>true</Deterministic>
23+
<ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
1824
</PropertyGroup>
1925

2026
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.1|AnyCPU'">
@@ -60,12 +66,13 @@
6066
<ItemGroup>
6167
<PackageReference Include="AutoMapper.Extensions.ExpressionMapping" Version="[4.1.1,5.0.0)" />
6268
<PackageReference Include="EntityFramework" Version="6.3.0" />
63-
<PackageReference Include="LogicBuilder.Expressions.Utils" Version="[4.1.1,5.0.0)" />
64-
<PackageReference Include="Microsoft.AspNetCore.OData" Version="8.0.0-rc" />
65-
<PackageReference Include="MinVer" Version="2.3.0">
69+
<PackageReference Include="LogicBuilder.Expressions.Utils" Version="[4.1.2,5.0.0)" />
70+
<PackageReference Include="Microsoft.AspNetCore.OData" Version="8.0.1" />
71+
<PackageReference Include="MinVer" Version="2.5.0">
6672
<PrivateAssets>all</PrivateAssets>
6773
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
6874
</PackageReference>
75+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
6976
</ItemGroup>
7077

7178
<ItemGroup>

AutoMapper.AspNetCore.OData.EFCore/AutoMapper.AspNetCore.OData.EFCore.csproj

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<PackageId>AutoMapper.AspNetCore.OData.EFCore</PackageId>
77
<Description>Creates LINQ expressions from ODataQueryOptions and executes the query.</Description>
88
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
9-
<PackageReleaseNotes>Supporting Microsoft.AspNetCore.OData v8.0.0-rc.</PackageReleaseNotes>
9+
<PackageReleaseNotes>Supporting Microsoft.AspNetCore.OData v8.0.1.</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>
@@ -15,6 +15,12 @@
1515
<AssemblyOriginatorKeyFile>..\AutoMapper.snk</AssemblyOriginatorKeyFile>
1616
<SignAssembly>true</SignAssembly>
1717
<MinVerTagPrefix>v</MinVerTagPrefix>
18+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
19+
<IncludeSymbols>true</IncludeSymbols>
20+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
21+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
22+
<Deterministic>true</Deterministic>
23+
<ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
1824
</PropertyGroup>
1925

2026
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
@@ -27,13 +33,14 @@
2733

2834
<ItemGroup>
2935
<PackageReference Include="AutoMapper.Extensions.ExpressionMapping" Version="[4.1.1,5.0.0)" />
30-
<PackageReference Include="LogicBuilder.Expressions.Utils" Version="[4.1.1,5.0.0)" />
31-
<PackageReference Include="Microsoft.AspNetCore.OData" Version="8.0.0-rc" />
36+
<PackageReference Include="LogicBuilder.Expressions.Utils" Version="[4.1.2,5.0.0)" />
37+
<PackageReference Include="Microsoft.AspNetCore.OData" Version="8.0.1" />
3238
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
33-
<PackageReference Include="MinVer" Version="2.3.0">
39+
<PackageReference Include="MinVer" Version="2.5.0">
3440
<PrivateAssets>all</PrivateAssets>
3541
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3642
</PackageReference>
43+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
3744
</ItemGroup>
3845

3946
<ItemGroup>

AutoMapper.OData.EF6.Tests/AutoMapper.OData.EF6.Tests.csproj

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,16 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
1111
<PackageReference Include="xunit" Version="2.4.1" />
12-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
13-
<PackageReference Include="coverlet.collector" Version="1.2.0" />
12+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
13+
<PrivateAssets>all</PrivateAssets>
14+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
15+
</PackageReference>
16+
<PackageReference Include="coverlet.collector" Version="3.1.0">
17+
<PrivateAssets>all</PrivateAssets>
18+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
19+
</PackageReference>
1420
</ItemGroup>
1521

1622
<ItemGroup>

AutoMapper.OData.EF6.Tests/GetQuerySelectTests.cs

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
using Microsoft.AspNetCore.Builder;
66
using Microsoft.AspNetCore.OData;
77
using Microsoft.AspNetCore.OData.Query;
8-
using Microsoft.AspNetCore.Routing;
98
using Microsoft.Extensions.DependencyInjection;
109
using System;
1110
using System.Collections.Generic;
@@ -29,12 +28,18 @@ public GetQuerySelectTests()
2928
private void Initialize()
3029
{
3130
IServiceCollection services = new ServiceCollection();
32-
services.AddOData();
31+
IMvcCoreBuilder builder = new TestMvcCoreBuilder
32+
{
33+
Services = services
34+
};
35+
36+
builder.AddOData();
3337
services.AddTransient<TestDbContext>(_ => new TestDbContext())
3438
.AddSingleton<IConfigurationProvider>(new MapperConfiguration(cfg => cfg.AddMaps(typeof(GetTests).Assembly)))
3539
.AddTransient<IMapper>(sp => new Mapper(sp.GetRequiredService<IConfigurationProvider>(), sp.GetService))
3640
.AddTransient<IApplicationBuilder>(sp => new ApplicationBuilder(sp))
37-
.AddTransient<IRouteBuilder>(sp => new RouteBuilder(sp.GetRequiredService<IApplicationBuilder>()));
41+
.AddRouting()
42+
.AddLogging();
3843

3944
serviceProvider = services.BuildServiceProvider();
4045
}
@@ -182,8 +187,7 @@ private ODataQueryOptions<TModel> GetODataQueryOptions<TModel>(string query) whe
182187
_oDataQueryOptions = ODataHelpers.GetODataQueryOptions<TModel>
183188
(
184189
query,
185-
serviceProvider,
186-
serviceProvider.GetRequiredService<IRouteBuilder>()
190+
serviceProvider
187191
);
188192
}
189193

AutoMapper.OData.EF6.Tests/GetQueryTests.cs

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,17 @@
33
using AutoMapper.OData.EF6.Tests.Model;
44
using DAL.EF6;
55
using Domain.OData;
6+
using Microsoft.AspNetCore.Builder;
7+
using Microsoft.AspNetCore.OData;
68
using Microsoft.AspNetCore.OData.Extensions;
79
using Microsoft.AspNetCore.OData.Query;
8-
using Microsoft.AspNetCore.Builder;
9-
using Microsoft.AspNetCore.Routing;
1010
using Microsoft.Extensions.DependencyInjection;
1111
using System;
1212
using System.Collections.Generic;
1313
using System.Linq;
1414
using System.Threading;
1515
using System.Threading.Tasks;
1616
using Xunit;
17-
using Microsoft.AspNetCore.OData;
1817

1918
namespace AutoMapper.OData.EF6.Tests
2019
{
@@ -32,12 +31,18 @@ public GetQueryTests()
3231
private void Initialize()
3332
{
3433
IServiceCollection services = new ServiceCollection();
35-
services.AddOData();
34+
IMvcCoreBuilder builder = new TestMvcCoreBuilder
35+
{
36+
Services = services
37+
};
38+
39+
builder.AddOData();
3640
services.AddTransient<TestDbContext>(_ => new TestDbContext())
3741
.AddSingleton<IConfigurationProvider>(new MapperConfiguration(cfg => cfg.AddMaps(typeof(GetTests).Assembly)))
3842
.AddTransient<IMapper>(sp => new Mapper(sp.GetRequiredService<IConfigurationProvider>(), sp.GetService))
3943
.AddTransient<IApplicationBuilder>(sp => new ApplicationBuilder(sp))
40-
.AddTransient<IRouteBuilder>(sp => new RouteBuilder(sp.GetRequiredService<IApplicationBuilder>()));
44+
.AddRouting()
45+
.AddLogging();
4146

4247
serviceProvider = services.BuildServiceProvider();
4348
}
@@ -305,8 +310,7 @@ public async void BuildingExpandBuilderTenantExpandCityFilterOnNestedNestedPrope
305310
ODataQueryOptions<CoreBuilding> options = ODataHelpers.GetODataQueryOptions<CoreBuilding>
306311
(
307312
query,
308-
serviceProvider,
309-
serviceProvider.GetRequiredService<IRouteBuilder>()
313+
serviceProvider
310314
);
311315
Test(Get<CoreBuilding, TBuilding>(query, options));
312316
Test(await GetAsync<CoreBuilding, TBuilding>(query, options));
@@ -366,8 +370,7 @@ public async void BuildingExpandBuilderTenantExpandCityOrderByBuilderNameSkip3Ta
366370
ODataQueryOptions<CoreBuilding> options = ODataHelpers.GetODataQueryOptions<CoreBuilding>
367371
(
368372
query,
369-
serviceProvider,
370-
serviceProvider.GetRequiredService<IRouteBuilder>()
373+
serviceProvider
371374
);
372375
Test(Get<CoreBuilding, TBuilding>(query, options));
373376
Test(await GetAsync<CoreBuilding, TBuilding>(query, options));
@@ -388,8 +391,7 @@ public async void BuildingExpandBuilderTenantExpandCityOrderByBuilderNameSkip3Ta
388391
ODataQueryOptions<CoreBuilding> options = ODataHelpers.GetODataQueryOptions<CoreBuilding>
389392
(
390393
query,
391-
serviceProvider,
392-
serviceProvider.GetRequiredService<IRouteBuilder>()
394+
serviceProvider
393395
);
394396

395397
Test(Get<CoreBuilding, TBuilding>(query, options));
@@ -484,8 +486,7 @@ public async void BuildingWithTopAndSmallerPageSizeNextLink()
484486
ODataQueryOptions<CoreBuilding> options = ODataHelpers.GetODataQueryOptions<CoreBuilding>
485487
(
486488
query,
487-
serviceProvider,
488-
serviceProvider.GetRequiredService<IRouteBuilder>()
489+
serviceProvider
489490
);
490491

491492
Test(Get<CoreBuilding, TBuilding>(query, options, new QuerySettings { ODataSettings = new ODataSettings { HandleNullPropagation = HandleNullPropagationOption.False, PageSize = pageSize } }));
@@ -511,8 +512,7 @@ public async void BuildingWithTopAndLargerPageSizeNextLink()
511512
ODataQueryOptions<CoreBuilding> options = ODataHelpers.GetODataQueryOptions<CoreBuilding>
512513
(
513514
query,
514-
serviceProvider,
515-
serviceProvider.GetRequiredService<IRouteBuilder>()
515+
serviceProvider
516516
);
517517

518518
Test(Get<CoreBuilding, TBuilding>(query, options, new QuerySettings { ODataSettings = new ODataSettings { HandleNullPropagation = HandleNullPropagationOption.False, PageSize = pageSize } }));
@@ -917,8 +917,7 @@ private ODataQueryOptions<TModel> GetODataQueryOptions<TModel>(string query) whe
917917
_oDataQueryOptions = ODataHelpers.GetODataQueryOptions<TModel>
918918
(
919919
query,
920-
serviceProvider,
921-
serviceProvider.GetRequiredService<IRouteBuilder>()
920+
serviceProvider
922921
);
923922
}
924923

AutoMapper.OData.EF6.Tests/GetTests.cs

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
using Domain.OData;
55
using Microsoft.AspNetCore.Builder;
66
using Microsoft.AspNetCore.Http;
7+
using Microsoft.AspNetCore.Mvc.ApplicationParts;
78
using Microsoft.AspNetCore.OData;
89
using Microsoft.AspNetCore.OData.Extensions;
910
using Microsoft.AspNetCore.OData.Query;
10-
using Microsoft.AspNetCore.Routing;
1111
using Microsoft.Extensions.DependencyInjection;
1212
using Microsoft.OData.Edm;
1313
using Microsoft.OData.ModelBuilder;
@@ -35,12 +35,18 @@ public GetTests()
3535
private void Initialize()
3636
{
3737
IServiceCollection services = new ServiceCollection();
38-
services.AddOData();
38+
IMvcCoreBuilder builder = new TestMvcCoreBuilder
39+
{
40+
Services = services
41+
};
42+
43+
builder.AddOData();
3944
services.AddTransient<TestDbContext>(_ => new TestDbContext())
4045
.AddSingleton<IConfigurationProvider>(new MapperConfiguration(cfg => cfg.AddMaps(typeof(GetTests).Assembly)))
4146
.AddTransient<IMapper>(sp => new Mapper(sp.GetRequiredService<IConfigurationProvider>(), sp.GetService))
4247
.AddTransient<IApplicationBuilder>(sp => new ApplicationBuilder(sp))
43-
.AddTransient<IRouteBuilder>(sp => new RouteBuilder(sp.GetRequiredService<IApplicationBuilder>()));
48+
.AddRouting()
49+
.AddLogging();
4450

4551
serviceProvider = services.BuildServiceProvider();
4652
}
@@ -196,8 +202,7 @@ public async void BuildingExpandBuilderTenantExpandCityFilterOnNestedNestedPrope
196202
ODataQueryOptions<CoreBuilding> options = ODataHelpers.GetODataQueryOptions<CoreBuilding>
197203
(
198204
query,
199-
serviceProvider,
200-
serviceProvider.GetRequiredService<IRouteBuilder>()
205+
serviceProvider
201206
);
202207
Test(Get<CoreBuilding, TBuilding>(query, options));
203208
Test(await GetAsync<CoreBuilding, TBuilding>(query, options));
@@ -257,8 +262,7 @@ public async void BuildingExpandBuilderTenantExpandCityOrderByBuilderNameSkip3Ta
257262
ODataQueryOptions<CoreBuilding> options = ODataHelpers.GetODataQueryOptions<CoreBuilding>
258263
(
259264
query,
260-
serviceProvider,
261-
serviceProvider.GetRequiredService<IRouteBuilder>()
265+
serviceProvider
262266
);
263267
Test(Get<CoreBuilding, TBuilding>(query, options));
264268
Test(await GetAsync<CoreBuilding, TBuilding>(query, options));
@@ -279,8 +283,7 @@ public async void BuildingExpandBuilderTenantExpandCityOrderByBuilderNameSkip3Ta
279283
ODataQueryOptions<CoreBuilding> options = ODataHelpers.GetODataQueryOptions<CoreBuilding>
280284
(
281285
query,
282-
serviceProvider,
283-
serviceProvider.GetRequiredService<IRouteBuilder>()
286+
serviceProvider
284287
);
285288

286289
Test(Get<CoreBuilding, TBuilding>(query, options));
@@ -375,8 +378,7 @@ public async void BuildingWithTopAndSmallerPageSizeNextLink()
375378
ODataQueryOptions<CoreBuilding> options = ODataHelpers.GetODataQueryOptions<CoreBuilding>
376379
(
377380
query,
378-
serviceProvider,
379-
serviceProvider.GetRequiredService<IRouteBuilder>()
381+
serviceProvider
380382
);
381383

382384
Test(Get<CoreBuilding, TBuilding>(query, options, new QuerySettings { ODataSettings = new ODataSettings { HandleNullPropagation = HandleNullPropagationOption.False, PageSize = pageSize } }));
@@ -402,8 +404,7 @@ public async void BuildingWithTopAndLargerPageSizeNextLink()
402404
ODataQueryOptions<CoreBuilding> options = ODataHelpers.GetODataQueryOptions<CoreBuilding>
403405
(
404406
query,
405-
serviceProvider,
406-
serviceProvider.GetRequiredService<IRouteBuilder>()
407+
serviceProvider
407408
);
408409

409410
Test(Get<CoreBuilding, TBuilding>(query, options, new QuerySettings { ODataSettings = new ODataSettings { HandleNullPropagation = HandleNullPropagationOption.False, PageSize = pageSize } }));
@@ -517,8 +518,7 @@ private ODataQueryOptions<TModel> GetODataQueryOptions<TModel>(string query) whe
517518
_oDataQueryOptions = ODataHelpers.GetODataQueryOptions<TModel>
518519
(
519520
query,
520-
serviceProvider,
521-
serviceProvider.GetRequiredService<IRouteBuilder>()
521+
serviceProvider
522522
);
523523
}
524524

@@ -528,7 +528,7 @@ private ODataQueryOptions<TModel> GetODataQueryOptions<TModel>(string query) whe
528528

529529
public static class ODataHelpers
530530
{
531-
public static ODataQueryOptions<T> GetODataQueryOptions<T>(string queryString, IServiceProvider serviceProvider, IRouteBuilder routeBuilder) where T : class
531+
public static ODataQueryOptions<T> GetODataQueryOptions<T>(string queryString, IServiceProvider serviceProvider) where T : class
532532
{
533533
ODataConventionModelBuilder builder = new ODataConventionModelBuilder();
534534

@@ -564,4 +564,10 @@ static HttpRequest BuildRequest(HttpRequest request, Uri uri)
564564

565565
static readonly string BASEADDRESS = "http://localhost:16324";
566566
}
567+
568+
internal class TestMvcCoreBuilder : IMvcCoreBuilder
569+
{
570+
public ApplicationPartManager PartManager { get; set; }
571+
public IServiceCollection Services { get; set; }
572+
}
567573
}

AutoMapper.OData.EFCore.Tests/AutoMapper.OData.EFCore.Tests.csproj

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,12 @@
88

99
<ItemGroup>
1010
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.0" />
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
1212
<PackageReference Include="xunit" Version="2.4.1" />
13-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
13+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
14+
<PrivateAssets>all</PrivateAssets>
15+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
16+
</PackageReference>
1417
</ItemGroup>
1518

1619
<ItemGroup>

0 commit comments

Comments
 (0)