diff --git a/NzbDrone.Api/NzbDrone.Api.csproj b/NzbDrone.Api/NzbDrone.Api.csproj
index 300992cb5..49934fb6f 100644
--- a/NzbDrone.Api/NzbDrone.Api.csproj
+++ b/NzbDrone.Api/NzbDrone.Api.csproj
@@ -55,7 +55,7 @@
False
- ..\packages\Newtonsoft.Json.5.0.3\lib\net35\Newtonsoft.Json.dll
+ ..\packages\Newtonsoft.Json.5.0.6\lib\net40\Newtonsoft.Json.dll
False
diff --git a/NzbDrone.Api/packages.config b/NzbDrone.Api/packages.config
index f7dfe8456..cebd7c5dc 100644
--- a/NzbDrone.Api/packages.config
+++ b/NzbDrone.Api/packages.config
@@ -4,7 +4,7 @@
-
+
\ No newline at end of file
diff --git a/NzbDrone.Common/NzbDrone.Common.csproj b/NzbDrone.Common/NzbDrone.Common.csproj
index 8b1b1259a..2d3fd449d 100644
--- a/NzbDrone.Common/NzbDrone.Common.csproj
+++ b/NzbDrone.Common/NzbDrone.Common.csproj
@@ -46,7 +46,7 @@
False
- ..\packages\Newtonsoft.Json.5.0.3\lib\net35\Newtonsoft.Json.dll
+ ..\packages\Newtonsoft.Json.5.0.6\lib\net40\Newtonsoft.Json.dll
False
diff --git a/NzbDrone.Common/packages.config b/NzbDrone.Common/packages.config
index 9bc3a3d0d..c1ce89767 100644
--- a/NzbDrone.Common/packages.config
+++ b/NzbDrone.Common/packages.config
@@ -1,7 +1,7 @@
-
+
\ No newline at end of file
diff --git a/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj b/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
index 3fd954996..bd2e4b122 100644
--- a/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
+++ b/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
@@ -76,7 +76,7 @@
False
- ..\packages\Newtonsoft.Json.5.0.3\lib\net35\Newtonsoft.Json.dll
+ ..\packages\Newtonsoft.Json.5.0.6\lib\net40\Newtonsoft.Json.dll
False
diff --git a/NzbDrone.Core.Test/packages.config b/NzbDrone.Core.Test/packages.config
index 2d577817c..d5925e31a 100644
--- a/NzbDrone.Core.Test/packages.config
+++ b/NzbDrone.Core.Test/packages.config
@@ -7,7 +7,7 @@
-
+
diff --git a/NzbDrone.Core/NzbDrone.Core.csproj b/NzbDrone.Core/NzbDrone.Core.csproj
index 12a437e7e..30ad06789 100644
--- a/NzbDrone.Core/NzbDrone.Core.csproj
+++ b/NzbDrone.Core/NzbDrone.Core.csproj
@@ -79,7 +79,7 @@
False
- ..\packages\Newtonsoft.Json.5.0.3\lib\net35\Newtonsoft.Json.dll
+ ..\packages\Newtonsoft.Json.5.0.6\lib\net40\Newtonsoft.Json.dll
False
diff --git a/NzbDrone.Core/packages.config b/NzbDrone.Core/packages.config
index b065f400a..760898188 100644
--- a/NzbDrone.Core/packages.config
+++ b/NzbDrone.Core/packages.config
@@ -3,7 +3,7 @@
-
+
diff --git a/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj b/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj
index 2225c94c1..435637e90 100644
--- a/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj
+++ b/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj
@@ -62,8 +62,9 @@
False
..\packages\Nancy.Owin.0.16.1\lib\net40\Nancy.Owin.dll
-
- ..\packages\Newtonsoft.Json.5.0.3\lib\net35\Newtonsoft.Json.dll
+
+ False
+ ..\packages\Newtonsoft.Json.5.0.6\lib\net40\Newtonsoft.Json.dll
..\packages\NLog.2.0.1.2\lib\net40\NLog.dll
diff --git a/NzbDrone.Integration.Test/packages.config b/NzbDrone.Integration.Test/packages.config
index 0f1e38b8a..3f0ac1830 100644
--- a/NzbDrone.Integration.Test/packages.config
+++ b/NzbDrone.Integration.Test/packages.config
@@ -8,7 +8,7 @@
-
+
diff --git a/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj b/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj
index 171f9df7d..b3bb03f0c 100644
--- a/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj
+++ b/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj
@@ -53,7 +53,7 @@
False
- ..\packages\Newtonsoft.Json.5.0.3\lib\net35\Newtonsoft.Json.dll
+ ..\packages\Newtonsoft.Json.5.0.6\lib\net40\Newtonsoft.Json.dll
False
diff --git a/NzbDrone.Test.Common/packages.config b/NzbDrone.Test.Common/packages.config
index 11b24f356..8c1697cb3 100644
--- a/NzbDrone.Test.Common/packages.config
+++ b/NzbDrone.Test.Common/packages.config
@@ -3,7 +3,7 @@
-
+
diff --git a/NzbDrone/NzbDrone.csproj b/NzbDrone/NzbDrone.csproj
index fbc7602a5..d06fd6099 100644
--- a/NzbDrone/NzbDrone.csproj
+++ b/NzbDrone/NzbDrone.csproj
@@ -108,7 +108,7 @@
False
- ..\packages\Newtonsoft.Json.5.0.3\lib\net40\Newtonsoft.Json.dll
+ ..\packages\Newtonsoft.Json.5.0.6\lib\net40\Newtonsoft.Json.dll
False
diff --git a/NzbDrone/packages.config b/NzbDrone/packages.config
index 3ded934ee..b916d2a06 100644
--- a/NzbDrone/packages.config
+++ b/NzbDrone/packages.config
@@ -8,7 +8,7 @@
-
+
diff --git a/build.ps1 b/build.ps1
index fbedc2f59..83338d66d 100644
--- a/build.ps1
+++ b/build.ps1
@@ -26,6 +26,8 @@ Function Build()
CheckExitCode
CleanFolder $outputFolder
+
+ AddJsonNet
}
Function CleanFolder($path)
@@ -35,6 +37,8 @@ Function CleanFolder($path)
get-childitem $path -File -Filter *.transform -Recurse | foreach ($_) {remove-item $_.fullname}
+ get-childitem $path -File -Filter Newtonsoft.Json.* -Recurse | foreach ($_) {remove-item $_.fullname}
+
Write-Host Removing FluentValidation.Resources files
get-childitem $path -File -Filter FluentValidation.resources.dll -recurse | foreach ($_) {remove-item $_.fullname}
@@ -47,6 +51,12 @@ Function CleanFolder($path)
}
}
+
+Function AddJsonNet()
+{
+ Copy-Item .\packages\Newtonsoft.Json.5.*\lib\net35\*.* -Destination $outputFolder -Verbose
+}
+
Function PackageTests()
{
Write-Host Packaging Tests