aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael <[email protected]>2017-02-13 13:41:18 -0500
committerMichael <[email protected]>2017-02-13 13:41:18 -0500
commitd54cc313019fee324a9df2601f19e6d56d241eba (patch)
tree1b9accbb30939b61e0843b1dd135a9e3923f8e7d
parentd3a70b7a39bf1c73ff0463a8f06c82359a672bb0 (diff)
downloadshiftos_thereturn-d54cc313019fee324a9df2601f19e6d56d241eba.tar.gz
shiftos_thereturn-d54cc313019fee324a9df2601f19e6d56d241eba.tar.bz2
shiftos_thereturn-d54cc313019fee324a9df2601f19e6d56d241eba.zip
fix nuget mosquitos
-rw-r--r--ShiftOS.Server/App.config14
-rw-r--r--ShiftOS.Server/ShiftOS.Server.csproj2
-rw-r--r--ShiftOS.Server/packages.config46
-rw-r--r--ShiftOS.WinForms/ShiftOS.WinForms.csproj4
-rw-r--r--ShiftOS.WinForms/packages.config2
-rw-r--r--ShiftOS_TheReturn/ShiftOS.Engine.csproj4
-rw-r--r--ShiftOS_TheReturn/packages.config2
7 files changed, 37 insertions, 37 deletions
diff --git a/ShiftOS.Server/App.config b/ShiftOS.Server/App.config
index 05150dc..cadfa91 100644
--- a/ShiftOS.Server/App.config
+++ b/ShiftOS.Server/App.config
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1"/>
</startup>
<runtime>
- <loadFromRemoteSources enabled="true" />
+ <loadFromRemoteSources enabled="true"/>
<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" />
+ <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
+ <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
- <assemblyIdentity name="System.Interactive.Async" publicKeyToken="94bc3704cddfc263" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-3.0.1000.0" newVersion="3.0.1000.0" />
+ <assemblyIdentity name="System.Interactive.Async" publicKeyToken="94bc3704cddfc263" culture="neutral"/>
+ <bindingRedirect oldVersion="0.0.0.0-3.0.1000.0" newVersion="3.0.1000.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
diff --git a/ShiftOS.Server/ShiftOS.Server.csproj b/ShiftOS.Server/ShiftOS.Server.csproj
index cb231cc..a6af8c7 100644
--- a/ShiftOS.Server/ShiftOS.Server.csproj
+++ b/ShiftOS.Server/ShiftOS.Server.csproj
@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ShiftOS.Server</RootNamespace>
<AssemblyName>ShiftOS.Server</AssemblyName>
- <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile />
diff --git a/ShiftOS.Server/packages.config b/ShiftOS.Server/packages.config
index 074a8be..325c809 100644
--- a/ShiftOS.Server/packages.config
+++ b/ShiftOS.Server/packages.config
@@ -1,39 +1,39 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Discord.Net.Core" version="1.0.0-rc-00595" targetFramework="net451" requireReinstallation="true" />
+ <package id="Discord.Net.Core" version="1.0.0-rc-00595" targetFramework="net451" />
<package id="Discord.Net.Providers.WS4Net" version="1.0.0-rc-00595" targetFramework="net461" />
- <package id="Discord.Net.Rest" version="1.0.0-rc-00595" targetFramework="net451" requireReinstallation="true" />
- <package id="Discord.Net.Rpc" version="1.0.0-rc-00595" targetFramework="net451" requireReinstallation="true" />
- <package id="Discord.Net.WebSocket" version="1.0.0-rc-00595" targetFramework="net451" requireReinstallation="true" />
+ <package id="Discord.Net.Rest" version="1.0.0-rc-00595" targetFramework="net451" />
+ <package id="Discord.Net.Rpc" version="1.0.0-rc-00595" targetFramework="net451" />
+ <package id="Discord.Net.WebSocket" version="1.0.0-rc-00595" targetFramework="net451" />
<package id="DynamicLua" version="1.1.2.0" targetFramework="net452" />
<package id="Microsoft.NETCore.Platforms" version="1.0.1" targetFramework="net451" />
- <package id="Microsoft.Win32.Primitives" version="4.0.1" targetFramework="net461" />
+ <package id="Microsoft.Win32.Primitives" version="4.0.1" targetFramework="net461" requireReinstallation="true" />
<package id="NETStandard.Library" version="1.6.0" targetFramework="net451" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net451" />
<package id="Nito.AsyncEx" version="3.0.1" targetFramework="net451" />
- <package id="RestSharp" version="105.2.3" targetFramework="net451" requireReinstallation="true" />
- <package id="System.AppContext" version="4.1.0" targetFramework="net461" />
+ <package id="RestSharp" version="105.2.3" targetFramework="net451" />
+ <package id="System.AppContext" version="4.1.0" targetFramework="net461" requireReinstallation="true" />
<package id="System.Collections" version="4.0.11" targetFramework="net451" />
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net451" />
<package id="System.Collections.Immutable" version="1.3.0" targetFramework="net451" />
- <package id="System.Console" version="4.0.0" targetFramework="net461" />
+ <package id="System.Console" version="4.0.0" targetFramework="net461" requireReinstallation="true" />
<package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="net451" />
- <package id="System.Diagnostics.DiagnosticSource" version="4.3.0" targetFramework="net461" />
+ <package id="System.Diagnostics.DiagnosticSource" version="4.3.0" targetFramework="net461" requireReinstallation="true" />
<package id="System.Diagnostics.Tools" version="4.0.1" targetFramework="net451" />
<package id="System.Diagnostics.Tracing" version="4.1.0" targetFramework="net451" />
<package id="System.Globalization" version="4.0.11" targetFramework="net451" />
- <package id="System.Globalization.Calendars" version="4.0.1" targetFramework="net461" />
- <package id="System.Interactive.Async" version="3.1.0" targetFramework="net451" requireReinstallation="true" />
+ <package id="System.Globalization.Calendars" version="4.0.1" targetFramework="net461" requireReinstallation="true" />
+ <package id="System.Interactive.Async" version="3.1.0" targetFramework="net451" />
<package id="System.IO" version="4.1.0" targetFramework="net451" />
- <package id="System.IO.Compression" version="4.3.0" targetFramework="net451" requireReinstallation="true" />
- <package id="System.IO.Compression.ZipFile" version="4.0.1" targetFramework="net461" />
- <package id="System.IO.FileSystem" version="4.3.0" targetFramework="net461" />
- <package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="net461" />
+ <package id="System.IO.Compression" version="4.3.0" targetFramework="net451" />
+ <package id="System.IO.Compression.ZipFile" version="4.0.1" targetFramework="net461" requireReinstallation="true" />
+ <package id="System.IO.FileSystem" version="4.3.0" targetFramework="net461" requireReinstallation="true" />
+ <package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="net461" requireReinstallation="true" />
<package id="System.Linq" version="4.3.0" targetFramework="net451" />
<package id="System.Linq.Expressions" version="4.3.0" targetFramework="net451" />
- <package id="System.Net.Http" version="4.3.0" targetFramework="net451" requireReinstallation="true" />
+ <package id="System.Net.Http" version="4.3.0" targetFramework="net451" />
<package id="System.Net.Primitives" version="4.0.11" targetFramework="net451" />
- <package id="System.Net.Sockets" version="4.3.0" targetFramework="net461" />
+ <package id="System.Net.Sockets" version="4.3.0" targetFramework="net461" requireReinstallation="true" />
<package id="System.ObjectModel" version="4.0.12" targetFramework="net451" />
<package id="System.Reflection" version="4.3.0" targetFramework="net451" />
<package id="System.Reflection.Extensions" version="4.0.1" targetFramework="net451" />
@@ -41,15 +41,15 @@
<package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net451" />
<package id="System.Runtime" version="4.3.0" targetFramework="net451" />
<package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net451" />
- <package id="System.Runtime.Handles" version="4.0.1" targetFramework="net461" />
+ <package id="System.Runtime.Handles" version="4.0.1" targetFramework="net461" requireReinstallation="true" />
<package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net451" />
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.0.0" targetFramework="net451" />
<package id="System.Runtime.Numerics" version="4.0.1" targetFramework="net451" />
- <package id="System.Runtime.Serialization.Primitives" version="4.3.0" targetFramework="net451" requireReinstallation="true" />
- <package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net461" />
- <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net461" />
- <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net461" />
- <package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="net461" />
+ <package id="System.Runtime.Serialization.Primitives" version="4.3.0" targetFramework="net451" />
+ <package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net461" requireReinstallation="true" />
+ <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net461" requireReinstallation="true" />
+ <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net461" requireReinstallation="true" />
+ <package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="net461" requireReinstallation="true" />
<package id="System.Text.Encoding" version="4.0.11" targetFramework="net451" />
<package id="System.Text.Encoding.Extensions" version="4.0.11" targetFramework="net451" />
<package id="System.Text.RegularExpressions" version="4.1.0" targetFramework="net451" />
diff --git a/ShiftOS.WinForms/ShiftOS.WinForms.csproj b/ShiftOS.WinForms/ShiftOS.WinForms.csproj
index 16b72be..a7b90d4 100644
--- a/ShiftOS.WinForms/ShiftOS.WinForms.csproj
+++ b/ShiftOS.WinForms/ShiftOS.WinForms.csproj
@@ -37,8 +37,8 @@
<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>
+ <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>
<Private>True</Private>
</Reference>
<Reference Include="System" />
diff --git a/ShiftOS.WinForms/packages.config b/ShiftOS.WinForms/packages.config
index ff30bda..1a0dc91 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="8.0.3" targetFramework="net451" />
+ <package id="Newtonsoft.Json" version="9.0.1" 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/ShiftOS.Engine.csproj b/ShiftOS_TheReturn/ShiftOS.Engine.csproj
index d365f55..a8c041d 100644
--- a/ShiftOS_TheReturn/ShiftOS.Engine.csproj
+++ b/ShiftOS_TheReturn/ShiftOS.Engine.csproj
@@ -68,8 +68,8 @@
<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>
+ <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>
<Private>True</Private>
</Reference>
<Reference Include="System" />
diff --git a/ShiftOS_TheReturn/packages.config b/ShiftOS_TheReturn/packages.config
index 6add001..5f5c3b4 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="8.0.3" targetFramework="net451" />
+ <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net451" />
</packages> \ No newline at end of file