Skip to content

Commit 1a48a07

Browse files
muratcakirmuratcakir
committed
Updated internal PDF generator to version 1.1.5
1 parent e85ffed commit 1a48a07

21 files changed

Lines changed: 1067 additions & 1067 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,9 @@
100100
<SpecificVersion>False</SpecificVersion>
101101
<HintPath>..\..\packages\Newtonsoft.Json.6.0.6\lib\net45\Newtonsoft.Json.dll</HintPath>
102102
</Reference>
103-
<Reference Include="NReco.PdfGenerator, Version=1.1.3.0, Culture=neutral, processorArchitecture=MSIL">
103+
<Reference Include="NReco.PdfGenerator, Version=1.1.5.0, Culture=neutral, processorArchitecture=MSIL">
104104
<SpecificVersion>False</SpecificVersion>
105-
<HintPath>..\..\packages\NReco.PdfGenerator.1.1.3.0\lib\net20\NReco.PdfGenerator.dll</HintPath>
105+
<HintPath>..\..\packages\NReco.PdfGenerator.1.1.5.0\lib\net20\NReco.PdfGenerator.dll</HintPath>
106106
</Reference>
107107
<Reference Include="System" />
108108
<Reference Include="System.ComponentModel.Composition" />

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<configSections>
44
<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
5-
<section name="SmartStore.Services.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
5+
<section name="SmartStore.Services.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
66
</sectionGroup>
77
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
8-
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
8+
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
99
</configSections>
1010
<applicationSettings>
1111
<SmartStore.Services.Properties.Settings>
@@ -20,23 +20,23 @@
2020
<runtime>
2121
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
2222
<dependentAssembly>
23-
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
24-
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
23+
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
24+
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
2525
</dependentAssembly>
2626
<dependentAssembly>
27-
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
28-
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
27+
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" culture="neutral" />
28+
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
2929
</dependentAssembly>
3030
<dependentAssembly>
31-
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral"/>
32-
<bindingRedirect oldVersion="0.0.0.0-3.3.0.0" newVersion="3.3.0.0"/>
31+
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
32+
<bindingRedirect oldVersion="0.0.0.0-3.3.0.0" newVersion="3.3.0.0" />
3333
</dependentAssembly>
3434
</assemblyBinding>
3535
</runtime>
3636
<entityFramework>
37-
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework"/>
37+
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />
3838
<providers>
39-
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer"/>
39+
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
4040
</providers>
4141
</entityFramework>
42-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1"/></startup></configuration>
42+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1" /></startup></configuration>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<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" />
15-
<package id="NReco.PdfGenerator" version="1.1.3.0" targetFramework="net45" />
15+
<package id="NReco.PdfGenerator" version="1.1.5.0" targetFramework="net451" />
1616
<package id="System.Linq.Dynamic" version="1.0.0" targetFramework="net45" />
1717
<package id="UAParser" version="1.2.0.0" targetFramework="net45" />
1818
</packages>

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

Lines changed: 62 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,123 +1,123 @@
1-
<?xml version="1.0"?>
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.4.0.0" newVersion="3.4.0.0"/>
39+
<assemblyIdentity name="Autofac" publicKeyToken="17863AF14B0044DA" culture="neutral" />
40+
<bindingRedirect oldVersion="0.0.0.0-3.4.0.0" newVersion="3.4.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-6.0.0.0" newVersion="6.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.4.0.0" newVersion="3.4.0.0"/>
71+
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
72+
<bindingRedirect oldVersion="0.0.0.0-3.4.0.0" newVersion="3.4.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.1.3.0" newVersion="1.1.3.0"/>
79+
<assemblyIdentity name="JavaScriptEngineSwitcher.Core" publicKeyToken="c608b2a8cc9e4472" culture="neutral" />
80+
<bindingRedirect oldVersion="0.0.0.0-1.1.3.0" newVersion="1.1.3.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-6.0.0.0" newVersion="6.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
</assemblyBinding>
123123
</runtime>

0 commit comments

Comments
 (0)