Skip to content

Commit da4d9e4

Browse files
muratcakirmuratcakir
committed
Updated Newtonsoft.Json to latest version
1 parent 87972c3 commit da4d9e4

48 files changed

Lines changed: 89 additions & 96 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: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,8 @@
9393
<HintPath>..\..\packages\Microsoft.Web.Xdt.2.1.1\lib\net40\Microsoft.Web.XmlTransform.dll</HintPath>
9494
<Private>True</Private>
9595
</Reference>
96-
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
97-
<HintPath>..\..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
98-
<Private>True</Private>
96+
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
97+
<HintPath>..\..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
9998
</Reference>
10099
<Reference Include="NuGet.Core, Version=2.14.0.832, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
101100
<HintPath>..\..\packages\NuGet.Core.2.14.0\lib\net40-Client\NuGet.Core.dll</HintPath>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<package id="Microsoft.SqlServer.Compact" version="4.0.8876.1" targetFramework="net451" />
1212
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
1313
<package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net452" />
14-
<package id="Newtonsoft.Json" version="10.0.2" targetFramework="net452" />
14+
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="net461" />
1515
<package id="NuGet.Core" version="2.14.0" targetFramework="net452" />
1616
<package id="System.Linq.Dynamic" version="1.0.7" targetFramework="net452" />
1717
<package id="System.ValueTuple" version="4.4.0" targetFramework="net461" />

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,8 @@
9494
<Private>True</Private>
9595
<HintPath>..\..\packages\Microsoft.SqlServer.Scripting.11.0.2100.61\lib\Microsoft.SqlServer.Smo.dll</HintPath>
9696
</Reference>
97-
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
98-
<HintPath>..\..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
99-
<Private>True</Private>
97+
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
98+
<HintPath>..\..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
10099
</Reference>
101100
<Reference Include="System" />
102101
<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
@@ -5,6 +5,6 @@
55
<package id="EntityFramework.SqlServerCompact" version="6.2.0" targetFramework="net452" />
66
<package id="Microsoft.SqlServer.Compact" version="4.0.8876.1" targetFramework="net45" />
77
<package id="Microsoft.SqlServer.Scripting" version="11.0.2100.61" targetFramework="net45" />
8-
<package id="Newtonsoft.Json" version="10.0.2" targetFramework="net452" />
8+
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="net461" />
99
<package id="System.ValueTuple" version="4.4.0" targetFramework="net461" />
1010
</packages>

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,8 @@
116116
<HintPath>..\..\packages\ncrontab.3.3.0\lib\net35\NCrontab.dll</HintPath>
117117
<Private>True</Private>
118118
</Reference>
119-
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
120-
<HintPath>..\..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
121-
<Private>True</Private>
119+
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
120+
<HintPath>..\..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
122121
</Reference>
123122
<Reference Include="NReco.PdfGenerator, Version=1.1.15.0, Culture=neutral, PublicKeyToken=231663d50a41b451, processorArchitecture=MSIL">
124123
<HintPath>..\..\packages\NReco.PdfGenerator.1.1.15\lib\net20\NReco.PdfGenerator.dll</HintPath>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
1616
<package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net461" />
1717
<package id="ncrontab" version="3.3.0" targetFramework="net452" />
18-
<package id="Newtonsoft.Json" version="10.0.2" targetFramework="net452" />
18+
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="net461" />
1919
<package id="NReco.PdfGenerator" version="1.1.15" targetFramework="net452" />
2020
<package id="NuGet.Core" version="2.14.0" targetFramework="net461" />
2121
<package id="PreMailer.Net" version="1.5.5" targetFramework="net461" />

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,8 @@
9595
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
9696
<HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
9797
</Reference>
98-
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
99-
<HintPath>..\..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
100-
<Private>False</Private>
98+
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
99+
<HintPath>..\..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
101100
</Reference>
102101
<Reference Include="System" />
103102
<Reference Include="System.ComponentModel.DataAnnotations" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />
1010
<package id="Microsoft.Net.Compilers" version="2.4.0" targetFramework="net461" developmentDependency="true" />
1111
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
12-
<package id="Newtonsoft.Json" version="10.0.2" targetFramework="net452" />
12+
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="net461" />
1313
</packages>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
</dependentAssembly>
6262
<dependentAssembly>
6363
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30AD4FE6B2A6AEED" culture="neutral" />
64-
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
64+
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
6565
</dependentAssembly>
6666
<dependentAssembly>
6767
<assemblyIdentity name="System.Web.Razor" publicKeyToken="31BF3856AD364E35" culture="neutral" />
@@ -89,7 +89,7 @@
8989
</dependentAssembly>
9090
<dependentAssembly>
9191
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
92-
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
92+
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
9393
</dependentAssembly>
9494
<dependentAssembly>
9595
<assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
@@ -149,4 +149,4 @@
149149
</dependentAssembly>
150150
</assemblyBinding>
151151
</runtime>
152-
</configuration>
152+
</configuration>

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
<IISExpressWindowsAuthentication />
4444
<IISExpressUseClassicPipelineMode />
4545
<UseGlobalApplicationHostFile />
46+
<Use64BitIISExpress />
4647
</PropertyGroup>
4748
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
4849
<DebugSymbols>true</DebugSymbols>
@@ -85,8 +86,8 @@
8586
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8687
<HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
8788
</Reference>
88-
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
89-
<HintPath>..\..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
89+
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
90+
<HintPath>..\..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
9091
</Reference>
9192
<Reference Include="System" />
9293
<Reference Include="System.ComponentModel.DataAnnotations" />

0 commit comments

Comments
 (0)