Skip to content

Commit 9e69278

Browse files
rafidzalrafidzal
committed
Updated the version of AutoMapper to the latest.
1 parent 51d7a0c commit 9e69278

21 files changed

Lines changed: 192 additions & 241 deletions

File tree

‎Code/Sif3Framework/Sif.Framework/Service/Mapper/MapperFactory.cs‎

Lines changed: 157 additions & 134 deletions
Large diffs are not rendered by default.

‎Code/Sif3Framework/Sif.Framework/Sif.Framework.csproj‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,9 @@
3434
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
3535
</PropertyGroup>
3636
<ItemGroup>
37-
<Reference Include="AutoMapper, Version=3.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
38-
<SpecificVersion>False</SpecificVersion>
39-
<HintPath>..\packages\AutoMapper.3.1.1\lib\net40\AutoMapper.dll</HintPath>
40-
</Reference>
41-
<Reference Include="AutoMapper.Net4, Version=3.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
42-
<SpecificVersion>False</SpecificVersion>
43-
<HintPath>..\packages\AutoMapper.3.1.1\lib\net40\AutoMapper.Net4.dll</HintPath>
37+
<Reference Include="AutoMapper, Version=6.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
38+
<HintPath>..\packages\AutoMapper.6.1.1\lib\net45\AutoMapper.dll</HintPath>
39+
<Private>True</Private>
4440
</Reference>
4541
<Reference Include="Iesi.Collections, Version=4.0.0.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
4642
<SpecificVersion>False</SpecificVersion>
@@ -249,10 +245,6 @@
249245
</None>
250246
</ItemGroup>
251247
<ItemGroup>
252-
<Content Include="..\packages\AutoMapper.3.1.1\lib\net40\AutoMapper.Net4.dll">
253-
<Link>AutoMapper.Net4.dll</Link>
254-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
255-
</Content>
256248
<EmbeddedResource Include="Persistence\NHibernate\Mapping\SifObjectBinding.hbm.xml" />
257249
<EmbeddedResource Include="Persistence\NHibernate\Mapping\ApplicationInfo.hbm.xml" />
258250
<EmbeddedResource Include="Persistence\NHibernate\Mapping\ApplicationRegister.hbm.xml" />

‎Code/Sif3Framework/Sif.Framework/packages.config‎

Lines changed: 1 addition & 1 deletion
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="3.1.1" targetFramework="net45" />
3+
<package id="AutoMapper" version="6.1.1" targetFramework="net45" />
44
<package id="Iesi.Collections" version="4.0.1.4000" targetFramework="net45" />
55
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net45" />
66
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net45" />

‎Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Consumer/Sif.Framework.Demo.Au.Consumer.csproj‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,9 @@
3535
<StartupObject>Sif.Framework.Demo.Au.Consumer.ConsumerApp</StartupObject>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="AutoMapper">
39-
<HintPath>..\packages\AutoMapper.3.1.1\lib\net40\AutoMapper.dll</HintPath>
40-
</Reference>
41-
<Reference Include="AutoMapper.Net4">
42-
<HintPath>..\packages\AutoMapper.3.1.1\lib\net40\AutoMapper.Net4.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>
40+
<Private>True</Private>
4341
</Reference>
4442
<Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
4543
<HintPath>..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
@@ -93,12 +91,6 @@
9391
<SubType>Designer</SubType>
9492
</None>
9593
</ItemGroup>
96-
<ItemGroup>
97-
<Content Include="..\packages\AutoMapper.3.1.1\lib\net40\AutoMapper.Net4.dll">
98-
<Link>AutoMapper.Net4.dll</Link>
99-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
100-
</Content>
101-
</ItemGroup>
10294
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
10395
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
10496
Other similar extension points exist, see Microsoft.Common.targets.

‎Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Consumer/packages.config‎

Lines changed: 1 addition & 1 deletion
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="3.1.1" targetFramework="net45" />
3+
<package id="AutoMapper" version="6.1.1" targetFramework="net45" />
44
<package id="log4net" version="2.0.8" targetFramework="net45" />
55
<package id="slf4net" version="0.1.32.1" targetFramework="net45" />
66
<package id="slf4net.log4net" version="0.1.32.1" targetFramework="net45" />

‎Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Provider/Sif.Framework.Demo.Au.Provider.csproj‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,9 @@
4343
<WarningLevel>4</WarningLevel>
4444
</PropertyGroup>
4545
<ItemGroup>
46-
<Reference Include="AutoMapper, Version=3.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
47-
<SpecificVersion>False</SpecificVersion>
48-
<HintPath>..\packages\AutoMapper.3.1.1\lib\net40\AutoMapper.dll</HintPath>
49-
</Reference>
50-
<Reference Include="AutoMapper.Net4, Version=3.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
51-
<SpecificVersion>False</SpecificVersion>
52-
<HintPath>..\packages\AutoMapper.3.1.1\lib\net40\AutoMapper.Net4.dll</HintPath>
46+
<Reference Include="AutoMapper, Version=6.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
47+
<HintPath>..\packages\AutoMapper.6.1.1\lib\net45\AutoMapper.dll</HintPath>
48+
<Private>True</Private>
5349
</Reference>
5450
<Reference Include="Iesi.Collections, Version=4.0.0.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
5551
<SpecificVersion>False</SpecificVersion>
@@ -124,10 +120,6 @@
124120
<Reference Include="System.EnterpriseServices" />
125121
</ItemGroup>
126122
<ItemGroup>
127-
<Content Include="..\packages\AutoMapper.3.1.1\lib\net40\AutoMapper.Net4.dll">
128-
<Link>AutoMapper.Net4.dll</Link>
129-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
130-
</Content>
131123
<Content Include="Global.asax" />
132124
<Content Include="SifFramework.cfg.xml">
133125
<SubType>Designer</SubType>

‎Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Provider/packages.config‎

Lines changed: 1 addition & 1 deletion
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="3.1.1" targetFramework="net45" />
3+
<package id="AutoMapper" version="6.1.1" targetFramework="net45" />
44
<package id="Iesi.Collections" version="4.0.1.4000" targetFramework="net45" />
55
<package id="log4net" version="2.0.8" targetFramework="net45" />
66
<package id="Microsoft.AspNet.WebApi" version="5.2.3" targetFramework="net45" />

‎Code/Sif3FrameworkDemo/Sif.Framework.Demo.Hits.Consumer/Sif.Framework.Demo.Hits.Consumer.csproj‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,8 @@
3232
<WarningLevel>4</WarningLevel>
3333
</PropertyGroup>
3434
<ItemGroup>
35-
<Reference Include="AutoMapper, Version=3.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
36-
<HintPath>..\packages\AutoMapper.3.1.1\lib\net40\AutoMapper.dll</HintPath>
37-
<Private>True</Private>
38-
</Reference>
39-
<Reference Include="AutoMapper.Net4, Version=3.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
40-
<HintPath>..\packages\AutoMapper.3.1.1\lib\net40\AutoMapper.Net4.dll</HintPath>
35+
<Reference Include="AutoMapper, Version=6.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
36+
<HintPath>..\packages\AutoMapper.6.1.1\lib\net45\AutoMapper.dll</HintPath>
4137
<Private>True</Private>
4238
</Reference>
4339
<Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
@@ -93,12 +89,6 @@
9389
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
9490
</None>
9591
</ItemGroup>
96-
<ItemGroup>
97-
<Content Include="..\packages\AutoMapper.3.1.1\lib\net40\AutoMapper.Net4.dll">
98-
<Link>AutoMapper.Net4.dll</Link>
99-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
100-
</Content>
101-
</ItemGroup>
10292
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
10393
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
10494
Other similar extension points exist, see Microsoft.Common.targets.

‎Code/Sif3FrameworkDemo/Sif.Framework.Demo.Hits.Consumer/packages.config‎

Lines changed: 1 addition & 1 deletion
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="3.1.1" targetFramework="net45" />
3+
<package id="AutoMapper" version="6.1.1" targetFramework="net45" />
44
<package id="log4net" version="2.0.8" targetFramework="net45" />
55
<package id="slf4net" version="0.1.32.1" targetFramework="net45" />
66
<package id="slf4net.log4net" version="0.1.32.1" targetFramework="net45" />

‎Code/Sif3FrameworkDemo/Sif.Framework.Demo.Setup/Sif.Framework.Demo.Setup.csproj‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,9 @@
5050
<StartupObject>Sif.Framework.Demo.Setup.DatabaseCreator</StartupObject>
5151
</PropertyGroup>
5252
<ItemGroup>
53-
<Reference Include="AutoMapper, Version=3.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
54-
<SpecificVersion>False</SpecificVersion>
55-
<HintPath>..\packages\AutoMapper.3.1.1\lib\net40\AutoMapper.dll</HintPath>
56-
</Reference>
57-
<Reference Include="AutoMapper.Net4, Version=3.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
58-
<SpecificVersion>False</SpecificVersion>
59-
<HintPath>..\packages\AutoMapper.3.1.1\lib\net40\AutoMapper.Net4.dll</HintPath>
53+
<Reference Include="AutoMapper, Version=6.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
54+
<HintPath>..\packages\AutoMapper.6.1.1\lib\net45\AutoMapper.dll</HintPath>
55+
<Private>True</Private>
6056
</Reference>
6157
<Reference Include="Iesi.Collections, Version=4.0.0.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
6258
<SpecificVersion>False</SpecificVersion>
@@ -117,10 +113,6 @@
117113
</BootstrapperPackage>
118114
</ItemGroup>
119115
<ItemGroup>
120-
<Content Include="..\packages\AutoMapper.3.1.1\lib\net40\AutoMapper.Net4.dll">
121-
<Link>AutoMapper.Net4.dll</Link>
122-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
123-
</Content>
124116
<Content Include="Data files\UK\Sif3DemoApp\EnvironmentRequest.xml">
125117
<SubType>Designer</SubType>
126118
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

0 commit comments

Comments
 (0)