Skip to content

Commit

Permalink
Merge pull request #182 from bitschubse/master
Browse files Browse the repository at this point in the history
Upgrade to AutoMapper 13.0
  • Loading branch information
lbargaoanu authored Feb 12, 2024
2 parents 66d79c9 + 8da34e2 commit 928f769
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 13 deletions.
8 changes: 0 additions & 8 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,4 @@
<EffortVersion>2.2.1</EffortVersion>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
<EFVersion>6.1.3</EFVersion>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' or '$(TargetFramework)' == 'netcoreapp3.0' ">
<EFVersion>6.3.0</EFVersion>
</PropertyGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<Description>Collection updating support for EntityFramework 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>
<Authors>Tyler Carlson</Authors>
<TargetFrameworks>netstandard2.1</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
<AssemblyName>AutoMapper.Collection.EntityFramework</AssemblyName>
<PackageId>AutoMapper.Collection.EntityFramework</PackageId>
<PackageIcon>icon.png</PackageIcon>
Expand All @@ -29,7 +29,7 @@

<ItemGroup>
<PackageReference Include="AutoMapper.Extensions.ExpressionMapping" Version="1.0.0" />
<PackageReference Include="EntityFramework" Version="$(EfVersion)" />
<PackageReference Include="EntityFramework" Version="6.3.0" />
<PackageReference Include="MinVer" Version="2.3.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
4 changes: 2 additions & 2 deletions src/AutoMapper.Collection/AutoMapper.Collection.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<Description>Collection Add/Remove/Update support for AutoMapper. AutoMapper.Collection adds EqualityComparison Expressions for TypeMaps to determine if Source and Destination type are equivalent to each other when mapping collections.</Description>
<Authors>Tyler Carlson</Authors>
<TargetFrameworks>netstandard2.1</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
<AssemblyName>AutoMapper.Collection</AssemblyName>
<PackageId>AutoMapper.Collection</PackageId>
<PackageIcon>icon.png</PackageIcon>
Expand All @@ -24,7 +24,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="AutoMapper" Version="[12.0.0, 13.0.0)" />
<PackageReference Include="AutoMapper" Version="[13.0.0, 14.0.0)" />
<PackageReference Include="MinVer" Version="2.3.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
2 changes: 1 addition & 1 deletion version.props
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project>
<PropertyGroup>
<VersionPrefix>9.0.0</VersionPrefix>
<VersionPrefix>10.0.0</VersionPrefix>
</PropertyGroup>
</Project>

0 comments on commit 928f769

Please sign in to comment.