Skip to content

Commit 5a11485

Browse files
jbogardjbogard
authored
Merge pull request #64 from AutoMapper/automapper-v11
Updating dependencies
2 parents d8c6ef8 + c386d8f commit 5a11485

File tree

6 files changed

+13
-53
lines changed

6 files changed

+13
-53
lines changed

‎.github/workflows/ci.yml

-4
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ jobs:
2121
uses: actions/setup-dotnet@v1
2222
with:
2323
dotnet-version: 3.1.x
24-
- name: Setup .NET Core 5
25-
uses: actions/setup-dotnet@v1
26-
with:
27-
dotnet-version: 5.x
2824
- name: Setup .NET Core 6
2925
uses: actions/setup-dotnet@v1
3026
with:

‎.github/workflows/release.yml

-4
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ jobs:
1818
uses: actions/setup-dotnet@v1
1919
with:
2020
dotnet-version: 3.1.x
21-
- name: Setup .NET Core 5
22-
uses: actions/setup-dotnet@v1
23-
with:
24-
dotnet-version: 5.x
2521
- name: Setup .NET Core 6
2622
uses: actions/setup-dotnet@v1
2723
with:

‎src/AutoMapper.Collection.EntityFrameworkCore.Tests/AutoMapper.Collection.EntityFrameworkCore.Tests.csproj

+4-14
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,26 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net462;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
55
<AssemblyName>AutoMapper.Collection.EntityFrameworkCore.Tests</AssemblyName>
66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88

99
<ItemGroup>
1010
<ProjectReference Include="..\AutoMapper.Collection.EntityFrameworkCore\AutoMapper.Collection.EntityFrameworkCore.csproj" />
1111
</ItemGroup>
12-
13-
<ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
14-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="2.1.14" />
15-
16-
<Reference Include="System" />
17-
<Reference Include="Microsoft.CSharp" />
18-
</ItemGroup>
1912

2013
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
21-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.0.1" />
22-
</ItemGroup>
23-
24-
<ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
2514
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.0" />
15+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
2616
</ItemGroup>
27-
17+
2818
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
2919
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.0" />
3020
</ItemGroup>
3121

3222
<ItemGroup>
33-
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.0.1" />
23+
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="11.0.0" />
3424
<PackageReference Include="FluentAssertions" Version="5.4.1" />
3525
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
3626
<PackageReference Include="xunit" Version="2.4.1" />

‎src/AutoMapper.Collection.EntityFrameworkCore.Tests/EntityFrameworkCoreTestsBase.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public void Persist_InsertOrUpdate_WhenEntityExist_ThenTheEntityShouldBeUpdated(
4848

4949
// Assert
5050
db.Things.Count().Should().Be(3);
51-
db.Things.FirstOrDefault(x => x.ID == item.ID).Title.Should().Be("Test");
51+
db.Things.FirstOrDefault(x => x.ID == item.ID)?.Title.Should().Be("Test");
5252
}
5353

5454
[Fact]
@@ -85,7 +85,7 @@ public void Persist_InsertOrUpdate_WhenEntityDoesNotExist_ThenTheEntityShouldBeI
8585
createdThing.Should().NotBeNull();
8686
db.Things.Count().Should().Be(4);
8787
var createdThingFromEF = db.Things.OrderByDescending(x => x.ID).FirstOrDefault();
88-
createdThingFromEF.Title.Should().Be("Test");
88+
createdThingFromEF?.Title.Should().Be("Test");
8989
createdThing.Should().BeEquivalentTo(createdThingFromEF);
9090
}
9191

@@ -161,7 +161,7 @@ public async Task Persist_InsertOrUpdateAsync_WhenEntityDoesNotExist_ThenTheEnti
161161
createdThing.Should().NotBeNull();
162162
(await db.Things.CountAsync()).Should().Be(4);
163163
var createdThingFromEF = await db.Things.OrderByDescending(x => x.ID).FirstOrDefaultAsync();
164-
createdThingFromEF.Title.Should().Be("Test");
164+
createdThingFromEF?.Title.Should().Be("Test");
165165
createdThing.Should().BeEquivalentTo(createdThingFromEF);
166166
}
167167

@@ -328,7 +328,7 @@ public void Persist_InsertOrUpdate_WhenSameEntity_ThenSavedEntityShouldBeSame()
328328

329329
// Assert
330330
db.Things.Count().Should().Be(3);
331-
db.Things.FirstOrDefault(x => x.ID == item.ID).Title.Should().Be(item.Title);
331+
db.Things.FirstOrDefault(x => x.ID == item.ID)?.Title.Should().Be(item.Title);
332332
}
333333

334334
[Fact]
@@ -414,7 +414,7 @@ public async Task Persist_InsertOrUpdateAsync_WhenSameEntity_ThenSavedEntityShou
414414

415415
// Assert
416416
(await db.Things.CountAsync()).Should().Be(3);
417-
(await db.Things.FirstOrDefaultAsync(x => x.ID == item.ID)).Title.Should().Be(item.Title);
417+
(await db.Things.FirstOrDefaultAsync(x => x.ID == item.ID))?.Title.Should().Be(item.Title);
418418
}
419419

420420
public virtual void Dispose() => db?.Dispose();

‎src/AutoMapper.Collection.EntityFrameworkCore/AutoMapper.Collection.EntityFrameworkCore.csproj

+4-14
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<Description>Collection updating support for EntityFrameworkCore with AutoMapper. Extends DBSet&lt;T&gt; with Persist&lt;TDto&gt;().InsertUpdate(dto) and Persist&lt;TDto&gt;().Delete(dto). Will find the matching object and will Insert/Update/Delete.</Description>
55
<Authors>Tyler Carlson</Authors>
6-
<TargetFrameworks>net461;netstandard2.0;net5.0;net6.0</TargetFrameworks>
6+
<TargetFrameworks>netstandard2.1;net6.0</TargetFrameworks>
77
<AssemblyName>AutoMapper.Collection.EntityFrameworkCore</AssemblyName>
88
<PackageId>AutoMapper.Collection.EntityFrameworkCore</PackageId>
99
<PackageIcon>icon.png</PackageIcon>
@@ -24,11 +24,11 @@
2424
</ItemGroup>
2525

2626
<ItemGroup>
27-
<PackageReference Include="AutoMapper.Collection" Version="[7.0.0,8.0.0)" />
27+
<PackageReference Include="AutoMapper.Collection" Version="[8.0.0,9.0.0)" />
28+
<PackageReference Include="AutoMapper.Extensions.ExpressionMapping" Version="[5.0.0,6.0.0)" />
2829
</ItemGroup>
2930

3031
<ItemGroup>
31-
<PackageReference Include="AutoMapper.Extensions.ExpressionMapping" Version="4.0.2" />
3232
<PackageReference Include="Roslynator.Analyzers" Version="2.3.0">
3333
<PrivateAssets>all</PrivateAssets>
3434
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -39,17 +39,7 @@
3939
</PackageReference>
4040
</ItemGroup>
4141

42-
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
43-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.1.14" />
44-
<Reference Include="System" />
45-
<Reference Include="Microsoft.CSharp" />
46-
</ItemGroup>
47-
48-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
49-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.1.14" />
50-
</ItemGroup>
51-
52-
<ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
42+
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
5343
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.0" />
5444
</ItemGroup>
5545

‎src/AutoMapper.Collection.EntityFrameworkCore/Extensions.cs

-12
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,6 @@ namespace AutoMapper.EntityFrameworkCore
88
{
99
public static class Extensions
1010
{
11-
/// <summary>
12-
/// Obsolete: Use Persist(IMapper) instead.
13-
/// Create a Persistence object for the <see cref="T:System.Data.Entity.DbSet`1"/> to have data persisted or removed from
14-
/// Uses static API's Mapper for finding TypeMap between classes
15-
/// </summary>
16-
/// <typeparam name="TSource">Source table type to be updated</typeparam>
17-
/// <param name="source">DbSet to be updated</param>
18-
/// <returns>Persistence object to Update or Remove data</returns>
19-
[Obsolete("Use Persist(IMapper) instead.", true)]
20-
public static IPersistence<TSource> Persist<TSource>(this DbSet<TSource> source)
21-
where TSource : class => throw new NotSupportedException();
22-
2311
/// <summary>
2412
/// Create a Persistence object for the <see cref="T:System.Data.Entity.DbSet`1"/> to have data persisted or removed from
2513
/// </summary>

0 commit comments

Comments
 (0)