From d0ddc75b41724c228347688586b7fa0b6e5b3eb5 Mon Sep 17 00:00:00 2001 From: icedream Date: Wed, 16 Jul 2014 10:20:22 +0200 Subject: [PATCH] log4net is sometimes causing problems on integration, updated references. --- src/client/NPSharp.Client.csproj | 7 ++++--- src/npfile/npfile.csproj | 3 +-- src/npfile/packages.config | 1 - src/npmotd/packages.config | 1 - src/server/NPSharp.Server.csproj | 9 ++++----- 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/client/NPSharp.Client.csproj b/src/client/NPSharp.Client.csproj index a82e3a9..a22dd16 100644 --- a/src/client/NPSharp.Client.csproj +++ b/src/client/NPSharp.Client.csproj @@ -32,8 +32,9 @@ 4 - - $(SolutionDir)\packages\log4net.2.0.3\lib\net40-full\log4net.dll + + False + ..\..\packages\log4net.2.0.3\lib\net40-full\log4net.dll $(SolutionDir)\packages\protobuf-net.2.0.0.668\lib\net40\protobuf-net.dll @@ -124,4 +125,4 @@ --> - + \ No newline at end of file diff --git a/src/npfile/npfile.csproj b/src/npfile/npfile.csproj index 4814860..56d6575 100644 --- a/src/npfile/npfile.csproj +++ b/src/npfile/npfile.csproj @@ -39,11 +39,10 @@ $(SolutionDir)\bin\$(Configuration)\$(Platform)\ - + ..\..\packages\log4net.2.0.3\lib\net40-full\log4net.dll - False ..\..\packages\Newtonsoft.Json.6.0.3\lib\net45\Newtonsoft.Json.dll diff --git a/src/npfile/packages.config b/src/npfile/packages.config index cf79982..b5b0d66 100644 --- a/src/npfile/packages.config +++ b/src/npfile/packages.config @@ -1,5 +1,4 @@  - diff --git a/src/npmotd/packages.config b/src/npmotd/packages.config index 2ae8fd0..3a86f25 100644 --- a/src/npmotd/packages.config +++ b/src/npmotd/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/src/server/NPSharp.Server.csproj b/src/server/NPSharp.Server.csproj index 54d2a44..7734d72 100644 --- a/src/server/NPSharp.Server.csproj +++ b/src/server/NPSharp.Server.csproj @@ -42,14 +42,13 @@ $(SolutionDir)\bin\$(Configuration)\$(Platform)\ + + ..\..\packages\log4net.2.0.3\lib\net40-full\log4net.dll + - False - $(SolutionDir)\packages\Newtonsoft.Json.6.0.3\lib\net45\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.6.0.3\lib\net45\Newtonsoft.Json.dll - - $(SolutionDir)\packages\log4net.2.0.3\lib\net40-full\log4net.dll - False ..\..\packages\uHttpSharp.0.1.5.4\lib\net40\uhttpsharp.dll