Skip to content

Commit f95c8d1

Browse files
committed
Fix newstonsoft.json conflict
1 parent a7849b0 commit f95c8d1

20 files changed

Lines changed: 57944 additions & 15 deletions

APIDebug/APIDebug.csproj

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,6 @@
3535
<Prefer32Bit>false</Prefer32Bit>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
40-
<Private>True</Private>
41-
</Reference>
4238
<Reference Include="System" />
4339
<Reference Include="System.Core" />
4440
<Reference Include="System.Xml.Linq" />
@@ -51,10 +47,6 @@
5147
<Compile Include="Program.cs" />
5248
<Compile Include="Properties\AssemblyInfo.cs" />
5349
</ItemGroup>
54-
<ItemGroup>
55-
<None Include="app.config" />
56-
<None Include="packages.config" />
57-
</ItemGroup>
5850
<ItemGroup>
5951
<ProjectReference Include="..\CodeforcesAPI\CodeforcesAPI.csproj">
6052
<Project>{b6d8757a-009a-4bae-8845-aeb820b640b6}</Project>

CodeforcesAPI.sln

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 14
4-
VisualStudioVersion = 14.0.23107.0
4+
VisualStudioVersion = 14.0.24720.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeforcesAPI", "CodeforcesAPI\CodeforcesAPI.csproj", "{B6D8757A-009A-4BAE-8845-AEB820B640B6}"
77
EndProject

CodeforcesAPI/CodeforcesAPI.csproj

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
<Prefer32Bit>false</Prefer32Bit>
3434
</PropertyGroup>
3535
<ItemGroup>
36-
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
37-
<HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
36+
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
37+
<HintPath>..\packages\Newtonsoft.Json.6.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
3838
<Private>True</Private>
3939
</Reference>
4040
<Reference Include="System" />
@@ -46,7 +46,7 @@
4646
<Private>True</Private>
4747
</Reference>
4848
<Reference Include="System.Net.Http.Formatting, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
49-
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath>
49+
<HintPath>..\packages\System.Net.Http.Formatting.Extension.5.2.3.0\lib\System.Net.Http.Formatting.dll</HintPath>
5050
<Private>True</Private>
5151
</Reference>
5252
<Reference Include="System.Net.Http.Primitives, Version=4.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -99,7 +99,6 @@
9999
<Compile Include="Types\User.cs" />
100100
</ItemGroup>
101101
<ItemGroup>
102-
<None Include="app.config" />
103102
<None Include="packages.config" />
104103
</ItemGroup>
105104
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

CodeforcesAPI/packages.config

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net45" />
4-
<package id="Newtonsoft.Json" version="8.0.2" targetFramework="net45" />
3+
<package id="Newtonsoft.Json" version="6.0.1" targetFramework="net45" />
54
<package id="System.Net.Http" version="4.0.0" targetFramework="net45" />
65
<package id="System.Net.Http.Formatting.Extension" version="5.2.3.0" targetFramework="net45" />
76
</packages>
1.42 MB
Binary file not shown.
477 KB
Binary file not shown.

packages/Newtonsoft.Json.6.0.1/lib/net20/Newtonsoft.Json.xml

Lines changed: 9054 additions & 0 deletions
Large diffs are not rendered by default.
416 KB
Binary file not shown.

packages/Newtonsoft.Json.6.0.1/lib/net35/Newtonsoft.Json.xml

Lines changed: 8197 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
471 KB
Binary file not shown.

0 commit comments

Comments
 (0)