diff --git a/Directory.Build.props b/Directory.Build.props index 2ba7fea..ce4934e 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -2,9 +2,10 @@ - 4.15.0 - 15.5.0 - 2.4.1 + 8.9.0 + 18.3.0 + 2.9.3 + 2.8.2 2.2.1 diff --git a/src/AutoMapper.Collection.EntityFramework.Tests/AutoMapper.Collection.EntityFramework.Tests.csproj b/src/AutoMapper.Collection.EntityFramework.Tests/AutoMapper.Collection.EntityFramework.Tests.csproj index 4d7ef98..867b080 100644 --- a/src/AutoMapper.Collection.EntityFramework.Tests/AutoMapper.Collection.EntityFramework.Tests.csproj +++ b/src/AutoMapper.Collection.EntityFramework.Tests/AutoMapper.Collection.EntityFramework.Tests.csproj @@ -18,7 +18,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/AutoMapper.Collection.EntityFramework/AutoMapper.Collection.EntityFramework.csproj b/src/AutoMapper.Collection.EntityFramework/AutoMapper.Collection.EntityFramework.csproj index 9f28cc7..99c3fd7 100644 --- a/src/AutoMapper.Collection.EntityFramework/AutoMapper.Collection.EntityFramework.csproj +++ b/src/AutoMapper.Collection.EntityFramework/AutoMapper.Collection.EntityFramework.csproj @@ -28,7 +28,7 @@ - + all diff --git a/src/AutoMapper.Collection.Tests/AutoMapper.Collection.Tests.csproj b/src/AutoMapper.Collection.Tests/AutoMapper.Collection.Tests.csproj index e78e5d0..5fc4882 100644 --- a/src/AutoMapper.Collection.Tests/AutoMapper.Collection.Tests.csproj +++ b/src/AutoMapper.Collection.Tests/AutoMapper.Collection.Tests.csproj @@ -1,7 +1,7 @@  - net8.0 + net8.0;net9.0;net10.0 AutoMapper.Collection.Tests AutoMapper.Collection false @@ -15,7 +15,7 @@ - + \ No newline at end of file diff --git a/src/AutoMapper.Collection.Tests/InheritanceWithCollectionTests.cs b/src/AutoMapper.Collection.Tests/InheritanceWithCollectionTests.cs index d534a12..d86717b 100644 --- a/src/AutoMapper.Collection.Tests/InheritanceWithCollectionTests.cs +++ b/src/AutoMapper.Collection.Tests/InheritanceWithCollectionTests.cs @@ -20,7 +20,7 @@ public void TypeMap_Should_include_base_types() var typePairs = new[]{ new TypePair(typeof(OrderDomain), typeof(OrderEf)) }; - typeMap.IncludedBaseTypes.ShouldBeEquivalentTo(typePairs); + typeMap.IncludedBaseTypes.Should().BeEquivalentTo(typePairs); } [Fact] @@ -33,7 +33,7 @@ public void TypeMap_Should_include_derivied_types() new TypePair(typeof(OnlineOrderDomain), typeof(OnlineOrderEf)), new TypePair(typeof(MailOrderDomain), typeof(MailOrderEf)) }; - typeMap.IncludedDerivedTypes.ShouldBeEquivalentTo(typePairs); + typeMap.IncludedDerivedTypes.Should().BeEquivalentTo(typePairs); } [Fact] @@ -52,10 +52,10 @@ public void Map_Should_ReturnOnlineOrderEf_When_ListIsOfTypeOrderEf() OrderEf orderEf = mappedRootEf.Orders[0]; orderEf.Should().BeOfType(); - orderEf.Id.ShouldBeEquivalentTo(orderDomain.Id); + orderEf.Id.Should().BeEquivalentTo(orderDomain.Id); var onlineOrderEf = (OnlineOrderEf)orderEf; - onlineOrderEf.Key.ShouldBeEquivalentTo(orderDomain.Key); + onlineOrderEf.Key.Should().BeEquivalentTo(orderDomain.Key); // ------------------------------------------------------------- // @@ -65,7 +65,7 @@ public void Map_Should_ReturnOnlineOrderEf_When_ListIsOfTypeOrderEf() mapper.Map(mappedRootEf, rootDomain); //assert again - rootDomain.OnlineOrders.Count.ShouldBeEquivalentTo(2); + rootDomain.OnlineOrders.Count.Should().Be(2); rootDomain.OnlineOrders.Last().Should().BeOfType(); //Assert.AreSame(rootDomain.OnlineOrders.First(), orderDomain); that doesn't matter when we map from EF to Domain @@ -88,7 +88,7 @@ public void Map_FromEfToDomain_And_AddAnOnlineOrderInTheDomainObject_And_ThenMap OnlineOrderDomain onlineOrderDomain = mappedRootDomain.OnlineOrders[0]; onlineOrderDomain.Should().BeOfType(); - onlineOrderEf.Id.ShouldBeEquivalentTo(onlineOrderEf.Id); + onlineOrderEf.Id.Should().BeEquivalentTo(onlineOrderEf.Id); // IMPORTANT ASSERT ------------------------------------------------------------- IMPORTANT ASSERT // @@ -107,7 +107,7 @@ public void Map_FromEfToDomain_And_AddAnOnlineOrderInTheDomainObject_And_ThenMap OrderEf newOnlineOrderEf = rootEf.Orders.Single(orderEf => orderEf.Id == "NewOnlineOrderId"); OrderEf newMailOrderEf = rootEf.Orders.Single(orderEf => orderEf.Id == "NewMailOrderId"); - rootEf.Orders.Count.ShouldBeEquivalentTo(4); + rootEf.Orders.Count.Should().Be(4); onlineOrderEf.Should().BeSameAs(existingOnlineOrderEf); mailOrderEf.Should().BeSameAs(existingMailOrderEf); diff --git a/src/AutoMapper.Collection.Tests/MapCollectionWithEqualityTests.cs b/src/AutoMapper.Collection.Tests/MapCollectionWithEqualityTests.cs index 1eaa3e0..31efa78 100644 --- a/src/AutoMapper.Collection.Tests/MapCollectionWithEqualityTests.cs +++ b/src/AutoMapper.Collection.Tests/MapCollectionWithEqualityTests.cs @@ -198,7 +198,7 @@ public void Should_Work_With_Conditionals() mapper.Map(new[] { dto }, entityCollection); - entity.ShouldBeEquivalentTo(entityCollection[0]); + entity.Should().BeEquivalentTo(entityCollection[0]); } public class Client @@ -251,7 +251,7 @@ public void Should_Work_With_Comparing_String_Types() mapper.Map(new[] { dto }, entityCollection); - entity.ShouldBeEquivalentTo(entityCollection[0]); + entity.Should().BeEquivalentTo(entityCollection[0]); } public class Charge diff --git a/src/AutoMapper.Collection.Tests/OptionsTests.cs b/src/AutoMapper.Collection.Tests/OptionsTests.cs index e9a2bf1..40dd858 100644 --- a/src/AutoMapper.Collection.Tests/OptionsTests.cs +++ b/src/AutoMapper.Collection.Tests/OptionsTests.cs @@ -39,8 +39,8 @@ public void Should_Retain_Options_Passed_In_Map() collectionMapper.Map(dtos, items, opts => opts.Items.Add("Test", 1)); normalMapper.Map(dtos, items, opts => opts.Items.Add("Test", 1)); - collectionTestValue.ShouldBeEquivalentTo(1); - normalTestValue.ShouldBeEquivalentTo(1); + collectionTestValue.Should().Be(1); + normalTestValue.Should().Be(1); } public class Thing diff --git a/src/AutoMapper.Collection/AutoMapper.Collection.csproj b/src/AutoMapper.Collection/AutoMapper.Collection.csproj index 04569e0..c707ac2 100644 --- a/src/AutoMapper.Collection/AutoMapper.Collection.csproj +++ b/src/AutoMapper.Collection/AutoMapper.Collection.csproj @@ -24,7 +24,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/version.props b/version.props index c09d86f..d460882 100644 --- a/version.props +++ b/version.props @@ -1,5 +1,5 @@ - 10.0.0 + 11.0.0