Skip to content

Commit 6536f99

Browse files
javorosasjavorosas
authored
Merge pull request #6 from FacturAPI/release/0.3.2
update newtonsoft json package
2 parents b815339 + 8e0b5c6 commit 6536f99

File tree

8 files changed

+25
-14
lines changed

8 files changed

+25
-14
lines changed

‎FacturapiTest/App.config‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<startup>
44
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
55
</startup>
6+
<runtime>
7+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
8+
<dependentAssembly>
9+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
10+
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
11+
</dependentAssembly>
12+
</assemblyBinding>
13+
</runtime>
614
</configuration>

‎FacturapiTest/FacturapiTest.csproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@
3232
<WarningLevel>4</WarningLevel>
3333
</PropertyGroup>
3434
<ItemGroup>
35+
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
36+
<HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
37+
</Reference>
3538
<Reference Include="System" />
3639
<Reference Include="System.Core" />
3740
<Reference Include="System.Xml.Linq" />

‎FacturapiTest/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Json.NET.ContractResolverExtentions" version="1.0.1" targetFramework="net452" />
4-
<package id="Newtonsoft.Json" version="10.0.2" targetFramework="net452" />
4+
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net452" />
55
</packages>

‎facturapi-net/Facturapi.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
<ApplicationIcon>facturapi.ico</ApplicationIcon>
3737
</PropertyGroup>
3838
<ItemGroup>
39-
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
40-
<HintPath>..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
39+
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
40+
<HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
4141
</Reference>
4242
<Reference Include="Newtonsoft.Json.ContractResolverExtentions, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
4343
<HintPath>..\packages\Json.NET.ContractResolverExtentions.1.0.1\lib\net45\Newtonsoft.Json.ContractResolverExtentions.dll</HintPath>

‎facturapi-net/Facturapi.nuspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
<iconUrl>https://github.com/FacturAPI/facturapi-net/raw/master/facturapi-net/facturapi.png</iconUrl>
1212
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1313
<description>Genera facturas electrónicas válidas en México (CFDI) lo más fácil posible. Obtén tus API Keys creando una cuenta gratuita en https://www.facturapi.io</description>
14-
<releaseNotes>Initial release</releaseNotes>
15-
<copyright>Copyright © Facturapi 2017</copyright>
14+
<releaseNotes>New features and bug fixes</releaseNotes>
15+
<copyright>Copyright © Facturapi 2018</copyright>
1616
<tags>factura factura-electronica cfdi facturapi mexico conekta</tags>
1717
</metadata>
1818
<!-- A readme.txt will be displayed when the package is installed -->
1919
<files>
20-
<file src="readme.txt" target="" />
20+
<file src="README.txt" target="" />
2121
</files>
2222
</package>

‎facturapi-net/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("0.2.2.*")]
36-
[assembly: AssemblyFileVersion("0.2.2.0")]
35+
[assembly: AssemblyVersion("0.3.2.*")]
36+
[assembly: AssemblyFileVersion("0.3.2.0")]

‎facturapi-net/app.config‎

Lines changed: 4 additions & 4 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
<runtime>
44
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
55
<dependentAssembly>
6-
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
7-
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0"/>
6+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
88
</dependentAssembly>
99
</assemblyBinding>
1010
</runtime>
11-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
11+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup></configuration>

‎facturapi-net/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Json.NET.ContractResolverExtentions" version="1.0.1" targetFramework="net452" />
4-
<package id="Newtonsoft.Json" version="10.0.2" targetFramework="net452" />
4+
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net45" />
55
</packages>

0 commit comments

Comments
 (0)