Skip to content

Commit 12474ca

Browse files
evgeny-porodnovevgeny-porodnov
authored
Merge pull request #4 from kaferi/master
 Fixed versions of dependencies
2 parents 2ac3256 + dc2f193 commit 12474ca

File tree

6 files changed

+19
-28
lines changed

6 files changed

+19
-28
lines changed

‎build.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ if not exist ".\nuget.exe" powershell -Command "(new-object System.Net.WebClient
1010

1111
if not exist ".\bin" mkdir bin
1212

13-
copy packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll bin\Newtonsoft.Json.dll
13+
copy packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll bin\Newtonsoft.Json.dll
1414
copy packages\RestSharp.105.1.0\lib\net45\RestSharp.dll bin\RestSharp.dll
1515
%CSCPATH%\csc /reference:bin\Newtonsoft.Json.dll;bin\RestSharp.dll;System.ComponentModel.DataAnnotations.dll /target:library /out:bin\Aspose.Pdf.Cloud.Sdk.dll /recurse:src\Aspose.Pdf.Cloud.Sdk\*.cs /doc:bin\Aspose.Pdf.Cloud.Sdk.xml
1616

‎src/Aspose.Pdf.Cloud.Sdk.Test/Aspose.Pdf.Cloud.Sdk.Test.csproj

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ OpenAPI spec version: 1.1
3737
<WarningLevel>4</WarningLevel>
3838
</PropertyGroup>
3939
<ItemGroup>
40+
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
41+
<HintPath>..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
42+
</Reference>
4043
<Reference Include="RestSharp, Version=105.1.0.0, Culture=neutral, processorArchitecture=MSIL">
4144
<HintPath>..\..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
4245
</Reference>
@@ -50,12 +53,6 @@ OpenAPI spec version: 1.1
5053
<Reference Include="System.Data" />
5154
<Reference Include="System.Runtime.Serialization" />
5255
<Reference Include="System.Xml" />
53-
<Reference Include="Newtonsoft.Json">
54-
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
55-
<HintPath Condition="Exists('..\packages')">..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
56-
<HintPath Condition="Exists('..\..\packages')">..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
57-
<HintPath Condition="Exists('..\..\vendor')">..\..\vendor\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
58-
</Reference>
5956
<Reference Include="nunit.framework">
6057
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
6158
<HintPath Condition="Exists('..\packages')">..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>

‎src/Aspose.Pdf.Cloud.Sdk.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" developmentDependency="true" />
3+
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net45" developmentDependency="true" />
44
<package id="NUnit" version="2.6.4" targetFramework="net45" />
55
<package id="RestSharp" version="105.1.0" targetFramework="net45" developmentDependency="true" />
66
<package id="System.Net.Http" version="4.3.3" targetFramework="net45" />

‎src/Aspose.Pdf.Cloud.Sdk/Aspose.Pdf.Cloud.Sdk.csproj

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<!--
33
Aspose.PDF for Cloud API Reference
44
@@ -9,7 +9,6 @@ OpenAPI spec version: 1.1
99
-->
1010
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1111
<PropertyGroup>
12-
1312
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
1413
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
1514
<ProjectGuid>{2A08C54A-509C-4825-A1F1-CE338F0F8253}</ProjectGuid>
@@ -38,6 +37,9 @@ OpenAPI spec version: 1.1
3837
<WarningLevel>4</WarningLevel>
3938
</PropertyGroup>
4039
<ItemGroup>
40+
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
41+
<HintPath>..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
42+
</Reference>
4143
<Reference Include="System" />
4244
<Reference Include="System.Core" />
4345
<Reference Include="System.Xml.Linq" />
@@ -47,26 +49,18 @@ OpenAPI spec version: 1.1
4749
<Reference Include="System.Data" />
4850
<Reference Include="System.Runtime.Serialization" />
4951
<Reference Include="System.Xml" />
50-
<Reference Include="Newtonsoft.Json">
51-
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
52-
<HintPath Condition="Exists('..\packages')">..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
53-
<HintPath Condition="Exists('..\..\packages')">..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
54-
<HintPath Condition="Exists('..\..\vendor')">..\..\vendor\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
55-
</Reference>
5652
<Reference Include="RestSharp">
57-
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
58-
<HintPath Condition="Exists('..\packages')">..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
59-
<HintPath Condition="Exists('..\..\packages')">..\..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
53+
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
54+
<HintPath Condition="Exists('..\packages')">..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
55+
<HintPath Condition="Exists('..\..\packages')">..\..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
6056
<HintPath Condition="Exists('..\..\vendor')">..\..\vendor\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
6157
</Reference>
6258
</ItemGroup>
6359
<ItemGroup>
64-
<Compile Include="**\*.cs"
65-
Exclude="obj\**" />
60+
<Compile Include="**\*.cs" Exclude="obj\**" />
6661
</ItemGroup>
6762
<ItemGroup>
68-
<None Include="packages.config" />
63+
<None Include="packages.config" />
6964
</ItemGroup>
7065
<Import Project="$(MsBuildToolsPath)\Microsoft.CSharp.targets" />
71-
</Project>
72-
66+
</Project>

‎src/Aspose.Pdf.Cloud.Sdk/Aspose.Pdf.Cloud.Sdk.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<dependencies>
2929

3030
<dependency id="NewtonSoft.Json" version="11.0.2" />
31-
<dependency id="RestSharp" version="106.2.1" />
31+
<dependency id="RestSharp" version="105.1.0" />
3232

3333
</dependencies>
3434
</metadata>

‎src/Aspose.Pdf.Cloud.Sdk/packages.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3+
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net45" developmentDependency="true" />
34
<package id="RestSharp" version="105.1.0" targetFramework="net45" developmentDependency="true" />
4-
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" developmentDependency="true" />
5-
</packages>
5+
</packages>

0 commit comments

Comments
 (0)