Merge pull request #136 from xapi-project/json

Merge request from json (REQ-420) into master.

Author: Konstantina Chremmou

README.md

@@ -53,18 +53,19 @@ language(s), or simply `make` to generate SDK source code for all the supported
 languages.
 
 To compile the generated source code, follow the instructions in the corresponding
-README files.
+README files. The third party libraries required for the compilation of the C#
+and PowerShell source code can be obtained from [dotnet-packages][6].
 
 _Note: The Python module is not auto-generated. It can be found at
-[XenAPI.py][6]._
+[XenAPI.py][7]._
 
 ## Contributions
 
 The preferable way to contribute patches is to fork the repository on Github
 and then submit a pull request. If for some reason you can't use Github to
 submit a pull request, then you may send your patch for review to the
 <xen-api@lists.xen.org> mailing list, with a link to a public git
-repository for review. Please see the CONTRIB.md file for some general
+repository for review. Please see the [CONTRIB.md][8] file for some general
 guidelines on submitting changes.
 
 ## Maintainers
@@ -75,12 +76,14 @@ guidelines on submitting changes.
 ## License
 
 This code is licensed under the BSD 2-Clause license. Please see the file
-[LICENSE][7] for more information.
+[LICENSE][9] for more information.
 
 [1]: http://caml.inria.fr/ocaml/
 [2]: https://opam.ocaml.org/
 [3]: https://github.com/ocaml/opam-dockerfiles
 [4]: https://github.com/xapi-project/xs-opam
 [5]: https://github.com/xapi-project/sm/blob/master/drivers/XE_SR_ERRORCODES.xml
-[6]: https://github.com/xapi-project/xen-api/blob/master/scripts/examples/python/XenAPI.py
-[7]: LICENSE
+[6]: https://github.com/xenserver/dotnet-packages
+[7]: https://github.com/xapi-project/xen-api/blob/master/scripts/examples/python/XenAPI.py
+[8]: CONTRIB.md
+[9]: LICENSE

common/CommonFunctions.ml

@@ -33,6 +33,7 @@ open Pervasiveext
 open Printf
 open Datamodel_types
 
+type wireProtocol = XmlRpc | JsonRpc
 
 let with_output filename f =
   let io = open_out filename in

csharp/README.dist

@@ -36,10 +36,16 @@ This library requires .NET 4.5 or greater.
 Dependencies
 ------------
 
-XenServer.NET is dependent upon XML-RPC.NET by Charles Cook (see http://www.xml-rpc.net).
-XML-RPC.NET is licensed under the MIT X11 license; see
-LICENSE.CookComputing.XmlRpcV2.txt for details. The library
-(CookComputing.XmlRpcV2.dll) is shipped with XenServer.NET.
+XenServer.NET is dependent upon the following libraries:
+
+- XML-RPC.NET by Charles Cook (see http://www.xml-rpc.net).
+  XML-RPC.NET is licensed under the MIT X11 license; see
+  LICENSE.CookComputing.XmlRpcV2.txt for details. The library
+  (CookComputing.XmlRpcV2.dll) is shipped with XenServer.NET.
+
+- Newtonsoft JSON.NET by James Newton-King (see https://www.newtonsoft.com/).
+  JSON.NET is licensed under the MIT license; see LICENSE.Newtonsoft.Json.txt
+  for details. The library (Newtonsoft.Json.dll) is shipped with XenServer.NET.
 
 
 Downloads
@@ -71,8 +77,9 @@ B. To build the source code:
   3. You should now be ready to build the source code.
 
 C. To run the examples:
-  1. Copy XenServer.dll and CookComputing.XmlRpcV2.dll from the bin folder into
-     the samples folder at the same level as the XenSdkSample.csproj file.
+  1. Copy XenServer.dll, CookComputing.XmlRpcV2.dll, and Newtonsoft.Json.dll
+     from the bin folder into the samples folder at the same level as the
+     XenSdkSample.csproj file.
   2. Open XenSdkSample.sln inside Visual Studio (2013 or greater).
   3. You should now be ready to compile the solution and run the examples.
      The solution project is a console application expecting the parameters