Merge branch 'hotfix/1.7.4'

Author: carolynvs

paket.dependencies

@@ -11,7 +11,7 @@ nuget Moq
 nuget Newtonsoft.Json ~> 6.0
 nuget NuGet.CommandLine = 3.4.4-rtm-final
 nuget SharpZipLib
-nuget SimpleRESTServices = 1.3.0.1
+nuget SimpleRESTServices = 1.3.0.1-json002
 nuget xunit
 nuget xunit.abstractions
 nuget xunit.assert

paket.lock

@@ -1,18 +1,18 @@
 REDIRECTS: ON
 NUGET
   remote: https://www.myget.org/F/openstacknetsdk/api/v2
-  specs:
     EWSoftware.SHFB (2014.11.22-beta)
+    SimpleRESTServices (1.3.0.1-json002)
+      Newtonsoft.Json (>= 6.0.4)
   remote: https://www.nuget.org/api/v2
-  specs:
     Flurl.Http.Signed (0.7)
       Flurl.Signed (>= 1.0.10) - framework: >= net45, portable-net45+sl50+win+wpa81+wp80
       Microsoft.Bcl.Async (>= 1.0.168) - framework: portable-net45+sl50+win+wpa81+wp80
       Microsoft.Net.Http (>= 2.2.22) - framework: portable-net45+sl50+win+wpa81+wp80
       Newtonsoft.Json (>= 6.0.3) - framework: >= net45, portable-net45+sl50+win+wpa81+wp80
       PCLStorage (>= 0.9.6) - framework: portable-net45+sl50+win+wpa81+wp80
     Flurl.Signed (1.0.10)
-    ilmerge (2.14.1208)
+    ILMerge (2.14.1208)
     Marvin.JsonPatch.Signed (0.7)
       Newtonsoft.Json (>= 6.0.4)
     Microsoft.Bcl (1.1.10) - framework: portable-net45+sl50+win+wpa81+wp80
@@ -30,8 +30,6 @@ NUGET
       Microsoft.Bcl (>= 1.1.6) - framework: net10, net11, net20, net30, net35, net40, net40-full
       Microsoft.Bcl.Async (>= 1.0.165) - framework: net10, net11, net20, net30, net35, net40, net40-full
     SharpZipLib (0.86)
-    SimpleRESTServices (1.3.0.1)
-      Newtonsoft.Json (>= 5.0.6)
     System.Collections (4.0.10) - framework: dnxcore50
       System.Diagnostics.Debug (>= 4.0) - framework: dnxcore50
       System.Resources.ResourceManager (>= 4.0) - framework: dnxcore50
@@ -204,7 +202,6 @@ STRATEGY: MIN
 FRAMEWORK: NET35
 NUGET
   remote: https://www.nuget.org/api/v2
-  specs:
     Newtonsoft.Json (5.0.8)
     openstack.net (1.3.6.1)
       Newtonsoft.Json (>= 5.0.8)
@@ -220,7 +217,6 @@ STRATEGY: MIN
 FRAMEWORK: NET45
 NUGET
   remote: https://www.nuget.org/api/v2
-  specs:
     Flurl.Http.Signed (0.6.2.2015062601)
       Flurl.Signed (>= 1.0.8)
       Newtonsoft.Json (>= 6.0.3)
@@ -242,7 +238,6 @@ STRATEGY: MIN
 FRAMEWORK: NET45
 NUGET
   remote: https://www.nuget.org/api/v2
-  specs:
     Flurl.Http.Signed (0.6.2.2015062601)
       Flurl.Signed (>= 1.0.8)
       Newtonsoft.Json (>= 6.0.3)