Skip to content

Commit fcbb4e4

Browse files
muratcakirmuratcakir
committed
Updated ASP.NET MVC 4 to MVC 5 (including dependent updates to AutoMapper, DotNetOpenAuth, FluentValidation etc.)
1 parent 17b3c51 commit fcbb4e4

93 files changed

Lines changed: 1013 additions & 1035 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/AssemblyVersionInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
[assembly: AssemblyVersion("1.2.1.0")]
1313

1414
[assembly: AssemblyFileVersion("1.2.1.0")]
15-
[assembly: AssemblyInformationalVersion("1.2.1.0")]
15+
[assembly: AssemblyInformationalVersion("1.3.0.0")]

‎src/Libraries/SmartStore.Core/SmartStore.Core.csproj‎

Lines changed: 20 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,11 @@
4242
<ItemGroup>
4343
<Reference Include="Autofac, Version=3.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
4444
<SpecificVersion>False</SpecificVersion>
45-
<HintPath>..\..\packages\Autofac.3.0.2\lib\net40\Autofac.dll</HintPath>
46-
</Reference>
47-
<Reference Include="Autofac.Configuration, Version=3.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
48-
<SpecificVersion>False</SpecificVersion>
49-
<HintPath>..\..\packages\Autofac.3.0.2\lib\net40\Autofac.Configuration.dll</HintPath>
45+
<HintPath>..\..\packages\Autofac.3.1.5\lib\net40\Autofac.dll</HintPath>
5046
</Reference>
5147
<Reference Include="Autofac.Integration.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
5248
<SpecificVersion>False</SpecificVersion>
53-
<HintPath>..\..\packages\Autofac.Mvc4.3.0.0\lib\net40\Autofac.Integration.Mvc.dll</HintPath>
49+
<HintPath>..\..\packages\Autofac.Mvc5.3.0.0\lib\net45\Autofac.Integration.Mvc.dll</HintPath>
5450
</Reference>
5551
<Reference Include="EntityFramework">
5652
<HintPath>..\..\packages\EntityFramework.5.0.0\lib\net45\EntityFramework.dll</HintPath>
@@ -77,29 +73,29 @@
7773
<Reference Include="System.Runtime.Caching" />
7874
<Reference Include="System.Runtime.Serialization" />
7975
<Reference Include="System.Web" />
80-
<Reference Include="System.Web.Helpers, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
81-
<Private>True</Private>
82-
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll</HintPath>
76+
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
77+
<SpecificVersion>False</SpecificVersion>
78+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.0.0\lib\net45\System.Web.Helpers.dll</HintPath>
8379
</Reference>
84-
<Reference Include="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
85-
<Private>True</Private>
86-
<HintPath>..\..\packages\Microsoft.AspNet.Mvc.4.0.20710.0\lib\net40\System.Web.Mvc.dll</HintPath>
80+
<Reference Include="System.Web.Mvc, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
81+
<SpecificVersion>False</SpecificVersion>
82+
<HintPath>..\..\packages\Microsoft.AspNet.Mvc.5.0.0\lib\net45\System.Web.Mvc.dll</HintPath>
8783
</Reference>
88-
<Reference Include="System.Web.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
89-
<Private>True</Private>
90-
<HintPath>..\..\packages\Microsoft.AspNet.Razor.2.0.20710.0\lib\net40\System.Web.Razor.dll</HintPath>
84+
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
85+
<SpecificVersion>False</SpecificVersion>
86+
<HintPath>..\..\packages\Microsoft.AspNet.Razor.3.0.0\lib\net45\System.Web.Razor.dll</HintPath>
9187
</Reference>
92-
<Reference Include="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
93-
<Private>True</Private>
94-
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.dll</HintPath>
88+
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
89+
<SpecificVersion>False</SpecificVersion>
90+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.0.0\lib\net45\System.Web.WebPages.dll</HintPath>
9591
</Reference>
96-
<Reference Include="System.Web.WebPages.Deployment, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
97-
<Private>True</Private>
98-
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>
92+
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
93+
<SpecificVersion>False</SpecificVersion>
94+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.0.0\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
9995
</Reference>
100-
<Reference Include="System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
101-
<Private>True</Private>
102-
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
96+
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
97+
<SpecificVersion>False</SpecificVersion>
98+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.0.0\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
10399
</Reference>
104100
<Reference Include="System.Xml.Linq" />
105101
<Reference Include="System.Data.DataSetExtensions" />

‎src/Libraries/SmartStore.Core/packages.config‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Autofac" version="3.0.2" targetFramework="net45" />
4-
<package id="Autofac.Mvc4" version="3.0.0" targetFramework="net45" />
3+
<package id="Autofac" version="3.1.5" targetFramework="net45" />
4+
<package id="Autofac.Mvc5" version="3.0.0" targetFramework="net45" />
55
<package id="fasterflect" version="2.1.0" targetFramework="net45" />
6-
<package id="Microsoft.AspNet.Mvc" version="4.0.20710.0" targetFramework="net45" />
7-
<package id="Microsoft.AspNet.Razor" version="2.0.20710.0" targetFramework="net45" />
8-
<package id="Microsoft.AspNet.WebPages" version="2.0.20710.0" targetFramework="net45" />
6+
<package id="Microsoft.AspNet.Mvc" version="5.0.0" targetFramework="net45" />
7+
<package id="Microsoft.AspNet.Razor" version="3.0.0" targetFramework="net45" />
8+
<package id="Microsoft.AspNet.WebPages" version="3.0.0" targetFramework="net45" />
99
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
1010
<package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
1111
<package id="System.Linq.Dynamic" version="1.0.0" targetFramework="net45" />

‎src/Libraries/SmartStore.Services/SmartStore.Services.csproj‎

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,7 @@
4242
<ItemGroup>
4343
<Reference Include="Autofac, Version=3.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
4444
<SpecificVersion>False</SpecificVersion>
45-
<HintPath>..\..\packages\Autofac.3.0.2\lib\net40\Autofac.dll</HintPath>
46-
</Reference>
47-
<Reference Include="Autofac.Configuration">
48-
<HintPath>..\..\packages\Autofac.3.0.2\lib\net40\Autofac.Configuration.dll</HintPath>
45+
<HintPath>..\..\packages\Autofac.3.1.5\lib\net40\Autofac.dll</HintPath>
4946
</Reference>
5047
<Reference Include="EPPlus, Version=3.0.0.2, Culture=neutral, PublicKeyToken=ea159fdaa78159a1, processorArchitecture=MSIL">
5148
<SpecificVersion>False</SpecificVersion>
@@ -87,30 +84,30 @@
8784
<HintPath>..\..\packages\System.Linq.Dynamic.1.0.0\lib\net40\System.Linq.Dynamic.dll</HintPath>
8885
</Reference>
8986
<Reference Include="System.Web" />
90-
<Reference Include="System.Web.Helpers, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
91-
<Private>True</Private>
92-
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll</HintPath>
87+
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
88+
<SpecificVersion>False</SpecificVersion>
89+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.0.0\lib\net45\System.Web.Helpers.dll</HintPath>
9390
</Reference>
94-
<Reference Include="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
95-
<Private>True</Private>
96-
<HintPath>..\..\packages\Microsoft.AspNet.Mvc.4.0.20710.0\lib\net40\System.Web.Mvc.dll</HintPath>
91+
<Reference Include="System.Web.Mvc, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
92+
<SpecificVersion>False</SpecificVersion>
93+
<HintPath>..\..\packages\Microsoft.AspNet.Mvc.5.0.0\lib\net45\System.Web.Mvc.dll</HintPath>
9794
</Reference>
98-
<Reference Include="System.Web.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
99-
<Private>True</Private>
100-
<HintPath>..\..\packages\Microsoft.AspNet.Razor.2.0.20710.0\lib\net40\System.Web.Razor.dll</HintPath>
95+
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
96+
<SpecificVersion>False</SpecificVersion>
97+
<HintPath>..\..\packages\Microsoft.AspNet.Razor.3.0.0\lib\net45\System.Web.Razor.dll</HintPath>
10198
</Reference>
10299
<Reference Include="System.Web.Services" />
103-
<Reference Include="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
104-
<Private>True</Private>
105-
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.dll</HintPath>
100+
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
101+
<SpecificVersion>False</SpecificVersion>
102+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.0.0\lib\net45\System.Web.WebPages.dll</HintPath>
106103
</Reference>
107-
<Reference Include="System.Web.WebPages.Deployment, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
108-
<Private>True</Private>
109-
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>
104+
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
105+
<SpecificVersion>False</SpecificVersion>
106+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.0.0\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
110107
</Reference>
111-
<Reference Include="System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
112-
<Private>True</Private>
113-
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
108+
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
109+
<SpecificVersion>False</SpecificVersion>
110+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.0.0\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
114111
</Reference>
115112
<Reference Include="System.Xml.Linq" />
116113
<Reference Include="System.Data.DataSetExtensions" />

‎src/Libraries/SmartStore.Services/packages.config‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Autofac" version="3.0.2" targetFramework="net45" />
3+
<package id="Autofac" version="3.1.5" targetFramework="net45" />
44
<package id="EPPlus" version="3.0.0.2" targetFramework="net45" />
55
<package id="ImageResizer" version="3.3.3" targetFramework="net45" />
66
<package id="ImageResizer.Plugins.PrettyGifs" version="3.3.3" targetFramework="net45" />
77
<package id="iTextSharp" version="5.3.3" targetFramework="net45" />
8-
<package id="Microsoft.AspNet.Mvc" version="4.0.20710.0" targetFramework="net45" />
9-
<package id="Microsoft.AspNet.Razor" version="2.0.20710.0" targetFramework="net45" />
10-
<package id="Microsoft.AspNet.WebPages" version="2.0.20710.0" targetFramework="net45" />
8+
<package id="Microsoft.AspNet.Mvc" version="5.0.0" targetFramework="net45" />
9+
<package id="Microsoft.AspNet.Razor" version="3.0.0" targetFramework="net45" />
10+
<package id="Microsoft.AspNet.WebPages" version="3.0.0" targetFramework="net45" />
1111
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
1212
<package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
1313
<package id="System.Linq.Dynamic" version="1.0.0" targetFramework="net45" />

‎src/Plugins/DiscountRules.CustomerRoles/SmartStore.Plugin.DiscountRules.CustomerRoles.csproj‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -47,29 +47,29 @@
4747
<Reference Include="System" />
4848
<Reference Include="System.Core" />
4949
<Reference Include="System.Web" />
50-
<Reference Include="System.Web.Helpers, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
51-
<Private>False</Private>
52-
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll</HintPath>
50+
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
51+
<SpecificVersion>False</SpecificVersion>
52+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.0.0\lib\net45\System.Web.Helpers.dll</HintPath>
5353
</Reference>
54-
<Reference Include="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
55-
<Private>False</Private>
56-
<HintPath>..\..\packages\Microsoft.AspNet.Mvc.4.0.20710.0\lib\net40\System.Web.Mvc.dll</HintPath>
54+
<Reference Include="System.Web.Mvc, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
55+
<SpecificVersion>False</SpecificVersion>
56+
<HintPath>..\..\packages\Microsoft.AspNet.Mvc.5.0.0\lib\net45\System.Web.Mvc.dll</HintPath>
5757
</Reference>
58-
<Reference Include="System.Web.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
59-
<Private>False</Private>
60-
<HintPath>..\..\packages\Microsoft.AspNet.Razor.2.0.20710.0\lib\net40\System.Web.Razor.dll</HintPath>
58+
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
59+
<SpecificVersion>False</SpecificVersion>
60+
<HintPath>..\..\packages\Microsoft.AspNet.Razor.3.0.0\lib\net45\System.Web.Razor.dll</HintPath>
6161
</Reference>
62-
<Reference Include="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
63-
<Private>False</Private>
64-
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.dll</HintPath>
62+
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
63+
<SpecificVersion>False</SpecificVersion>
64+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.0.0\lib\net45\System.Web.WebPages.dll</HintPath>
6565
</Reference>
66-
<Reference Include="System.Web.WebPages.Deployment, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
67-
<Private>False</Private>
68-
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>
66+
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
67+
<SpecificVersion>False</SpecificVersion>
68+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.0.0\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
6969
</Reference>
70-
<Reference Include="System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
71-
<Private>False</Private>
72-
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
70+
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
71+
<SpecificVersion>False</SpecificVersion>
72+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.0.0\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
7373
</Reference>
7474
<Reference Include="System.Xml.Linq" />
7575
<Reference Include="System.Data.DataSetExtensions" />

‎src/Plugins/DiscountRules.CustomerRoles/packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.AspNet.Mvc" version="4.0.20710.0" targetFramework="net45" />
4-
<package id="Microsoft.AspNet.Razor" version="2.0.20710.0" targetFramework="net45" />
5-
<package id="Microsoft.AspNet.WebPages" version="2.0.20710.0" targetFramework="net45" />
3+
<package id="Microsoft.AspNet.Mvc" version="5.0.0" targetFramework="net45" />
4+
<package id="Microsoft.AspNet.Razor" version="3.0.0" targetFramework="net45" />
5+
<package id="Microsoft.AspNet.WebPages" version="3.0.0" targetFramework="net45" />
66
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
77
</packages>

0 commit comments

Comments
 (0)