Skip to content
This repository was archived by the owner on Oct 4, 2021. It is now read-only.

Commit 609e626

Browse files
mhutchmhutch
committed
Revert "Downgrade Newtonsoft.Json from v9 to v8 to fix XVS runtime issues"
This reverts commit 7101695.
1 parent c871fe1 commit 609e626

File tree

13 files changed

+13
-13
lines changed

13 files changed

+13
-13
lines changed

‎main/src/addins/MonoDevelop.ConnectedServices/MonoDevelop.ConnectedServices.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
<Private>False</Private>
8585
</Reference>
8686
<Reference Include="Newtonsoft.Json">
87-
<HintPath>..\..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
87+
<HintPath>..\..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
8888
<Private>False</Private>
8989
</Reference>
9090
</ItemGroup>

‎main/src/addins/MonoDevelop.ConnectedServices/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
3+
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
44
</packages>

‎main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
<HintPath>..\..\..\..\external\nuget-binary\NuGet.Resolver.dll</HintPath>
9191
</Reference>
9292
<Reference Include="Newtonsoft.Json">
93-
<HintPath>..\..\..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
93+
<HintPath>..\..\..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
9494
</Reference>
9595
<Reference Include="NuGet.ProjectModel">
9696
<HintPath>..\..\..\..\external\nuget-binary\NuGet.ProjectModel.dll</HintPath>

‎main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
3+
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
44
</packages>

‎main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
141141
<HintPath>..\..\..\external\nuget-binary\NuGet.Indexing.dll</HintPath>
142142
</Reference>
143143
<Reference Include="Newtonsoft.Json">
144-
<HintPath>..\..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
144+
<HintPath>..\..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
145145
<Private>False</Private>
146146
</Reference>
147147
<Reference Include="System.Collections.Immutable">

‎main/src/addins/MonoDevelop.PackageManagement/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
3+
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
44
</packages>

‎main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@
157157
<HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.Features.1.3.2\lib\net45\Microsoft.CodeAnalysis.CSharp.Features.dll</HintPath>
158158
</Reference>
159159
<Reference Include="Newtonsoft.Json">
160-
<HintPath>..\..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
160+
<HintPath>..\..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
161161
</Reference>
162162
</ItemGroup>
163163
<ItemGroup>

‎main/src/core/MonoDevelop.Core/packages.config

+1-1
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="8.0.3" targetFramework="net45" />
3+
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
44
<package id="Microsoft.CodeAnalysis" version="1.3.2" targetFramework="net45" />
55
<package id="Microsoft.CodeAnalysis.Analyzers" version="1.1.0" targetFramework="net45" />
66
<package id="Microsoft.CodeAnalysis.Common" version="1.3.2" targetFramework="net45" />

‎main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145
<Private>False</Private>
146146
</Reference>
147147
<Reference Include="Newtonsoft.Json">
148-
<HintPath>..\..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
148+
<HintPath>..\..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
149149
<Private>False</Private>
150150
</Reference>
151151
<Reference Include="System.Collections.Immutable">

‎main/src/core/MonoDevelop.Ide/packages.config

+1-1
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="8.0.3" targetFramework="net45" />
3+
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
44
<package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
55
<package id="YamlDotNet.Signed" version="4.0.1-pre291" targetFramework="net45" />
66
</packages>

‎main/src/core/MonoDevelop.Startup/app.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</dependentAssembly>
1515
<dependentAssembly>
1616
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
17-
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0"/>
17+
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0"/>
1818
</dependentAssembly>
1919
<dependentAssembly>
2020
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>

‎main/tests/UserInterfaceTests/UserInterfaceTests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
6767
<Reference Include="System.Xml" />
6868
<Reference Include="Newtonsoft.Json">
69-
<HintPath>..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
69+
<HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
7070
<Private>False</Private>
7171
</Reference>
7272
</ItemGroup>

‎main/tests/UserInterfaceTests/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
3+
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
44
<package id="NUnit" version="2.6.4" targetFramework="net45" />
55
</packages>

0 commit comments

Comments
 (0)