aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ModLauncher/App.config2
-rw-r--r--ShiftOS.MFSProfiler/App.config2
-rw-r--r--ShiftOS.Modding.VB.LegacySkinConverter/App.config2
-rw-r--r--ShiftOS.Modding.VirtualMachine/App.config2
-rw-r--r--ShiftOS.Objects/ShiftOS.Objects.csproj7
-rw-r--r--ShiftOS.Objects/packages.config2
-rw-r--r--ShiftOS.Server.WebAdmin/ShiftOS.Server.WebAdmin.csproj4
-rw-r--r--ShiftOS.Server.WebAdmin/packages.config2
-rw-r--r--ShiftOS.WinForms/App.config2
-rw-r--r--ShiftOS.WinForms/ShiftOS.WinForms.csproj7
-rw-r--r--ShiftOS.WinForms/packages.config2
-rw-r--r--ShiftOS_TheReturn/App.config2
-rw-r--r--ShiftOS_TheReturn/ShiftOS.Engine.csproj7
-rw-r--r--ShiftOS_TheReturn/packages.config4
14 files changed, 25 insertions, 22 deletions
diff --git a/ModLauncher/App.config b/ModLauncher/App.config
index 71a06ba..151cc15 100644
--- a/ModLauncher/App.config
+++ b/ModLauncher/App.config
@@ -7,7 +7,7 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+ <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
diff --git a/ShiftOS.MFSProfiler/App.config b/ShiftOS.MFSProfiler/App.config
index efb416e..5ce46cf 100644
--- a/ShiftOS.MFSProfiler/App.config
+++ b/ShiftOS.MFSProfiler/App.config
@@ -8,7 +8,7 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+ <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
diff --git a/ShiftOS.Modding.VB.LegacySkinConverter/App.config b/ShiftOS.Modding.VB.LegacySkinConverter/App.config
index 71a06ba..151cc15 100644
--- a/ShiftOS.Modding.VB.LegacySkinConverter/App.config
+++ b/ShiftOS.Modding.VB.LegacySkinConverter/App.config
@@ -7,7 +7,7 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+ <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
diff --git a/ShiftOS.Modding.VirtualMachine/App.config b/ShiftOS.Modding.VirtualMachine/App.config
index 71a06ba..151cc15 100644
--- a/ShiftOS.Modding.VirtualMachine/App.config
+++ b/ShiftOS.Modding.VirtualMachine/App.config
@@ -7,7 +7,7 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+ <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
diff --git a/ShiftOS.Objects/ShiftOS.Objects.csproj b/ShiftOS.Objects/ShiftOS.Objects.csproj
index 867c540..5166829 100644
--- a/ShiftOS.Objects/ShiftOS.Objects.csproj
+++ b/ShiftOS.Objects/ShiftOS.Objects.csproj
@@ -30,6 +30,10 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Windows.Forms" />
@@ -39,9 +43,6 @@
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
- <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
- <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
- </Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="ClientSave.cs" />
diff --git a/ShiftOS.Objects/packages.config b/ShiftOS.Objects/packages.config
index 9d64bf3..db67311 100644
--- a/ShiftOS.Objects/packages.config
+++ b/ShiftOS.Objects/packages.config
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net452" />
+ <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net451" />
</packages> \ No newline at end of file
diff --git a/ShiftOS.Server.WebAdmin/ShiftOS.Server.WebAdmin.csproj b/ShiftOS.Server.WebAdmin/ShiftOS.Server.WebAdmin.csproj
index faec295..9824c43 100644
--- a/ShiftOS.Server.WebAdmin/ShiftOS.Server.WebAdmin.csproj
+++ b/ShiftOS.Server.WebAdmin/ShiftOS.Server.WebAdmin.csproj
@@ -49,8 +49,8 @@
<HintPath>..\packages\Nancy.Hosting.Self.1.4.1\lib\net40\Nancy.Hosting.Self.dll</HintPath>
<Private>True</Private>
</Reference>
- <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
- <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+ <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
diff --git a/ShiftOS.Server.WebAdmin/packages.config b/ShiftOS.Server.WebAdmin/packages.config
index a403e33..a6769e8 100644
--- a/ShiftOS.Server.WebAdmin/packages.config
+++ b/ShiftOS.Server.WebAdmin/packages.config
@@ -4,5 +4,5 @@
<package id="Nancy.Authentication.Forms" version="1.4.1" targetFramework="net452" />
<package id="Nancy.Authentication.Stateless" version="1.4.1" targetFramework="net452" />
<package id="Nancy.Hosting.Self" version="1.4.1" targetFramework="net452" />
- <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net452" />
+ <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net452" />
</packages> \ No newline at end of file
diff --git a/ShiftOS.WinForms/App.config b/ShiftOS.WinForms/App.config
index efb416e..5ce46cf 100644
--- a/ShiftOS.WinForms/App.config
+++ b/ShiftOS.WinForms/App.config
@@ -8,7 +8,7 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+ <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
diff --git a/ShiftOS.WinForms/ShiftOS.WinForms.csproj b/ShiftOS.WinForms/ShiftOS.WinForms.csproj
index 9212406..16b72be 100644
--- a/ShiftOS.WinForms/ShiftOS.WinForms.csproj
+++ b/ShiftOS.WinForms/ShiftOS.WinForms.csproj
@@ -37,6 +37,10 @@
<HintPath>..\packages\CommonMark.NET.0.15.0\lib\net45\CommonMark.dll</HintPath>
<Private>True</Private>
</Reference>
+ <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
@@ -48,9 +52,6 @@
<Reference Include="System.Net.Http" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
- <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
- <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
- </Reference>
<Reference Include="Vlc.DotNet.Core.Interops, Version=2.1.130.0, Culture=neutral, PublicKeyToken=84529da31f4eb963, processorArchitecture=x86">
<HintPath>..\packages\Vlc.DotNet.Core.Interops.2.1.130\lib\net45\x86\Vlc.DotNet.Core.Interops.dll</HintPath>
<Private>True</Private>
diff --git a/ShiftOS.WinForms/packages.config b/ShiftOS.WinForms/packages.config
index b591ab5..ff30bda 100644
--- a/ShiftOS.WinForms/packages.config
+++ b/ShiftOS.WinForms/packages.config
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="CommonMark.NET" version="0.15.0" targetFramework="net451" />
- <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net452" />
+ <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net451" />
<package id="Vlc.DotNet.Core.Interops" version="2.1.130" targetFramework="net451" />
</packages> \ No newline at end of file
diff --git a/ShiftOS_TheReturn/App.config b/ShiftOS_TheReturn/App.config
index efb416e..5ce46cf 100644
--- a/ShiftOS_TheReturn/App.config
+++ b/ShiftOS_TheReturn/App.config
@@ -8,7 +8,7 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+ <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
diff --git a/ShiftOS_TheReturn/ShiftOS.Engine.csproj b/ShiftOS_TheReturn/ShiftOS.Engine.csproj
index 1ae2855..d365f55 100644
--- a/ShiftOS_TheReturn/ShiftOS.Engine.csproj
+++ b/ShiftOS_TheReturn/ShiftOS.Engine.csproj
@@ -68,6 +68,10 @@
<Reference Include="NetSockets">
<HintPath>..\Libraries\NetSockets.dll</HintPath>
</Reference>
+ <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.IO.Compression" />
@@ -112,9 +116,6 @@
<Reference Include="Microsoft.Scripting.Metadata, Version=1.1.0.20, Culture=neutral, PublicKeyToken=7f709c5b713576e1">
<HintPath>..\packages\IronPython.2.7.5\lib\Net45\Microsoft.Scripting.Metadata.dll</HintPath>
</Reference>
- <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
- <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
- </Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="AppearanceManager.cs" />
diff --git a/ShiftOS_TheReturn/packages.config b/ShiftOS_TheReturn/packages.config
index 80990d5..6add001 100644
--- a/ShiftOS_TheReturn/packages.config
+++ b/ShiftOS_TheReturn/packages.config
@@ -2,5 +2,5 @@
<packages>
<package id="DynamicLua" version="1.1.2.0" targetFramework="net452" />
<package id="NAudio" version="1.8.0" targetFramework="net451" />
- <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net452" />
-</packages>
+ <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net451" />
+</packages> \ No newline at end of file
generated by cgit v1.2.3 (git 2.46.0) at 2026-06-04 09:39:30 +0000