Skip to content
This repository was archived by the owner on Feb 19, 2025. It is now read-only.

Commit 81757c4

Browse files
kc284Mihaela Stoica
kc284
authored and
Mihaela Stoica
committed
CP-31132: Renamed the Json.NET assembly to avoid clashes when the original unpatched dll exists.
Signed-off-by: Konstantina Chremmou <[email protected]>
1 parent ba6b6ec commit 81757c4

File tree

8 files changed

+38
-36
lines changed

8 files changed

+38
-36
lines changed

‎c/README.dist

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ To network with other developers using Citrix Hypervisor visit
2323
https://discussions.citrix.com/forum/101-hypervisor-formerly-xenserver/
2424

2525
libxenserver is free software. You can redistribute and modify it under the
26-
terms of the BSD license. See COPYING for details.
26+
terms of the BSD 2-Clause license. See COPYING for details.
2727

2828
This library is accompanied by a number of test programs that can be used as
2929
pedagogical examples. These do not form part of this library, and are licensed
30-
for redistribution and modification under the BSD license. libxenserver comes
31-
with the usual complexities inherent with programming in C, and it is recommended
32-
that you study these examples carefully to understand the approach to error
33-
reporting and memory management taken by this library.
30+
for redistribution and modification under the BSD 2-Clause license. libxenserver
31+
comes with the usual complexities inherent with programming in C, and it is
32+
recommended that you study these examples carefully to understand the approach
33+
to error reporting and memory management taken by this library.
3434

3535

3636
Dependencies

‎csharp/README.dist

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ XenServer.NET is a complete SDK for Citrix Hypervisor, exposing the Citrix
77
Hypervisor API as .NET classes. It is written in C#.
88

99
It is available in the CitrixHypervisor-SDK-@[email protected], which can be downloaded
10-
from see https://www.citrix.com/downloads/citrix-hypervisor/
10+
from https://www.citrix.com/downloads/citrix-hypervisor/
1111

1212
For Citrix Hypervisor documentation, see https://docs.citrix.com/en-us/citrix-hypervisor/
1313

@@ -23,11 +23,11 @@ To network with other developers using Citrix Hypervisor visit
2323
https://discussions.citrix.com/forum/101-hypervisor-formerly-xenserver/
2424

2525
XenServer.NET is free software. You can redistribute and modify it under the
26-
terms of the BSD license. See LICENSE.txt for details.
26+
terms of the BSD 2-Clause license. See LICENSE.txt for details.
2727

2828
This library is accompanied by pedagogical examples. These do not form
2929
part of this library, and are licensed for redistribution and modification
30-
under the BSD license.
30+
under the BSD 2-Clause license.
3131

3232

3333
Prerequisites
@@ -43,12 +43,13 @@ XenServer.NET is dependent upon the following libraries:
4343

4444
- XML-RPC.NET by Charles Cook (see http://xml-rpc.net).
4545
XML-RPC.NET is licensed under the MIT X11 license; see
46-
LICENSE.CookComputing.XmlRpcV2.txt for details. The library
46+
LICENSE.CookComputing.XmlRpcV2.txt for details. A patched version of the library
4747
(CookComputing.XmlRpcV2.dll) is shipped with XenServer.NET.
4848

4949
- Newtonsoft JSON.NET by James Newton-King (see https://www.newtonsoft.com/).
5050
JSON.NET is licensed under the MIT license; see LICENSE.Newtonsoft.Json.txt
51-
for details. The library (Newtonsoft.Json.dll) is shipped with XenServer.NET.
51+
for details. A patched version of the library (Newtonsoft.Json.CH.dll) is
52+
shipped with XenServer.NET.
5253

5354

5455
Downloads
@@ -67,22 +68,23 @@ Getting Started
6768
Download and unzip the CitrixHypervisor-SDK-@[email protected].
6869

6970
A. To use the compiled binaries in your code:
70-
1. Copy both XenServer.dll and CookComputing.XmlRpcV2.dll from the bin folder
71-
into your own workspace.
72-
2. In Visual Studio, add references to both DLLs from your own program.
73-
Project > Add Reference > Browse.
74-
3. You should now be ready to compile against XenServer.NET.
71+
1. Copy XenServer.dll, CookComputing.XmlRpcV2.dll and Newtonsoft.Json.CH.dll
72+
from the bin folder into your own workspace.
73+
2. In Visual Studio, add references to all DLLs from your own program.
74+
Project > Add Reference > Browse.
75+
3. You should now be ready to compile against XenServer.NET.
7576

7677
B. To build the source code:
77-
1. Copy CookComputing.XmlRpcV2.dll from the bin folder into the source code
78-
folder at the same level as the XenServer.csproj file.
78+
1. Copy CookComputing.XmlRpcV2.dll and Newtonsoft.Json.CH.dll from the bin
79+
folder into the source code folder at the same level as the project file
80+
XenServer.csproj
7981
2. Open the project XenServer.csproj in Visual Studio.
8082
3. You should now be ready to build the source code.
8183

8284
C. To run the examples:
83-
1. Copy XenServer.dll, CookComputing.XmlRpcV2.dll, and Newtonsoft.Json.dll
85+
1. Copy XenServer.dll, CookComputing.XmlRpcV2.dll and Newtonsoft.Json.CH.dll
8486
from the bin folder into the samples folder at the same level as the
85-
XenSdkSample.csproj file.
87+
project file XenSdkSample.csproj.
8688
2. Open XenSdkSample.sln inside Visual Studio (2013 or greater).
8789
3. You should now be ready to compile the solution and run the examples.
8890
The solution project is a console application expecting the parameters

‎csharp/autogen/samples/XenSdkSample.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@
5757
<SpecificVersion>False</SpecificVersion>
5858
<HintPath>.\CookComputing.XmlRpcV2.dll</HintPath>
5959
</Reference>
60-
<Reference Include="Newtonsoft.Json">
60+
<Reference Include="Newtonsoft.Json.CH">
6161
<SpecificVersion>False</SpecificVersion>
62-
<HintPath>.\Newtonsoft.Json.dll</HintPath>
62+
<HintPath>.\Newtonsoft.Json.CH.dll</HintPath>
6363
</Reference>
6464
<Reference Include="System" />
6565
<Reference Include="System.Data" />

‎csharp/templates/XenServer.csproj.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
<SpecificVersion>False</SpecificVersion>
3535
<HintPath>.\CookComputing.XmlRpcV2.dll</HintPath>
3636
</Reference>
37-
<Reference Include="Newtonsoft.Json.dll">
37+
<Reference Include="Newtonsoft.Json.CH.dll">
3838
<SpecificVersion>False</SpecificVersion>
39-
<HintPath>.\Newtonsoft.Json.dll</HintPath>
39+
<HintPath>.\Newtonsoft.Json.CH.dll</HintPath>
4040
</Reference>
4141
<Reference Include="System" />
4242
<Reference Include="System.Data" />

‎java/README.dist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ To network with other developers using Citrix Hypervisor visit
2323
https://discussions.citrix.com/forum/101-hypervisor-formerly-xenserver/
2424

2525
XenServerJava is free software. You can redistribute and modify it under the
26-
terms of the BSD license. See LICENSE.txt for details.
26+
terms of the BSD 2-Clause license. See LICENSE.txt for details.
2727

2828
This library is accompanied a number of test programs that can be used ass
2929
pedagogical examples. These do not form part of this library, and are licensed for
30-
redistribution and modification under the BSD license.
30+
redistribution and modification under the BSD 2-Clause license.
3131

3232

3333
Dependencies

‎powershell/README.dist

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ To network with other developers using Citrix Hypervisor visit
2323
https://discussions.citrix.com/forum/101-hypervisor-formerly-xenserver/
2424

2525
This module is free software. You can redistribute and modify it under the
26-
terms of the BSD license. See LICENSE.txt for details.
26+
terms of the BSD 2-Clause license. See LICENSE.txt for details.
2727

2828
This library is accompanied by pedagogical examples. These do not form
2929
part of this library, and are licensed for redistribution and modification
30-
under the BSD license.
30+
under the BSD 2-Clause license.
3131

3232

3333
Prerequisites
@@ -43,14 +43,14 @@ The Citrix Hypervisor PowerShell Module is dependent upon the following librarie
4343

4444
- XML-RPC.NET by Charles Cook (see http://xml-rpc.net).
4545
XML-RPC.NET is licensed under the MIT X11 license; see
46-
LICENSE.CookComputing.XmlRpcV2.txt for details. The library
46+
LICENSE.CookComputing.XmlRpcV2.txt for details. A patched version of the library
4747
(CookComputing.XmlRpcV2.dll) is shipped with the Citrix Hypervisor PowerShell
4848
Module.
4949

5050
- Newtonsoft JSON.NET by James Newton-King (see https://www.newtonsoft.com/).
5151
JSON.NET is licensed under the MIT license; see LICENSE.Newtonsoft.Json.txt
52-
for details. The library (Newtonsoft.Json.dll) is shipped with the Citrix
53-
Hypervisor PowerShell Module.
52+
for details. A patched version of the library (Newtonsoft.Json.CH.dll) is
53+
shipped with the Citrix Hypervisor PowerShell Module.
5454

5555

5656
Folder Structure
@@ -142,9 +142,9 @@ Getting Started
142142
Building and Debugging the Source Code
143143
--------------------------------------
144144

145-
1. Copy CookComputing.XmlRpcV2.dll, Newtonsoft.Json.dll, and XenServer.dll from
145+
1. Copy CookComputing.XmlRpcV2.dll, Newtonsoft.Json.CH.dll, and XenServer.dll from
146146
the XenServerPSModule folder into the source code folder at the same level as
147-
the XenServerPowerShell.csproj file.
147+
the project file XenServerPowerShell.csproj.
148148

149149
2. Open the project XenServerPowerShell.csproj in Visual Studio (2013 or greater).
150150

‎powershell/XenServerPSModule.psd1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@ RequiredModules = @()
5454
NestedModules = @()
5555
ModuleList = @('XenServerPowerShell.dll')
5656
RequiredAssemblies = @('CookComputing.XmlRpcV2.dll',
57-
'Newtonsoft.Json.dll',
57+
'Newtonsoft.Json.CH.dll',
5858
'XenServer.dll')
5959
ScriptsToProcess = @('Initialize-Environment.ps1')
6060
TypesToProcess = @('XenServer.types.ps1xml')
6161
FormatsToProcess = @('XenServer.format.ps1xml')
6262
FileList = @('about_XenServer.help.txt',
6363
'CookComputing.XmlRpcV2.dll',
64-
'Newtonsoft.Json.dll',
64+
'Newtonsoft.Json.CH.dll',
6565
'Initialize-Environment.ps1',
6666
'LICENSE.CookComputing.XmlRpcV2.txt',
6767
'LICENSE.Newtonsoft.Json.txt',

‎powershell/templates/XenServerPowerShell.csproj.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
<SpecificVersion>False</SpecificVersion>
3838
<HintPath>.\CookComputing.XmlRpcV2.dll</HintPath>
3939
</Reference>
40-
<Reference Include="Newtonsoft.Json.dll">
40+
<Reference Include="Newtonsoft.Json.CH.dll">
4141
<SpecificVersion>False</SpecificVersion>
42-
<HintPath>.\Newtonsoft.Json.dll</HintPath>
42+
<HintPath>.\Newtonsoft.Json.CH.dll</HintPath>
4343
</Reference>
4444
<Reference Include="System" />
4545
<Reference Include="System.Data" />

0 commit comments

Comments
 (0)