From 359ac3693ce13176393c49b4631769f1e0862c64 Mon Sep 17 00:00:00 2001
From: icedream <icedream2k9@die-optimisten.net>
Date: Thu, 22 May 2014 17:06:43 +0200
Subject: [PATCH] Dependencies upgraded

---
 libnpsharp.sln                   |  2 +-
 src/libnpsharp/app.config        | 11 +++++++++++
 src/libnpsharp/libnpsharp.csproj | 16 ++++++++--------
 src/libnpsharp/packages.config   |  2 +-
 src/npfile/npfile.csproj         |  6 +++---
 src/npfile/packages.config       |  3 +--
 src/npmotd/Program.cs            |  2 +-
 src/npserv/npserv.csproj         |  7 +++----
 8 files changed, 29 insertions(+), 20 deletions(-)
 create mode 100644 src/libnpsharp/app.config

diff --git a/libnpsharp.sln b/libnpsharp.sln
index 033a651..09d50cf 100644
--- a/libnpsharp.sln
+++ b/libnpsharp.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
+VisualStudioVersion = 12.0.30501.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "libnpsharp", "src\libnpsharp\libnpsharp.csproj", "{1A5AC63A-250E-4BC8-B81A-822AC31F5E37}"
 EndProject
diff --git a/src/libnpsharp/app.config b/src/libnpsharp/app.config
new file mode 100644
index 0000000..a01ef9c
--- /dev/null
+++ b/src/libnpsharp/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.5.0.0" newVersion="4.5.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/src/libnpsharp/libnpsharp.csproj b/src/libnpsharp/libnpsharp.csproj
index 0a1074f..d4b9bb2 100644
--- a/src/libnpsharp/libnpsharp.csproj
+++ b/src/libnpsharp/libnpsharp.csproj
@@ -42,11 +42,9 @@
     <OutputPath>$(SolutionDir)\bin\$(Configuration)\$(Platform)\</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=1.2.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.5.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Newtonsoft.Json.6.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -56,11 +54,12 @@
     <Reference Include="protobuf-net">
       <HintPath>..\..\packages\protobuf-net.2.0.0.668\lib\net40\protobuf-net.dll</HintPath>
     </Reference>
-    <Reference Include="uhttpsharp">
-      <HintPath>..\..\packages\uHttpSharp.0.1.4.7\lib\net40\uhttpsharp.dll</HintPath>
-    </Reference>
     <Reference Include="System.XML" />
     <Reference Include="System.Xml.Serialization" />
+    <Reference Include="uhttpsharp, Version=0.1.5247.25275, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\uHttpSharp.0.1.4.8\lib\net40\uhttpsharp.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Master\Messages\Client\MasterGetServersExtendedMessage.cs" />
@@ -142,6 +141,7 @@
   </Target>
   -->
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup />
diff --git a/src/libnpsharp/packages.config b/src/libnpsharp/packages.config
index 37cd439..ed29535 100644
--- a/src/libnpsharp/packages.config
+++ b/src/libnpsharp/packages.config
@@ -2,7 +2,7 @@
 
 <packages>
   <package id="log4net" version="2.0.3" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="5.0.8" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="6.0.3" targetFramework="net45" />
   <package id="protobuf-net" version="2.0.0.668" targetFramework="net45" />
   <package id="uHttpSharp" version="0.1.4.8" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/npfile/npfile.csproj b/src/npfile/npfile.csproj
index 9686bb2..fe27b7e 100644
--- a/src/npfile/npfile.csproj
+++ b/src/npfile/npfile.csproj
@@ -39,17 +39,17 @@
     <OutputPath>$(SolutionDir)\bin\$(Configuration)\$(Platform)\</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=1.2.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+    <Reference Include="log4net">
       <HintPath>..\..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json">
+    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Newtonsoft.Json.5.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Web" />
     <Reference Include="uhttpsharp">
-      <HintPath>..\..\packages\uHttpSharp.0.1.4.7\lib\net40\uhttpsharp.dll</HintPath>
+      <HintPath>..\..\packages\uHttpSharp.0.1.4.8\lib\net40\uhttpsharp.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/npfile/packages.config b/src/npfile/packages.config
index 3c5f228..8dc73fc 100644
--- a/src/npfile/packages.config
+++ b/src/npfile/packages.config
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <packages>
   <package id="log4net" version="2.0.3" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="5.0.8" targetFramework="net45" />
-  <package id="uHttpSharp" version="0.1.4.7" targetFramework="net45" />
+  <package id="uHttpSharp" version="0.1.4.8" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/npmotd/Program.cs b/src/npmotd/Program.cs
index 93d1475..91c27b4 100644
--- a/src/npmotd/Program.cs
+++ b/src/npmotd/Program.cs
@@ -71,7 +71,7 @@ namespace NPSharp.CommandLine.MOTD
                 {appender, new DebugAppender {Layout = appender.Layout, Threshold = Level.All}});
             }
 
-            ILog log = LogManager.GetLogger("Main");
+            var log = LogManager.GetLogger("Main");
 
             // Arguments
             if (args.Length < 4)
diff --git a/src/npserv/npserv.csproj b/src/npserv/npserv.csproj
index afca0e9..795cedd 100644
--- a/src/npserv/npserv.csproj
+++ b/src/npserv/npserv.csproj
@@ -53,7 +53,7 @@
     <Reference Include="HtmlAgilityPack">
       <HintPath>..\..\packages\HtmlAgilityPack.1.4.6\lib\Net45\HtmlAgilityPack.dll</HintPath>
     </Reference>
-    <Reference Include="log4net, Version=1.2.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+    <Reference Include="log4net">
       <HintPath>..\..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
@@ -65,9 +65,8 @@
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Core" />
-    <Reference Include="uhttpsharp, Version=0.1.5230.25021, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\uHttpSharp.0.1.4.7\lib\net40\uhttpsharp.dll</HintPath>
+    <Reference Include="uhttpsharp">
+      <HintPath>..\..\packages\uHttpSharp.0.1.4.8\lib\net40\uhttpsharp.dll</HintPath>
     </Reference>
     <Reference Include="VDS.Common">
       <HintPath>..\..\packages\VDS.Common.1.2.0\lib\net40-client\VDS.Common.dll</HintPath>