Skip to content

Commit 12ea64d

Browse files
muratcakirmuratcakir
committed
Updated MVC to latest version (5.2.3)
1 parent bfcdd2d commit 12ea64d

61 files changed

Lines changed: 337 additions & 258 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/Libraries/SmartStore.Core/SmartStore.Core.csproj‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -111,27 +111,27 @@
111111
<Reference Include="System.Web" />
112112
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
113113
<SpecificVersion>False</SpecificVersion>
114-
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.Helpers.dll</HintPath>
114+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
115115
</Reference>
116-
<Reference Include="System.Web.Mvc, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
116+
<Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
117117
<SpecificVersion>False</SpecificVersion>
118-
<HintPath>..\..\packages\Microsoft.AspNet.Mvc.5.2.0\lib\net45\System.Web.Mvc.dll</HintPath>
118+
<HintPath>..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
119119
</Reference>
120120
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
121121
<SpecificVersion>False</SpecificVersion>
122-
<HintPath>..\..\packages\Microsoft.AspNet.Razor.3.2.2\lib\net45\System.Web.Razor.dll</HintPath>
122+
<HintPath>..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
123123
</Reference>
124124
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
125125
<SpecificVersion>False</SpecificVersion>
126-
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.dll</HintPath>
126+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
127127
</Reference>
128128
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
129129
<SpecificVersion>False</SpecificVersion>
130-
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
130+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
131131
</Reference>
132132
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
133133
<SpecificVersion>False</SpecificVersion>
134-
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
134+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
135135
</Reference>
136136
<Reference Include="System.Xml.Linq" />
137137
<Reference Include="System.Data.DataSetExtensions" />
@@ -573,6 +573,7 @@
573573
<Compile Include="Packaging\Updater\AppUpdater.cs" />
574574
</ItemGroup>
575575
<ItemGroup>
576+
<None Include="app.config" />
576577
<None Include="packages.config" />
577578
</ItemGroup>
578579
<ItemGroup>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
<package id="Autofac.Mvc5" version="3.3.1" targetFramework="net45" />
55
<package id="EntityFramework" version="6.1.0" targetFramework="net45" />
66
<package id="fasterflect" version="2.1.3" targetFramework="net45" />
7-
<package id="Microsoft.AspNet.Mvc" version="5.2.0" targetFramework="net45" />
8-
<package id="Microsoft.AspNet.Razor" version="3.2.2" targetFramework="net45" />
9-
<package id="Microsoft.AspNet.WebPages" version="3.2.2" targetFramework="net45" />
7+
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />
8+
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
9+
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />
1010
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
1111
<package id="Microsoft.Web.Xdt" version="1.0.0" targetFramework="net45" />
1212
<package id="Newtonsoft.Json" version="6.0.6" targetFramework="net45" />

‎src/Libraries/SmartStore.Data/app.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</dependentAssembly>
99
<dependentAssembly>
1010
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
11-
<bindingRedirect oldVersion="0.0.0.0-5.2.0.0" newVersion="5.2.0.0" />
11+
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
1212
</dependentAssembly>
1313
</assemblyBinding>
1414
</runtime>

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -116,28 +116,28 @@
116116
<Reference Include="System.Web" />
117117
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
118118
<SpecificVersion>False</SpecificVersion>
119-
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.Helpers.dll</HintPath>
119+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
120120
</Reference>
121-
<Reference Include="System.Web.Mvc, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
121+
<Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
122122
<SpecificVersion>False</SpecificVersion>
123-
<HintPath>..\..\packages\Microsoft.AspNet.Mvc.5.2.0\lib\net45\System.Web.Mvc.dll</HintPath>
123+
<HintPath>..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
124124
</Reference>
125125
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
126126
<SpecificVersion>False</SpecificVersion>
127-
<HintPath>..\..\packages\Microsoft.AspNet.Razor.3.2.2\lib\net45\System.Web.Razor.dll</HintPath>
127+
<HintPath>..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
128128
</Reference>
129129
<Reference Include="System.Web.Services" />
130130
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
131131
<SpecificVersion>False</SpecificVersion>
132-
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.dll</HintPath>
132+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
133133
</Reference>
134134
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
135135
<SpecificVersion>False</SpecificVersion>
136-
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
136+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
137137
</Reference>
138138
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
139139
<SpecificVersion>False</SpecificVersion>
140-
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
140+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
141141
</Reference>
142142
<Reference Include="System.Xml.Linq" />
143143
<Reference Include="System.Data.DataSetExtensions" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
2222
<dependentAssembly>
2323
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
24-
<bindingRedirect oldVersion="0.0.0.0-5.2.0.0" newVersion="5.2.0.0" />
24+
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
2525
</dependentAssembly>
2626
<dependentAssembly>
2727
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" culture="neutral" />

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<package id="ImageResizer" version="3.4.2" targetFramework="net45" />
88
<package id="ImageResizer.Plugins.PrettyGifs" version="3.4.2" targetFramework="net45" />
99
<package id="MaxMind.GeoIP" version="2.1.17" targetFramework="net45" />
10-
<package id="Microsoft.AspNet.Mvc" version="5.2.0" targetFramework="net45" />
11-
<package id="Microsoft.AspNet.Razor" version="3.2.2" targetFramework="net45" />
12-
<package id="Microsoft.AspNet.WebPages" version="3.2.2" targetFramework="net45" />
10+
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />
11+
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
12+
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />
1313
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
1414
<package id="Newtonsoft.Json" version="6.0.6" targetFramework="net45" />
1515
<package id="NReco.PdfGenerator" version="1.1.3.0" targetFramework="net45" />

‎src/Plugins/SmartStore.AmazonPay/SmartStore.AmazonPay.csproj‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -96,27 +96,33 @@
9696
<Reference Include="System.Web" />
9797
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
9898
<SpecificVersion>False</SpecificVersion>
99-
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.Helpers.dll</HintPath>
99+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
100+
<Private>True</Private>
100101
</Reference>
101-
<Reference Include="System.Web.Mvc, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
102+
<Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
102103
<SpecificVersion>False</SpecificVersion>
103-
<HintPath>..\..\packages\Microsoft.AspNet.Mvc.5.2.0\lib\net45\System.Web.Mvc.dll</HintPath>
104+
<HintPath>..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
105+
<Private>True</Private>
104106
</Reference>
105107
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
106108
<SpecificVersion>False</SpecificVersion>
107-
<HintPath>..\..\packages\Microsoft.AspNet.Razor.3.2.2\lib\net45\System.Web.Razor.dll</HintPath>
109+
<HintPath>..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
110+
<Private>True</Private>
108111
</Reference>
109112
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
110113
<SpecificVersion>False</SpecificVersion>
111-
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.dll</HintPath>
114+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
115+
<Private>True</Private>
112116
</Reference>
113117
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
114118
<SpecificVersion>False</SpecificVersion>
115-
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
119+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
120+
<Private>True</Private>
116121
</Reference>
117122
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
118123
<SpecificVersion>False</SpecificVersion>
119-
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
124+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
125+
<Private>True</Private>
120126
</Reference>
121127
<Reference Include="System.Xml.Linq" />
122128
<Reference Include="System.Data.DataSetExtensions" />

‎src/Plugins/SmartStore.AmazonPay/packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<packages>
33
<package id="Autofac" version="3.4.1" targetFramework="net45" />
44
<package id="Autofac.Mvc5" version="3.3.1" targetFramework="net45" />
5-
<package id="Microsoft.AspNet.Mvc" version="5.2.0" targetFramework="net45" />
6-
<package id="Microsoft.AspNet.Razor" version="3.2.2" targetFramework="net45" />
7-
<package id="Microsoft.AspNet.WebPages" version="3.2.2" targetFramework="net45" />
5+
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />
6+
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
7+
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />
88
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
99
</packages>

‎src/Plugins/SmartStore.AmazonPay/web.config‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,6 @@
107107
<assemblyIdentity name="System.Web.Http.WebHost" publicKeyToken="31bf3856ad364e35" culture="neutral" />
108108
<bindingRedirect oldVersion="0.0.0.0-5.1.0.0" newVersion="5.1.0.0" />
109109
</dependentAssembly>
110-
<dependentAssembly>
111-
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
112-
<bindingRedirect oldVersion="0.0.0.0-5.2.0.0" newVersion="5.2.0.0" />
113-
</dependentAssembly>
114110
<dependentAssembly>
115111
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
116112
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
@@ -119,6 +115,10 @@
119115
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
120116
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
121117
</dependentAssembly>
118+
<dependentAssembly>
119+
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
120+
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
121+
</dependentAssembly>
122122
</assemblyBinding>
123123
</runtime>
124124
</configuration>

‎src/Plugins/SmartStore.Clickatell/SmartStore.Clickatell.csproj‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -92,27 +92,33 @@
9292
<Reference Include="System.Web" />
9393
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
9494
<SpecificVersion>False</SpecificVersion>
95-
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.Helpers.dll</HintPath>
95+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
96+
<Private>True</Private>
9697
</Reference>
97-
<Reference Include="System.Web.Mvc, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
98+
<Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
9899
<SpecificVersion>False</SpecificVersion>
99-
<HintPath>..\..\packages\Microsoft.AspNet.Mvc.5.2.0\lib\net45\System.Web.Mvc.dll</HintPath>
100+
<HintPath>..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
101+
<Private>True</Private>
100102
</Reference>
101103
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
102104
<SpecificVersion>False</SpecificVersion>
103-
<HintPath>..\..\packages\Microsoft.AspNet.Razor.3.2.2\lib\net45\System.Web.Razor.dll</HintPath>
105+
<HintPath>..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
106+
<Private>True</Private>
104107
</Reference>
105108
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
106109
<SpecificVersion>False</SpecificVersion>
107-
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.dll</HintPath>
110+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
111+
<Private>True</Private>
108112
</Reference>
109113
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
110114
<SpecificVersion>False</SpecificVersion>
111-
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
115+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
116+
<Private>True</Private>
112117
</Reference>
113118
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
114119
<SpecificVersion>False</SpecificVersion>
115-
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
120+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
121+
<Private>True</Private>
116122
</Reference>
117123
<Reference Include="System.Xml.Linq" />
118124
<Reference Include="System.Data.DataSetExtensions" />

0 commit comments

Comments
 (0)