Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade to AutoMapper 13.0 #182

Merged
merged 4 commits into from
Feb 12, 2024
Merged

Upgrade to AutoMapper 13.0 #182

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b52d4fc
Upgrade to AutoMapper 13.0
Feb 9, 2024
5464b8b
target .net 6
lbargaoanu Feb 9, 2024
7509261
fix for target .net 6
Feb 9, 2024
8da34e2
chore: set one fix version for EntityFramework
Feb 12, 2024
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
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<EFVersion>6.1.3</EFVersion>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' or '$(TargetFramework)' == 'netcoreapp3.0' ">
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' or '$(TargetFramework)' == 'netcoreapp3.0' or '$(TargetFramework)' == 'net6.0' ">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think EFVersion can be removed. So two here and where it's used, just put the version.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've made the changes as suggested.

<EFVersion>6.3.0</EFVersion>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/AutoMapper.Collection.EntityFramework/AutoMapper.Collection.EntityFramework.csproj
View file
Open in desktop
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 Down
4 changes: 2 additions & 2 deletions src/AutoMapper.Collection/AutoMapper.Collection.csproj
View file
Open in desktop
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
View file
Open in desktop
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>