Skip to content

Commit 13a68bf

Browse files
muratcakirmuratcakir
committed
Updated Newtonsoft.Json package to version 8.0.3
1 parent 717c308 commit 13a68bf

43 files changed

Lines changed: 779 additions & 773 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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@
8585
<Reference Include="Microsoft.Web.XmlTransform">
8686
<HintPath>..\..\packages\Microsoft.Web.Xdt.1.0.0\lib\net40\Microsoft.Web.XmlTransform.dll</HintPath>
8787
</Reference>
88-
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
89-
<SpecificVersion>False</SpecificVersion>
90-
<HintPath>..\..\packages\Newtonsoft.Json.6.0.6\lib\net45\Newtonsoft.Json.dll</HintPath>
88+
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
89+
<HintPath>..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
90+
<Private>True</Private>
9191
</Reference>
9292
<Reference Include="NuGet.Core, Version=2.8.50126.400, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
9393
<SpecificVersion>False</SpecificVersion>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />
99
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
1010
<package id="Microsoft.Web.Xdt" version="1.0.0" targetFramework="net45" />
11-
<package id="Newtonsoft.Json" version="6.0.6" targetFramework="net45" />
11+
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net451" />
1212
<package id="NuGet.Core" version="2.8.0" targetFramework="net45" />
1313
<package id="System.Linq.Dynamic" version="1.0.0" targetFramework="net45" />
1414
</packages>

‎src/Libraries/SmartStore.Data/SmartStore.Data.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,9 @@
9393
<Private>True</Private>
9494
<HintPath>..\..\packages\Microsoft.SqlServer.Scripting.11.0.2100.61\lib\Microsoft.SqlServer.Smo.dll</HintPath>
9595
</Reference>
96-
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
97-
<SpecificVersion>False</SpecificVersion>
98-
<HintPath>..\..\packages\Newtonsoft.Json.6.0.6\lib\net45\Newtonsoft.Json.dll</HintPath>
96+
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
97+
<HintPath>..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
98+
<Private>True</Private>
9999
</Reference>
100100
<Reference Include="System" />
101101
<Reference Include="System.ComponentModel.DataAnnotations" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
<package id="EntityFramework.SqlServerCompact" version="6.1.3" targetFramework="net451" />
77
<package id="Microsoft.SqlServer.Compact" version="4.0.8876.1" targetFramework="net45" />
88
<package id="Microsoft.SqlServer.Scripting" version="11.0.2100.61" targetFramework="net45" />
9-
<package id="Newtonsoft.Json" version="6.0.6" targetFramework="net45" />
9+
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net451" />
1010
</packages>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,9 @@
104104
<Reference Include="NCrontab">
105105
<HintPath>..\..\packages\ncrontab.2.0.0\lib\net20\NCrontab.dll</HintPath>
106106
</Reference>
107-
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
108-
<SpecificVersion>False</SpecificVersion>
109-
<HintPath>..\..\packages\Newtonsoft.Json.6.0.6\lib\net45\Newtonsoft.Json.dll</HintPath>
107+
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
108+
<HintPath>..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
109+
<Private>True</Private>
110110
</Reference>
111111
<Reference Include="NReco.PdfGenerator, Version=1.1.5.0, Culture=neutral, processorArchitecture=MSIL">
112112
<SpecificVersion>False</SpecificVersion>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />
1414
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
1515
<package id="ncrontab" version="2.0.0" targetFramework="net451" />
16-
<package id="Newtonsoft.Json" version="6.0.6" targetFramework="net45" />
16+
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net451" />
1717
<package id="NReco.PdfGenerator" version="1.1.5.0" targetFramework="net451" />
1818
<package id="System.Linq.Dynamic" version="1.0.0" targetFramework="net45" />
1919
<package id="UAParser" version="2.0.0.0" targetFramework="net451" />

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

Lines changed: 66 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,131 +1,131 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<appSettings>
4-
<add key="webpages:Version" value="3.0.0.0" />
5-
<add key="webpages:Enabled" value="false" />
4+
<add key="webpages:Version" value="3.0.0.0"/>
5+
<add key="webpages:Enabled" value="false"/>
66
</appSettings>
77
<system.web>
88
<compilation debug="true" targetFramework="4.5.1">
99
<assemblies>
10-
<add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
11-
<add assembly="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
12-
<add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
13-
<add assembly="System.Web.Mvc, Version=5.1.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
14-
<add assembly="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
10+
<add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
11+
<add assembly="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
12+
<add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
13+
<add assembly="System.Web.Mvc, Version=5.1.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
14+
<add assembly="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
1515
</assemblies>
1616
</compilation>
1717
<pages>
1818
<namespaces>
19-
<add namespace="System.Collections.Generic" />
20-
<add namespace="System.Linq" />
21-
<add namespace="System.Web.Helpers" />
22-
<add namespace="System.Web.Mvc" />
23-
<add namespace="System.Web.Mvc.Ajax" />
24-
<add namespace="System.Web.Mvc.Html" />
25-
<add namespace="System.Web.Routing" />
26-
<add namespace="System.Web.WebPages" />
27-
<add namespace="System.Web.Optimization" />
28-
<add namespace="Telerik.Web.Mvc.UI" />
19+
<add namespace="System.Collections.Generic"/>
20+
<add namespace="System.Linq"/>
21+
<add namespace="System.Web.Helpers"/>
22+
<add namespace="System.Web.Mvc"/>
23+
<add namespace="System.Web.Mvc.Ajax"/>
24+
<add namespace="System.Web.Mvc.Html"/>
25+
<add namespace="System.Web.Routing"/>
26+
<add namespace="System.Web.WebPages"/>
27+
<add namespace="System.Web.Optimization"/>
28+
<add namespace="Telerik.Web.Mvc.UI"/>
2929
</namespaces>
3030
</pages>
3131
</system.web>
3232
<runtime>
3333
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
3434
<dependentAssembly>
35-
<assemblyIdentity name="System.Web.Http.WebHost" publicKeyToken="31BF3856AD364E35" culture="neutral" />
36-
<bindingRedirect oldVersion="0.0.0.0-5.1.0.0" newVersion="5.1.0.0" />
35+
<assemblyIdentity name="System.Web.Http.WebHost" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
36+
<bindingRedirect oldVersion="0.0.0.0-5.1.0.0" newVersion="5.1.0.0"/>
3737
</dependentAssembly>
3838
<dependentAssembly>
39-
<assemblyIdentity name="Autofac" publicKeyToken="17863AF14B0044DA" culture="neutral" />
40-
<bindingRedirect oldVersion="0.0.0.0-3.5.0.0" newVersion="3.5.0.0" />
39+
<assemblyIdentity name="Autofac" publicKeyToken="17863AF14B0044DA" culture="neutral"/>
40+
<bindingRedirect oldVersion="0.0.0.0-3.5.0.0" newVersion="3.5.0.0"/>
4141
</dependentAssembly>
4242
<dependentAssembly>
43-
<assemblyIdentity name="System.Web.WebPages.Deployment" publicKeyToken="31BF3856AD364E35" culture="neutral" />
44-
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
43+
<assemblyIdentity name="System.Web.WebPages.Deployment" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
44+
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
4545
</dependentAssembly>
4646
<dependentAssembly>
47-
<assemblyIdentity name="System.Web.WebPages.Razor" publicKeyToken="31BF3856AD364E35" culture="neutral" />
48-
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
47+
<assemblyIdentity name="System.Web.WebPages.Razor" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
48+
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
4949
</dependentAssembly>
5050
<dependentAssembly>
51-
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31BF3856AD364E35" culture="neutral" />
52-
<bindingRedirect oldVersion="0.0.0.0-5.1.0.0" newVersion="5.1.0.0" />
51+
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
52+
<bindingRedirect oldVersion="0.0.0.0-5.1.0.0" newVersion="5.1.0.0"/>
5353
</dependentAssembly>
5454
<dependentAssembly>
55-
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30AD4FE6B2A6AEED" culture="neutral" />
56-
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
55+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30AD4FE6B2A6AEED" culture="neutral"/>
56+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0"/>
5757
</dependentAssembly>
5858
<dependentAssembly>
59-
<assemblyIdentity name="System.Web.Razor" publicKeyToken="31BF3856AD364E35" culture="neutral" />
60-
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
59+
<assemblyIdentity name="System.Web.Razor" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
60+
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
6161
</dependentAssembly>
6262
<dependentAssembly>
63-
<assemblyIdentity name="System.Web.Http" publicKeyToken="31BF3856AD364E35" culture="neutral" />
64-
<bindingRedirect oldVersion="0.0.0.0-5.1.0.0" newVersion="5.1.0.0" />
63+
<assemblyIdentity name="System.Web.Http" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
64+
<bindingRedirect oldVersion="0.0.0.0-5.1.0.0" newVersion="5.1.0.0"/>
6565
</dependentAssembly>
6666
<dependentAssembly>
67-
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
68-
<bindingRedirect oldVersion="0.0.0.0-5.1.0.0" newVersion="5.1.0.0" />
67+
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
68+
<bindingRedirect oldVersion="0.0.0.0-5.1.0.0" newVersion="5.1.0.0"/>
6969
</dependentAssembly>
7070
<dependentAssembly>
71-
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
72-
<bindingRedirect oldVersion="0.0.0.0-3.5.0.0" newVersion="3.5.0.0" />
71+
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral"/>
72+
<bindingRedirect oldVersion="0.0.0.0-3.5.0.0" newVersion="3.5.0.0"/>
7373
</dependentAssembly>
7474
<dependentAssembly>
75-
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
76-
<bindingRedirect oldVersion="0.0.0.0-5.1.0.0" newVersion="5.1.0.0" />
75+
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
76+
<bindingRedirect oldVersion="0.0.0.0-5.1.0.0" newVersion="5.1.0.0"/>
7777
</dependentAssembly>
7878
<dependentAssembly>
79-
<assemblyIdentity name="JavaScriptEngineSwitcher.Core" publicKeyToken="c608b2a8cc9e4472" culture="neutral" />
80-
<bindingRedirect oldVersion="0.0.0.0-1.2.4.0" newVersion="1.2.4.0" />
79+
<assemblyIdentity name="JavaScriptEngineSwitcher.Core" publicKeyToken="c608b2a8cc9e4472" culture="neutral"/>
80+
<bindingRedirect oldVersion="0.0.0.0-1.2.4.0" newVersion="1.2.4.0"/>
8181
</dependentAssembly>
8282
<dependentAssembly>
83-
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
84-
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
83+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
84+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0"/>
8585
</dependentAssembly>
8686
<dependentAssembly>
87-
<assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
88-
<bindingRedirect oldVersion="0.0.0.0-5.6.1.0" newVersion="5.6.1.0" />
87+
<assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
88+
<bindingRedirect oldVersion="0.0.0.0-5.6.1.0" newVersion="5.6.1.0"/>
8989
</dependentAssembly>
9090
<dependentAssembly>
91-
<assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />
92-
<bindingRedirect oldVersion="0.0.0.0-5.6.1.0" newVersion="5.6.1.0" />
91+
<assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
92+
<bindingRedirect oldVersion="0.0.0.0-5.6.1.0" newVersion="5.6.1.0"/>
9393
</dependentAssembly>
9494
<dependentAssembly>
95-
<assemblyIdentity name="System.Spatial" publicKeyToken="31bf3856ad364e35" culture="neutral" />
96-
<bindingRedirect oldVersion="0.0.0.0-5.6.1.0" newVersion="5.6.1.0" />
95+
<assemblyIdentity name="System.Spatial" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
96+
<bindingRedirect oldVersion="0.0.0.0-5.6.1.0" newVersion="5.6.1.0"/>
9797
</dependentAssembly>
9898
<dependentAssembly>
99-
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
100-
<bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" />
99+
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
100+
<bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930"/>
101101
</dependentAssembly>
102102
<dependentAssembly>
103-
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral" />
104-
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
103+
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral"/>
104+
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2"/>
105105
</dependentAssembly>
106106
<dependentAssembly>
107-
<assemblyIdentity name="System.Web.Http.WebHost" publicKeyToken="31bf3856ad364e35" culture="neutral" />
108-
<bindingRedirect oldVersion="0.0.0.0-5.1.0.0" newVersion="5.1.0.0" />
107+
<assemblyIdentity name="System.Web.Http.WebHost" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
108+
<bindingRedirect oldVersion="0.0.0.0-5.1.0.0" newVersion="5.1.0.0"/>
109109
</dependentAssembly>
110110
<dependentAssembly>
111-
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
112-
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
111+
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/>
112+
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
113113
</dependentAssembly>
114114
<dependentAssembly>
115-
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
116-
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
115+
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35"/>
116+
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
117117
</dependentAssembly>
118118
<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" />
119+
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
120+
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
121121
</dependentAssembly>
122122
<dependentAssembly>
123-
<assemblyIdentity name="AjaxMin" publicKeyToken="21ef50ce11b5d80f" culture="neutral" />
124-
<bindingRedirect oldVersion="0.0.0.0-5.14.5506.26196" newVersion="5.14.5506.26196" />
123+
<assemblyIdentity name="AjaxMin" publicKeyToken="21ef50ce11b5d80f" culture="neutral"/>
124+
<bindingRedirect oldVersion="0.0.0.0-5.14.5506.26196" newVersion="5.14.5506.26196"/>
125125
</dependentAssembly>
126126
<dependentAssembly>
127-
<assemblyIdentity name="MsieJavaScriptEngine" publicKeyToken="a3a2846a37ac0d3e" culture="neutral" />
128-
<bindingRedirect oldVersion="0.0.0.0-1.5.6.0" newVersion="1.5.6.0" />
127+
<assemblyIdentity name="MsieJavaScriptEngine" publicKeyToken="a3a2846a37ac0d3e" culture="neutral"/>
128+
<bindingRedirect oldVersion="0.0.0.0-1.5.6.0" newVersion="1.5.6.0"/>
129129
</dependentAssembly>
130130
</assemblyBinding>
131131
</runtime>

0 commit comments

Comments
 (0)