Skip to content

Commit e020354

Browse files
committed
Updated AutoMapper package to latest version
1 parent 9e988ea commit e020354

File tree

8 files changed

+24
-22
lines changed

8 files changed

+24
-22
lines changed

src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,10 @@
8686
<HintPath>..\..\packages\Autofac.WebApi.3.1.0\lib\net40\Autofac.Integration.WebApi.dll</HintPath>
8787
</Reference>
8888
<Reference Include="AutoMapper">
89-
<HintPath>..\..\packages\AutoMapper.3.1.1\lib\net40\AutoMapper.dll</HintPath>
89+
<HintPath>..\..\packages\AutoMapper.3.2.1\lib\net40\AutoMapper.dll</HintPath>
9090
</Reference>
9191
<Reference Include="AutoMapper.Net4">
92-
<HintPath>..\..\packages\AutoMapper.3.1.1\lib\net40\AutoMapper.Net4.dll</HintPath>
92+
<HintPath>..\..\packages\AutoMapper.3.2.1\lib\net40\AutoMapper.Net4.dll</HintPath>
9393
</Reference>
9494
<Reference Include="Microsoft.Data.Edm, Version=5.6.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
9595
<SpecificVersion>False</SpecificVersion>
@@ -312,6 +312,7 @@
312312
</FlavorProperties>
313313
</VisualStudio>
314314
</ProjectExtensions>
315+
<Import Project="..\..\packages\AutoMapper.3.2.1\tools\AutoMapper.targets" Condition="Exists('..\..\packages\AutoMapper.3.2.1\tools\AutoMapper.targets')" />
315316
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
316317
Other similar extension points exist, see Microsoft.Common.targets.
317318
<Target Name="BeforeBuild">

src/Plugins/SmartStore.WebApi/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<package id="Autofac" version="3.4.1" targetFramework="net45" />
44
<package id="Autofac.Mvc5" version="3.3.1" targetFramework="net45" />
55
<package id="Autofac.WebApi" version="3.1.0" targetFramework="net45" />
6-
<package id="AutoMapper" version="3.1.1" targetFramework="net45" />
6+
<package id="AutoMapper" version="3.2.1" targetFramework="net45" />
77
<package id="Microsoft.AspNet.Cors" version="5.1.2" targetFramework="net45" />
88
<package id="Microsoft.AspNet.Mvc" version="5.2.0" targetFramework="net45" />
99
<package id="Microsoft.AspNet.Razor" version="3.2.2" targetFramework="net45" />

src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,13 @@
7777
<SpecificVersion>False</SpecificVersion>
7878
<HintPath>..\..\packages\Autofac.WebApi.3.1.0\lib\net40\Autofac.Integration.WebApi.dll</HintPath>
7979
</Reference>
80-
<Reference Include="AutoMapper">
81-
<HintPath>..\..\packages\AutoMapper.3.1.1\lib\net40\AutoMapper.dll</HintPath>
80+
<Reference Include="AutoMapper, Version=3.2.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
81+
<SpecificVersion>False</SpecificVersion>
82+
<HintPath>..\..\packages\AutoMapper.3.2.1\lib\net40\AutoMapper.dll</HintPath>
8283
</Reference>
83-
<Reference Include="AutoMapper.Net4">
84-
<HintPath>..\..\packages\AutoMapper.3.1.1\lib\net40\AutoMapper.Net4.dll</HintPath>
84+
<Reference Include="AutoMapper.Net4, Version=3.2.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
85+
<SpecificVersion>False</SpecificVersion>
86+
<HintPath>..\..\packages\AutoMapper.3.2.1\lib\net40\AutoMapper.Net4.dll</HintPath>
8587
</Reference>
8688
<Reference Include="BundleTransformer.Core, Version=1.8.23.0, Culture=neutral, PublicKeyToken=973c344c93aac60d, processorArchitecture=MSIL">
8789
<SpecificVersion>False</SpecificVersion>
@@ -414,6 +416,7 @@
414416
</ItemGroup>
415417
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
416418
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
419+
<Import Project="..\..\packages\AutoMapper.3.2.1\tools\AutoMapper.targets" Condition="Exists('..\..\packages\AutoMapper.3.2.1\tools\AutoMapper.targets')" />
417420
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
418421
Other similar extension points exist, see Microsoft.Common.targets.
419422
<Target Name="BeforeBuild">

src/Presentation/SmartStore.Web.Framework/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<package id="Autofac" version="3.4.1" targetFramework="net45" />
55
<package id="Autofac.Mvc5" version="3.3.1" targetFramework="net45" />
66
<package id="Autofac.WebApi" version="3.1.0" targetFramework="net45" />
7-
<package id="AutoMapper" version="3.1.1" targetFramework="net45" />
7+
<package id="AutoMapper" version="3.2.1" targetFramework="net45" />
88
<package id="BundleTransformer.Core" version="1.8.23" targetFramework="net45" />
99
<package id="BundleTransformer.Less" version="1.8.25" targetFramework="net45" />
1010
<package id="CommonServiceLocator" version="1.2" targetFramework="net45" />

src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,13 @@
6262
<SpecificVersion>False</SpecificVersion>
6363
<HintPath>..\..\..\packages\Autofac.3.4.1\lib\net40\Autofac.dll</HintPath>
6464
</Reference>
65-
<Reference Include="AutoMapper, Version=3.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
65+
<Reference Include="AutoMapper, Version=3.2.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
6666
<SpecificVersion>False</SpecificVersion>
67-
<HintPath>..\..\..\packages\AutoMapper.3.1.1\lib\net40\AutoMapper.dll</HintPath>
67+
<HintPath>..\..\..\packages\AutoMapper.3.2.1\lib\net40\AutoMapper.dll</HintPath>
6868
</Reference>
69-
<Reference Include="AutoMapper.Net4, Version=3.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
69+
<Reference Include="AutoMapper.Net4, Version=3.2.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
7070
<SpecificVersion>False</SpecificVersion>
71-
<HintPath>..\..\..\packages\AutoMapper.3.1.1\lib\net40\AutoMapper.Net4.dll</HintPath>
71+
<HintPath>..\..\..\packages\AutoMapper.3.2.1\lib\net40\AutoMapper.Net4.dll</HintPath>
7272
</Reference>
7373
<Reference Include="FluentValidation, Version=5.0.0.1, Culture=neutral, processorArchitecture=MSIL">
7474
<SpecificVersion>False</SpecificVersion>
@@ -1249,4 +1249,5 @@
12491249
</VisualStudio>
12501250
</ProjectExtensions>
12511251
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
1252+
<Import Project="..\..\..\packages\AutoMapper.3.2.1\tools\AutoMapper.targets" Condition="Exists('..\..\..\packages\AutoMapper.3.2.1\tools\AutoMapper.targets')" />
12521253
</Project>

src/Presentation/SmartStore.Web/Administration/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Autofac" version="3.4.1" targetFramework="net45" />
4-
<package id="AutoMapper" version="3.1.1" targetFramework="net45" />
4+
<package id="AutoMapper" version="3.2.1" targetFramework="net45" />
55
<package id="FluentValidation" version="5.0.0.1" targetFramework="net45" />
66
<package id="jQuery" version="1.8.3" targetFramework="net45" />
77
<package id="Microsoft.AspNet.Mvc" version="5.2.0" targetFramework="net45" />

src/Tests/SmartStore.Web.MVC.Tests/SmartStore.Web.MVC.Tests.csproj

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,13 @@
6262
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
6363
</PropertyGroup>
6464
<ItemGroup>
65-
<Reference Include="AutoMapper, Version=3.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
65+
<Reference Include="AutoMapper, Version=3.2.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
6666
<SpecificVersion>False</SpecificVersion>
67-
<HintPath>..\..\packages\AutoMapper.3.1.1\lib\net40\AutoMapper.dll</HintPath>
67+
<HintPath>..\..\packages\AutoMapper.3.2.1\lib\net40\AutoMapper.dll</HintPath>
6868
</Reference>
69-
<Reference Include="AutoMapper.Net4, Version=3.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
69+
<Reference Include="AutoMapper.Net4, Version=3.2.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
7070
<SpecificVersion>False</SpecificVersion>
71-
<HintPath>..\..\packages\AutoMapper.3.1.1\lib\net40\AutoMapper.Net4.dll</HintPath>
71+
<HintPath>..\..\packages\AutoMapper.3.2.1\lib\net40\AutoMapper.Net4.dll</HintPath>
7272
</Reference>
7373
<Reference Include="FluentValidation, Version=5.0.0.1, Culture=neutral, processorArchitecture=MSIL">
7474
<SpecificVersion>False</SpecificVersion>
@@ -183,16 +183,13 @@
183183
</ProjectReference>
184184
</ItemGroup>
185185
<ItemGroup>
186-
<Content Include="..\..\packages\AutoMapper.3.1.1\lib\net40\AutoMapper.Net4.dll">
187-
<Link>AutoMapper.Net4.dll</Link>
188-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
189-
</Content>
190186
<Content Include="Admin\Readme.txt" />
191187
<Content Include="Framework\Readme.txt" />
192188
<Content Include="Public\Readme.txt" />
193189
</ItemGroup>
194190
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
195191
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
192+
<Import Project="..\..\packages\AutoMapper.3.2.1\tools\AutoMapper.targets" Condition="Exists('..\..\packages\AutoMapper.3.2.1\tools\AutoMapper.targets')" />
196193
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
197194
Other similar extension points exist, see Microsoft.Common.targets.
198195
<Target Name="BeforeBuild">

src/Tests/SmartStore.Web.MVC.Tests/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="3.2.1" targetFramework="net45" />
44
<package id="FluentValidation" version="5.0.0.1" targetFramework="net45" />
55
<package id="Microsoft.AspNet.Mvc" version="5.2.0" targetFramework="net45" />
66
<package id="Microsoft.AspNet.Razor" version="3.2.2" targetFramework="net45" />

0 commit comments

Comments
 (0)