Skip to content

Commit 346e431

Browse files
PanyushkinDPanyushkinD
PanyushkinD
authored and
PanyushkinD
committed
Upgrade AutoMapper and Mapster versions
1 parent ba53549 commit 346e431

13 files changed

Lines changed: 32 additions & 35 deletions

File tree

‎src/AutoMapper.ExtendedConverters.Benchmarks/AutoMapper.ExtendedConverters.Benchmarks.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
<WarningLevel>4</WarningLevel>
3434
</PropertyGroup>
3535
<ItemGroup>
36-
<Reference Include="AutoMapper, Version=4.2.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
37-
<HintPath>..\packages\AutoMapper.4.2.1\lib\net45\AutoMapper.dll</HintPath>
36+
<Reference Include="AutoMapper, Version=6.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
37+
<HintPath>..\packages\AutoMapper.6.1.1\lib\net45\AutoMapper.dll</HintPath>
3838
<Private>True</Private>
3939
</Reference>
4040
<Reference Include="BenchmarkDotNet, Version=0.9.3.0, Culture=neutral, processorArchitecture=MSIL">
@@ -44,8 +44,8 @@
4444
<Reference Include="Microsoft.Build" />
4545
<Reference Include="Microsoft.Build.Framework" />
4646
<Reference Include="Microsoft.Build.Utilities.v4.0" />
47-
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
48-
<HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
47+
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
48+
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
4949
<Private>True</Private>
5050
</Reference>
5151
<Reference Include="System" />

‎src/AutoMapper.ExtendedConverters.Benchmarks/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="AutoMapper" version="4.2.1" targetFramework="net452" />
3+
<package id="AutoMapper" version="6.1.1" targetFramework="net452" />
44
<package id="BenchmarkDotNet" version="0.9.3" targetFramework="net452" />
5-
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net452" />
5+
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net452" />
66
</packages>

‎src/AutoMapper.ExtendedConverters.Tests/AutoMapper.ExtendedConverters.Tests.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
<WarningLevel>4</WarningLevel>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="AutoMapper, Version=4.2.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
39-
<HintPath>..\packages\AutoMapper.4.2.1\lib\net45\AutoMapper.dll</HintPath>
38+
<Reference Include="AutoMapper, Version=6.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
39+
<HintPath>..\packages\AutoMapper.6.1.1\lib\net45\AutoMapper.dll</HintPath>
4040
<Private>True</Private>
4141
</Reference>
4242
<Reference Include="Microsoft.CSharp" />
@@ -61,15 +61,15 @@
6161
<Compile Include="ListConverterTests.cs" />
6262
<Compile Include="Properties\AssemblyInfo.cs" />
6363
</ItemGroup>
64-
<ItemGroup>
65-
<None Include="packages.config" />
66-
</ItemGroup>
6764
<ItemGroup>
6865
<ProjectReference Include="..\AutoMapper.ExtendedConverters\AutoMapper.ExtendedConverters.csproj">
6966
<Project>{8754f86b-0490-476b-97d3-1545f7938796}</Project>
7067
<Name>AutoMapper.ExtendedConverters</Name>
7168
</ProjectReference>
7269
</ItemGroup>
70+
<ItemGroup>
71+
<None Include="packages.config" />
72+
</ItemGroup>
7373
<Choose>
7474
<When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
7575
<ItemGroup>

‎src/AutoMapper.ExtendedConverters.Tests/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="AutoMapper" version="4.2.1" targetFramework="net452" />
3+
<package id="AutoMapper" version="6.1.1" targetFramework="net452" />
44
</packages>

‎src/AutoMapper.ExtendedConverters/AutoMapper.ExtendedConverters.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
<WarningLevel>4</WarningLevel>
3131
</PropertyGroup>
3232
<ItemGroup>
33-
<Reference Include="AutoMapper, Version=4.2.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
34-
<HintPath>..\packages\AutoMapper.4.2.1\lib\net45\AutoMapper.dll</HintPath>
33+
<Reference Include="AutoMapper, Version=6.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
34+
<HintPath>..\packages\AutoMapper.6.1.1\lib\net45\AutoMapper.dll</HintPath>
3535
<Private>True</Private>
3636
</Reference>
3737
<Reference Include="System" />

‎src/AutoMapper.ExtendedConverters/CollectionConverter.cs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,14 @@ public CollectionConverter(Func<TSrc, TKey> srcKey, Func<TDest, TKey> destKey)
1818
DestKey = destKey;
1919
}
2020

21-
public TDestCollection Convert(ResolutionContext context)
21+
public TDestCollection Convert(
22+
TSrcCollection srcCollection, TDestCollection destCollection, ResolutionContext context)
2223
{
23-
var srcCollection = (TSrcCollection)context.SourceValue;
24-
var destCollection = (TDestCollection)context.DestinationValue;
25-
2624
if (srcCollection == null) {
2725
return null;
2826
}
2927

30-
IMapper mapper = context.Engine.Mapper;
28+
IMapper mapper = context.Mapper;
3129

3230
TDestCollection result;
3331

‎src/AutoMapper.ExtendedConverters/CompiledConverter.cs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,15 @@ public class CompiledConverter<TSrc, TDest> : ITypeConverter<TSrc, TDest>
99
where TSrc : class
1010
where TDest : class, new()
1111
{
12-
public TDest Convert(ResolutionContext context)
12+
public TDest Convert(TSrc src, TDest dest, ResolutionContext context)
1313
{
14-
var src = (TSrc)context.SourceValue;
1514
if (src == null) {
1615
return null;
1716
}
18-
var dest = (TDest)context.DestinationValue ?? new TDest();
19-
MapProps(context.Engine.Mapper, src, dest);
17+
if (dest == null) {
18+
dest = new TDest();
19+
}
20+
MapProps(context.Mapper, src, dest);
2021
return dest;
2122
}
2223

‎src/AutoMapper.ExtendedConverters/ListConverter.cs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,14 @@ public ListConverter(Func<TSrc, TKey> srcKey, Func<TDest, TKey> destKey)
1515
DestKey = destKey;
1616
}
1717

18-
public List<TDest> Convert(ResolutionContext context)
18+
public List<TDest> Convert(
19+
List<TSrc> srcList, List<TDest> destList, ResolutionContext context)
1920
{
20-
var srcList = (List<TSrc>)context.SourceValue;
21-
var destList = (List<TDest>)context.DestinationValue;
22-
2321
if (srcList == null) {
2422
return null;
2523
}
2624

27-
IMapper mapper = context.Engine.Mapper;
25+
IMapper mapper = context.Mapper;
2826

2927
var result = new List<TDest>(srcList.Count);
3028

‎src/AutoMapper.ExtendedConverters/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="AutoMapper" version="4.2.1" targetFramework="net452" />
3+
<package id="AutoMapper" version="6.1.1" targetFramework="net452" />
44
</packages>

‎src/Mapster.CollectionChangeTracking.Tests/Mapster.CollectionChangeTracking.Tests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
<WarningLevel>4</WarningLevel>
3737
</PropertyGroup>
3838
<ItemGroup>
39-
<Reference Include="Mapster, Version=2.6.1.0, Culture=neutral, PublicKeyToken=2f39883af23c29a8, processorArchitecture=MSIL">
40-
<HintPath>..\packages\Mapster.2.6.1\lib\net45\Mapster.dll</HintPath>
39+
<Reference Include="Mapster, Version=3.1.1.0, Culture=neutral, PublicKeyToken=2f39883af23c29a8, processorArchitecture=MSIL">
40+
<HintPath>..\packages\Mapster.3.1.1\lib\net45\Mapster.dll</HintPath>
4141
<Private>True</Private>
4242
</Reference>
4343
<Reference Include="System" />

0 commit comments

Comments
 (0)