Skip to content
This repository was archived by the owner on Nov 7, 2023. It is now read-only.

Commit 4577286

Browse files
committed
fix(dependencies): update Newtonsoft.Json dependency to 9.0.1
To make dependency management for server installations easier, the plugin should use the same dependency versions as TShock if possible.
1 parent c345d52 commit 4577286

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

Protector.csproj

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -137,11 +137,9 @@
137137
</Reference>
138138
<Reference Include="MySql.Data, Version=6.9.8.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
139139
<HintPath>..\packages\MySql.Data.6.9.8\lib\net45\MySql.Data.dll</HintPath>
140-
<Private>True</Private>
141140
</Reference>
142-
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
143-
<HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
144-
<Private>True</Private>
141+
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
142+
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
145143
</Reference>
146144
<Reference Include="OTAPI">
147145
<HintPath>..\TShock\TerrariaServerAPI\TerrariaServerAPI\bin\Debug\OTAPI.dll</HintPath>
@@ -231,18 +229,18 @@
231229
<PostBuildEvent>
232230
</PostBuildEvent>
233231
</PropertyGroup>
234-
<PropertyGroup Label="SlowCheetah">
235-
<SlowCheetahToolsPath>$([System.IO.Path]::GetFullPath( $(MSBuildProjectDirectory)\..\packages\SlowCheetah.2.5.10.7\tools\))</SlowCheetahToolsPath>
236-
<SlowCheetah_EnableImportFromNuGet Condition=" '$(SlowCheetah_EnableImportFromNuGet)'=='' ">true</SlowCheetah_EnableImportFromNuGet>
237-
<SlowCheetah_NuGetImportPath Condition=" '$(SlowCheetah_NuGetImportPath)'=='' ">$([System.IO.Path]::GetFullPath( $(MSBuildProjectDirectory)\Properties\SlowCheetah\SlowCheetah.Transforms.targets ))</SlowCheetah_NuGetImportPath>
238-
<SlowCheetahTargets Condition=" '$(SlowCheetah_EnableImportFromNuGet)'=='true' and Exists('$(SlowCheetah_NuGetImportPath)') ">$(SlowCheetah_NuGetImportPath)</SlowCheetahTargets>
239-
</PropertyGroup>
240232
<Import Project="$(SlowCheetahTargets)" Condition="Exists('$(SlowCheetahTargets)')" Label="SlowCheetah" />
241233
<PropertyGroup>
242234
<PreBuildEvent>IF "$(ConfigurationName)" == "Release" (
243235
GitVersion.exe /updateassemblyinfo "$(ProjectDir)Properties/AssemblyInfo.cs"
244236
)</PreBuildEvent>
245237
</PropertyGroup>
238+
<PropertyGroup Label="SlowCheetah">
239+
<SlowCheetahToolsPath>$([System.IO.Path]::GetFullPath( $(MSBuildProjectDirectory)\..\packages\SlowCheetah.2.5.10.7\tools\))</SlowCheetahToolsPath>
240+
<SlowCheetah_EnableImportFromNuGet Condition=" '$(SlowCheetah_EnableImportFromNuGet)'=='' ">true</SlowCheetah_EnableImportFromNuGet>
241+
<SlowCheetah_NuGetImportPath Condition=" '$(SlowCheetah_NuGetImportPath)'=='' ">$([System.IO.Path]::GetFullPath( $(MSBuildProjectDirectory)\Properties\SlowCheetah\SlowCheetah.Transforms.targets ))</SlowCheetah_NuGetImportPath>
242+
<SlowCheetahTargets Condition=" '$(SlowCheetah_EnableImportFromNuGet)'=='true' and Exists('$(SlowCheetah_NuGetImportPath)') ">$(SlowCheetah_NuGetImportPath)</SlowCheetahTargets>
243+
</PropertyGroup>
246244
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
247245
Other similar extension points exist, see Microsoft.Common.targets.
248246
<Target Name="BeforeBuild">

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>
33
<package id="MySql.Data" version="6.9.8" targetFramework="net451" />
4-
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net451" />
4+
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net451" />
55
<package id="SlowCheetah" version="2.5.10.7" targetFramework="net451" />
66
</packages>

0 commit comments

Comments
 (0)