diff --git a/.github/workflows/generate-and-build-sdks.yml b/.github/workflows/generate-and-build-sdks.yml
index 70c34162b4c..90ca98f1515 100644
--- a/.github/workflows/generate-and-build-sdks.yml
+++ b/.github/workflows/generate-and-build-sdks.yml
@@ -188,7 +188,7 @@ jobs:
       - name: Build C# SDK
         shell: pwsh
         run: |
-          dotnet build source/src `
+          dotnet build source/src/XenServer.csproj `
           --disable-build-servers `
           --configuration Release `
           -p:Version=${{ env.XAPI_VERSION_NUMBER }}-prerelease-unsigned `
diff --git a/ocaml/sdk-gen/csharp/autogen/src/Event.cs b/ocaml/sdk-gen/csharp/autogen/src/Event.cs
index 62bb7d16ae8..1eed4e3ef10 100644
--- a/ocaml/sdk-gen/csharp/autogen/src/Event.cs
+++ b/ocaml/sdk-gen/csharp/autogen/src/Event.cs
@@ -45,6 +45,7 @@ public override void UpdateFrom(Event update)
             id = update.id;
         }
 
+        [Obsolete("Use the calls setting individual fields of the API object instead.")]
         public override string SaveChanges(Session session, string opaqueRef, Event serverObject)
         {
             if (opaqueRef == null)
diff --git a/ocaml/sdk-gen/csharp/autogen/src/Failure.cs b/ocaml/sdk-gen/csharp/autogen/src/Failure.cs
index 62cd536afd0..e8b514f20ea 100644
--- a/ocaml/sdk-gen/csharp/autogen/src/Failure.cs
+++ b/ocaml/sdk-gen/csharp/autogen/src/Failure.cs
@@ -31,9 +31,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Resources;
+#if !(NET8_0_OR_GREATER)
 using System.Runtime.Serialization;
 using System.Text.RegularExpressions;
 using System.Xml;
+#endif
 using Newtonsoft.Json.Linq;
 
 
@@ -88,12 +90,14 @@ public Failure(string message, Exception exception)
             ParseExceptionMessage();
         }
 
+#if !(NET8_0_OR_GREATER)
         protected Failure(SerializationInfo info, StreamingContext context)
             : base(info, context)
         {
             errorDescription = (List<string>)info.GetValue("errorDescription", typeof(List<string>));
             errorText = info.GetString("errorText");
         }
+#endif
 
         #endregion
 
@@ -174,7 +178,7 @@ public override string ToString()
         {
             return Message;
         }
-
+#if !(NET8_0_OR_GREATER)
         public override void GetObjectData(SerializationInfo info, StreamingContext context)
         {
             if (info == null)
@@ -185,5 +189,6 @@ public override void GetObjectData(SerializationInfo info, StreamingContext cont
 
             base.GetObjectData(info, context);
         }
+#endif
     }
 }
diff --git a/ocaml/sdk-gen/csharp/autogen/src/HTTP.cs b/ocaml/sdk-gen/csharp/autogen/src/HTTP.cs
index 60fe64f4de5..732478828f2 100644
--- a/ocaml/sdk-gen/csharp/autogen/src/HTTP.cs
+++ b/ocaml/sdk-gen/csharp/autogen/src/HTTP.cs
@@ -38,7 +38,9 @@
 using System.Security.Authentication;
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
+#if !(NET8_0_OR_GREATER)
 using System.Runtime.Serialization;
+#endif
 
 namespace XenAPI
 {
@@ -58,12 +60,13 @@ public TooManyRedirectsException(int redirect, Uri uri)
                 this.uri = uri;
             }
 
-            public TooManyRedirectsException() : base() { }
+            public TooManyRedirectsException() { }
 
             public TooManyRedirectsException(string message) : base(message) { }
 
             public TooManyRedirectsException(string message, Exception exception) : base(message, exception) { }
 
+#if !(NET8_0_OR_GREATER)
             protected TooManyRedirectsException(SerializationInfo info, StreamingContext context)
                 : base(info, context)
             {
@@ -81,42 +84,47 @@ public override void GetObjectData(SerializationInfo info, StreamingContext cont
 
                 base.GetObjectData(info, context);
             }
+#endif
         }
 
         [Serializable]
         public class BadServerResponseException : Exception
         {
-            public BadServerResponseException() : base() { }
+            public BadServerResponseException() { }
 
             public BadServerResponseException(string message) : base(message) { }
 
             public BadServerResponseException(string message, Exception exception) : base(message, exception) { }
 
+#if !(NET8_0_OR_GREATER)
             protected BadServerResponseException(SerializationInfo info, StreamingContext context) : base(info, context) { }
+#endif
         }
 
         [Serializable]
         public class CancelledException : Exception
         {
-            public CancelledException() : base() { }
+            public CancelledException() { }
 
             public CancelledException(string message) : base(message) { }
 
             public CancelledException(string message, Exception exception) : base(message, exception) { }
-
+#if !(NET8_0_OR_GREATER)
             protected CancelledException(SerializationInfo info, StreamingContext context) : base(info, context) { }
+#endif
         }
 
         [Serializable]
         public class ProxyServerAuthenticationException : Exception
         {
-            public ProxyServerAuthenticationException() : base() { }
+            public ProxyServerAuthenticationException() { }
 
             public ProxyServerAuthenticationException(string message) : base(message) { }
 
             public ProxyServerAuthenticationException(string message, Exception exception) : base(message, exception) { }
-
+#if !(NET8_0_OR_GREATER)
             protected ProxyServerAuthenticationException(SerializationInfo info, StreamingContext context) : base(info, context) { }
+#endif
         }
 
         #endregion
@@ -133,6 +141,9 @@ protected ProxyServerAuthenticationException(SerializationInfo info, StreamingCo
         public const int DEFAULT_HTTPS_PORT = 443;
         private const int NONCE_LENGTH = 16;
 
+        private const int FILE_MOVE_MAX_RETRIES = 5;
+        private const int FILE_MOVE_SLEEP_BETWEEN_RETRIES = 100;
+
         public enum ProxyAuthenticationMethod
         {
             Basic = 0,
@@ -149,7 +160,7 @@ public enum ProxyAuthenticationMethod
 
         private static void WriteLine(String txt, Stream stream)
         {
-            byte[] bytes = System.Text.Encoding.ASCII.GetBytes(String.Format("{0}\r\n", txt));
+            byte[] bytes = Encoding.ASCII.GetBytes($"{txt}\r\n");
             stream.Write(bytes, 0, bytes.Length);
         }
 
@@ -164,7 +175,7 @@ private static void WriteLine(Stream stream)
         // done here.
         private static string ReadLine(Stream stream)
         {
-            System.Text.StringBuilder result = new StringBuilder();
+            StringBuilder result = new StringBuilder();
             while (true)
             {
                 int b = stream.ReadByte();
@@ -208,9 +219,8 @@ private static bool ReadHttpHeaders(ref Stream stream, IWebProxy proxy, bool nod
                     // read chunk size
                     string chunkSizeStr = ReadLine(stream);
                     chunkSizeStr = chunkSizeStr.TrimEnd('\r', '\n');
-                    int chunkSize = 0;
                     int.TryParse(chunkSizeStr, System.Globalization.NumberStyles.HexNumber,
-                        System.Globalization.CultureInfo.InvariantCulture, out chunkSize);
+                        System.Globalization.CultureInfo.InvariantCulture, out var chunkSize);
 
                     // read <chunkSize> number of bytes from the stream
                     int totalNumberOfBytesRead = 0;
@@ -222,8 +232,8 @@ private static bool ReadHttpHeaders(ref Stream stream, IWebProxy proxy, bool nod
                         totalNumberOfBytesRead += numberOfBytesRead;
                     } while (numberOfBytesRead > 0 && totalNumberOfBytesRead < chunkSize);
 
-                    string str = System.Text.Encoding.ASCII.GetString(bytes);
-                    string[] split = str.Split(new string[] {"\r\n"}, StringSplitOptions.RemoveEmptyEntries);
+                    string str = Encoding.ASCII.GetString(bytes);
+                    string[] split = str.Split(new [] {"\r\n"}, StringSplitOptions.RemoveEmptyEntries);
                     headers.AddRange(split);
 
                     entityBody += str;
@@ -267,7 +277,7 @@ private static bool ReadHttpHeaders(ref Stream stream, IWebProxy proxy, bool nod
 
         private static int getResultCode(string line)
         {
-            string[] bits = line.Split(new char[] { ' ' });
+            string[] bits = line.Split(' ');
             return (bits.Length < 2 ? 0 : Int32.Parse(bits[1]));
         }
 
@@ -292,7 +302,8 @@ private static bool ValidateServerCertificate(
         /// <returns>The secure hash as a hex string.</returns>
         private static string _MD5Hash(string str)
         {
-            return ComputeHash(str, "MD5");
+            using (var hasher = MD5.Create())
+                return ComputeHash(hasher, str);
         }
 
         /// <summary>
@@ -302,32 +313,24 @@ private static string _MD5Hash(string str)
         /// <returns>The secure hash as a hex string.</returns>
         private static string Sha256Hash(string str)
         {
-            return ComputeHash(str, "SHA256");
+            using (var hasher = SHA256.Create())
+                return ComputeHash(hasher, str);
         }
 
-        private static string ComputeHash(string input, string method)
+        private static string ComputeHash(HashAlgorithm hasher, string input)
         {
-            if (input == null)
+            if (hasher == null || input == null)
                 return null;
 
             var enc = new UTF8Encoding();
             byte[] bytes = enc.GetBytes(input);
-
-            using (var hasher = HashAlgorithm.Create(method))
-            {
-                if (hasher != null)
-                {
-                    byte[] hash = hasher.ComputeHash(bytes);
-                    return BitConverter.ToString(hash).Replace("-", "").ToLowerInvariant();
-                }
-            }
-
-            return null;
+            byte[] hash = hasher.ComputeHash(bytes);
+            return BitConverter.ToString(hash).Replace("-", "").ToLowerInvariant();
         }
 
         private static string GenerateNonce()
         {
-            using (var rngCsProvider = new RNGCryptoServiceProvider())
+            using (var rngCsProvider = RandomNumberGenerator.Create())
             {
                 var nonceBytes = new byte[NONCE_LENGTH];
                 rngCsProvider.GetBytes(nonceBytes);
@@ -417,7 +420,7 @@ public static Uri BuildUri(string hostname, string path, params object[] args)
 
         private static string GetPartOrNull(string str, int partIndex)
         {
-            string[] parts = str.Split(new char[] { ' ' }, partIndex + 2, StringSplitOptions.RemoveEmptyEntries);
+            string[] parts = str.Split(new [] { ' ' }, partIndex + 2, StringSplitOptions.RemoveEmptyEntries);
             return partIndex < parts.Length - 1 ? parts[partIndex] : null;
         }
 
@@ -448,8 +451,7 @@ private static NetworkStream ConnectSocket(Uri uri, bool nodelay, int timeoutMs)
         /// <param name="timeoutMs">Timeout, in ms. 0 for no timeout.</param>
         public static Stream ConnectStream(Uri uri, IWebProxy proxy, bool nodelay, int timeoutMs)
         {
-            IMockWebProxy mockProxy = proxy as IMockWebProxy;
-            if (mockProxy != null)
+            if (proxy is IMockWebProxy mockProxy)
                 return mockProxy.GetStream(uri);
 
             Stream stream;
@@ -469,7 +471,7 @@ public static Stream ConnectStream(Uri uri, IWebProxy proxy, bool nodelay, int t
             {
                 if (useProxy)
                 {
-                    string line = string.Format("CONNECT {0}:{1} HTTP/1.0", uri.Host, uri.Port);
+                    string line = $"CONNECT {uri.Host}:{uri.Port} HTTP/1.0";
                     WriteLine(line, stream);
                     WriteLine(stream);
 
@@ -481,9 +483,8 @@ public static Stream ConnectStream(Uri uri, IWebProxy proxy, bool nodelay, int t
 
                 if (UseSSL(uri))
                 {
-                    SslStream sslStream = new SslStream(stream, false,
-                        new RemoteCertificateValidationCallback(ValidateServerCertificate), null);
-                    sslStream.AuthenticateAsClient("", null, SslProtocols.Tls | SslProtocols.Tls11 | SslProtocols.Tls12, true);
+                    SslStream sslStream = new SslStream(stream, false, ValidateServerCertificate, null);
+                    sslStream.AuthenticateAsClient("", null, SslProtocols.Tls12, true);
 
                     stream = sslStream;
                 }
@@ -514,7 +515,7 @@ private static void AuthenticateProxy(ref Stream stream, Uri uri, IWebProxy prox
             }
 
             if (proxy.Credentials == null)
-                throw new BadServerResponseException(string.Format("Received error code {0} from the server", initialResponse[0]));
+                throw new BadServerResponseException($"Received error code {initialResponse[0]} from the server");
 
             NetworkCredential credentials = proxy.Credentials.GetCredential(uri, null);
 
@@ -526,10 +527,9 @@ private static void AuthenticateProxy(ref Stream stream, Uri uri, IWebProxy prox
                 if (string.IsNullOrEmpty(basicField))
                     throw new ProxyServerAuthenticationException("Basic authentication scheme is not supported/enabled by the proxy server.");
 
-                string authenticationFieldReply = string.Format("Proxy-Authorization: Basic {0}",
-                    Convert.ToBase64String(Encoding.UTF8.GetBytes(credentials.UserName + ":" + credentials.Password)));
+                var creds = Convert.ToBase64String(Encoding.UTF8.GetBytes(credentials.UserName + ":" + credentials.Password));
                 WriteLine(header, stream);
-                WriteLine(authenticationFieldReply, stream);
+                WriteLine($"Proxy-Authorization: Basic {creds}", stream);
                 WriteLine(stream);
             }
             else if (CurrentProxyAuthenticationMethod == ProxyAuthenticationMethod.Digest)
@@ -539,9 +539,7 @@ private static void AuthenticateProxy(ref Stream stream, Uri uri, IWebProxy prox
                 if (string.IsNullOrEmpty(digestField))
                     throw new ProxyServerAuthenticationException("Digest authentication scheme is not supported/enabled by the proxy server.");
 
-                string authenticationFieldReply = string.Format(
-                    "Proxy-Authorization: Digest username=\"{0}\", uri=\"{1}:{2}\"",
-                    credentials.UserName, uri.Host, uri.Port);
+                string authenticationFieldReply = $"Proxy-Authorization: Digest username=\"{credentials.UserName}\", uri=\"{uri.Host}:{uri.Port}\"";
 
                 int len = "Proxy-Authorization: Digest".Length;
                 string directiveString = digestField.Substring(len, digestField.Length - len);
@@ -562,19 +560,19 @@ private static void AuthenticateProxy(ref Stream stream, Uri uri, IWebProxy prox
                                 throw new ProxyServerAuthenticationException("Stale nonce in Digest authentication attempt.");
                             break;
                         case "realm=":
-                            authenticationFieldReply += string.Format(", realm=\"{0}\"", directives[++i]);
+                            authenticationFieldReply += $", realm=\"{directives[++i]}\"";
                             realm = directives[i];
                             break;
                         case "nonce=":
-                            authenticationFieldReply += string.Format(", nonce=\"{0}\"", directives[++i]);
+                            authenticationFieldReply += $", nonce=\"{directives[++i]}\"";
                             nonce = directives[i];
                             break;
                         case "opaque=":
-                            authenticationFieldReply += string.Format(", opaque=\"{0}\"", directives[++i]);
+                            authenticationFieldReply += $", opaque=\"{directives[++i]}\"";
                             opaque = directives[i];
                             break;
                         case "algorithm=":
-                            authenticationFieldReply += string.Format(", algorithm={0}", directives[++i]); //unquoted; see RFC7616-3.4
+                            authenticationFieldReply += $", algorithm={directives[++i]}"; //unquoted; see RFC7616-3.4
                             algorithm = directives[i];
                             break;
                         case "qop=":
@@ -584,9 +582,8 @@ private static void AuthenticateProxy(ref Stream stream, Uri uri, IWebProxy prox
                                 qop = qops.FirstOrDefault(q => q.ToLowerInvariant() == "auth") ??
                                       qops.FirstOrDefault(q => q.ToLowerInvariant() == "auth-int");
                                 if (qop == null)
-                                      throw new ProxyServerAuthenticationException(
-                                          "Digest authentication's quality-of-protection directive is not supported.");
-                                authenticationFieldReply += string.Format(", qop={0}", qop); //unquoted; see RFC7616-3.4
+                                      throw new ProxyServerAuthenticationException("Digest authentication's quality-of-protection directive is not supported.");
+                                authenticationFieldReply += $", qop={qop}"; //unquoted; see RFC7616-3.4
                             }
                             break;
                     }
@@ -594,11 +591,11 @@ private static void AuthenticateProxy(ref Stream stream, Uri uri, IWebProxy prox
 
                 string clientNonce = GenerateNonce();
                 if (qop != null)
-                    authenticationFieldReply += string.Format(", cnonce=\"{0}\"", clientNonce);
+                    authenticationFieldReply += $", cnonce=\"{clientNonce}\"";
 
                 string nonceCount = "00000001"; // todo: track nonces and their corresponding nonce counts
                 if (qop != null)
-                    authenticationFieldReply += string.Format(", nc={0}", nonceCount); //unquoted; see RFC7616-3.4
+                    authenticationFieldReply += $", nc={nonceCount}"; //unquoted; see RFC7616-3.4
 
                 Func<string, string> algFunc;
                 var scratch1 = string.Join(":", credentials.UserName, realm, credentials.Password);
@@ -636,7 +633,7 @@ private static void AuthenticateProxy(ref Stream stream, Uri uri, IWebProxy prox
                     : new[] {HA1, nonce, nonceCount, clientNonce, qop, HA2};
                 var response = algFunc(string.Join(":", array3));
 
-                authenticationFieldReply += string.Format(", response=\"{0}\"", response);
+                authenticationFieldReply += $", response=\"{response}\"";
 
                 WriteLine(header, stream);
                 WriteLine(authenticationFieldReply, stream);
@@ -645,8 +642,7 @@ private static void AuthenticateProxy(ref Stream stream, Uri uri, IWebProxy prox
             else
             {
                 string authType = GetPartOrNull(fields[0], 1);
-                throw new ProxyServerAuthenticationException(
-                    string.Format("Proxy server's {0} authentication method is not supported.", authType ?? "chosen"));
+                throw new ProxyServerAuthenticationException($"Proxy server's {authType ?? "chosen"} authentication method is not supported.");
             }
 
             // handle authentication attempt response
@@ -662,12 +658,10 @@ private static void AuthenticateProxy(ref Stream stream, Uri uri, IWebProxy prox
                 case 407:
                     throw new ProxyServerAuthenticationException("Proxy server denied access due to wrong credentials.");
                 default:
-                    throw new BadServerResponseException(string.Format(
-                        "Received error code {0} from the server", authenticatedResponse[0]));
+                    throw new BadServerResponseException($"Received error code {authenticatedResponse[0]} from the server");
             }
         }
 
-
         private static Stream DoHttp(Uri uri, IWebProxy proxy, bool noDelay, int timeoutMs, params string[] headers)
         {
             Stream stream = ConnectStream(uri, proxy, noDelay, timeoutMs);
@@ -829,9 +823,6 @@ public static void Get(DataCopiedDelegate dataCopiedDelegate, FuncBool cancellin
             }
         }
 
-        private const int FILE_MOVE_MAX_RETRIES = 5;
-        private const int FILE_MOVE_SLEEP_BETWEEN_RETRIES = 100;
-
         /// <summary>
         /// Move a file, retrying a few times with a short sleep between retries.
         /// If it still fails after these retries, then throw the error.
diff --git a/ocaml/sdk-gen/csharp/autogen/src/JsonRpc.cs b/ocaml/sdk-gen/csharp/autogen/src/JsonRpc.cs
index 519cc430d4e..a790f397320 100644
--- a/ocaml/sdk-gen/csharp/autogen/src/JsonRpc.cs
+++ b/ocaml/sdk-gen/csharp/autogen/src/JsonRpc.cs
@@ -31,6 +31,13 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Net;
+#if (NET8_0_OR_GREATER)
+using System.Diagnostics;
+using System.Linq;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Security.Cryptography.X509Certificates;
+#endif
 using System.Net.Security;
 using System.Threading;
 using Newtonsoft.Json;
@@ -49,9 +56,9 @@ internal abstract class JsonRequest
     {
         protected JsonRequest(int id, string method, JToken parameters)
         {
-            this.Id = id;
-            this.Method = method;
-            this.Parameters = parameters;
+            Id = id;
+            Method = method;
+            Parameters = parameters;
         }
 
         public static JsonRequest Create(JsonRpcVersion jsonRpcVersion, int id, string method, JToken parameters)
@@ -65,6 +72,8 @@ public static JsonRequest Create(JsonRpcVersion jsonRpcVersion, int id, string m
             }
         }
 
+        public abstract string JsonRPC { get;}
+
         /// <summary>
         /// Unique call id. Can be null in JSON_RPC v2.0, but xapi disallows it.
         /// </summary>
@@ -95,6 +104,9 @@ public JsonRequestV1(int id, string method, JToken parameters)
             : base(id, method, parameters)
         {
         }
+
+        [JsonIgnore]
+        public override string JsonRPC => "1.0";
     }
 
     internal class JsonRequestV2 : JsonRequest
@@ -105,18 +117,15 @@ public JsonRequestV2(int id, string method, JToken parameters)
         }
 
         [JsonProperty("jsonrpc", Required = Required.Always)]
-        public string JsonRPC
-        {
-            get { return "2.0"; }
-        }
+        public override string JsonRPC => "2.0";
     }
 
 
     internal abstract class JsonResponse<T>
     {
-        [JsonProperty("id", Required = Required.AllowNull)] public int Id = 0;
+        [JsonProperty("id", Required = Required.AllowNull)] public int Id { get; set; }
 
-        [JsonProperty("result", Required = Required.Default)] public T Result = default(T);
+        [JsonProperty("result", Required = Required.Default)] public T Result { get; set; }
 
         public override string ToString()
         {
@@ -126,23 +135,23 @@ public override string ToString()
 
     internal class JsonResponseV1<T> : JsonResponse<T>
     {
-        [JsonProperty("error", Required = Required.AllowNull)] public JToken Error = null;
+        [JsonProperty("error", Required = Required.AllowNull)] public JToken Error { get; set; }
     }
 
     internal class JsonResponseV2<T> : JsonResponse<T>
     {
-        [JsonProperty("error", Required = Required.DisallowNull)] public JsonResponseV2Error Error = null;
+        [JsonProperty("error", Required = Required.DisallowNull)] public JsonResponseV2Error Error { get; set; }
 
-        [JsonProperty("jsonrpc", Required = Required.Always)] public string JsonRpc = null;
+        [JsonProperty("jsonrpc", Required = Required.Always)] public string JsonRpc { get; set; }
     }
 
     internal class JsonResponseV2Error
     {
-        [JsonProperty("code", Required = Required.Always)] public int Code = 0;
+        [JsonProperty("code", Required = Required.Always)] public int Code { get; set; }
 
-        [JsonProperty("message", Required = Required.Always)] public string Message = null;
+        [JsonProperty("message", Required = Required.Always)] public string Message { get; set; }
 
-        [JsonProperty("data", Required = Required.Default)] public JToken Data = null;
+        [JsonProperty("data", Required = Required.Default)] public JToken Data { get; set; }
 
         public override string ToString()
         {
@@ -155,6 +164,42 @@ public partial class JsonRpcClient
     {
         private int _globalId;
 
+#if (NET8_0_OR_GREATER)
+        private static readonly Type ClassType = typeof(JsonRpcClient);
+        private static readonly System.Reflection.AssemblyName ClassAssemblyName = ClassType?.Assembly?.GetName();
+        private static readonly ActivitySource source = new ActivitySource(ClassAssemblyName.Name + "." + ClassType?.FullName, ClassAssemblyName.Version?.ToString());
+
+        // Follow naming conventions from OpenTelemetry.SemanticConventions
+        // Not yet on NuGet though:
+        // dotnet add package OpenTelemetry.SemanticConventions
+        private static class RpcAttributes
+        {
+            public const string AttributeRpcMethod = "rpc.method";
+            public const string AttributeRpcSystem = "rpc.system";
+            public const string AttributeRpcService = "rpc.service";
+            public const string AttributeRpcJsonrpcErrorCode = "rpc.jsonrpc.error_code";
+            public const string AttributeRpcJsonrpcErrorMessage = "rpc.jsonrpc.error_message";
+            public const string AttributeRpcJsonrpcRequestId = "rpc.jsonrpc.request_id";
+            public const string AttributeRpcJsonrpcVersion = "rpc.jsonrpc.version";
+            public const string AttributeRpcMessageType = "rpc.message.type";
+            
+            public static class RpcMessageTypeValues
+            {
+                public const string Sent = "SENT";
+                public const string Received = "RECEIVED";
+            }
+        }
+
+        private static class ServerAttributes
+        {
+            public const string AttributeServerAddress = "server.address";
+        }
+
+        // not part of the SemanticConventions package
+        private const string ValueJsonRpc = "jsonrpc";
+        private const string EventRpcMessage = "rpc.message";
+#endif
+
         public JsonRpcClient(string baseUrl)
         {
             Url = baseUrl;
@@ -180,7 +225,13 @@ public JsonRpcClient(string baseUrl)
         public bool AllowAutoRedirect { get; set; }
         public bool PreAuthenticate { get; set; }
         public CookieContainer Cookies { get; set; }
+
+#if (NET8_0_OR_GREATER)
+        public Func<HttpRequestMessage, X509Certificate2, X509Chain, SslPolicyErrors, bool> ServerCertificateValidationCallback { get; set; }
+#else
         public RemoteCertificateValidationCallback ServerCertificateValidationCallback { get; set; }
+#endif
+
         public Dictionary<string, string> RequestHeaders { get; set; }
         public Dictionary<string, string> ResponseHeaders { get; set; }
 
@@ -207,69 +258,186 @@ protected virtual T Rpc<T>(string callName, JToken parameters, JsonSerializer se
             // therefore the latter will be done only in DEBUG mode
             using (var postStream = new MemoryStream())
             {
-                using (var sw = new StreamWriter(postStream))
+#if (NET8_0_OR_GREATER)
+                // the semantic convention is $package.$service/$method
+                using (Activity activity = source.CreateActivity("XenAPI/" + callName, ActivityKind.Client))
                 {
+                    activity?.Start();
+                    // Set the fields described in the OpenTelemetry Semantic Conventions:
+                    // https://opentelemetry.io/docs/specs/semconv/rpc/json-rpc/
+                    // https://opentelemetry.io/docs/specs/semconv/rpc/rpc-spans/
+                    activity?.SetTag(RpcAttributes.AttributeRpcSystem, ValueJsonRpc);
+                    activity?.SetTag(ServerAttributes.AttributeServerAddress, new Uri(Url).Host);
+                    activity?.SetTag(RpcAttributes.AttributeRpcMethod, callName);
+                    activity?.SetTag(RpcAttributes.AttributeRpcJsonrpcRequestId, id.ToString());
+#endif
+                    using (var sw = new StreamWriter(postStream))
+                    {
 #if DEBUG
-                    var settings = CreateSettings(serializer.Converters);
-                    string jsonReq = JsonConvert.SerializeObject(request, settings);
-                    if (RequestEvent != null)
-                        RequestEvent(jsonReq);
-                    sw.Write(jsonReq);
+                        var settings = CreateSettings(serializer.Converters);
+                        string jsonReq = JsonConvert.SerializeObject(request, settings);
+                        if (RequestEvent != null)
+                            RequestEvent(jsonReq);
+                        sw.Write(jsonReq);
 #else
-                    if (RequestEvent != null)
-                        RequestEvent(callName);
-                    serializer.Serialize(sw, request);
+                        if (RequestEvent != null)
+                            RequestEvent(callName);
+                        serializer.Serialize(sw, request);
 #endif
-                    sw.Flush();
-                    postStream.Seek(0, SeekOrigin.Begin);
+                        sw.Flush();
+                        postStream.Seek(0, SeekOrigin.Begin);
 
-                    using (var responseStream = new MemoryStream())
-                    {
-                        PerformPostRequest(postStream, responseStream);
-                        responseStream.Position = 0;
-
-                        using (var responseReader = new StreamReader(responseStream))
+                        using (var responseStream = new MemoryStream())
                         {
-                            switch (JsonRpcVersion)
+                            PerformPostRequest(postStream, responseStream);
+                            responseStream.Position = 0;
+
+                            using (var responseReader = new StreamReader(responseStream))
                             {
-                                case JsonRpcVersion.v2:
+#if (NET8_0_OR_GREATER)
+                                activity?.SetTag(RpcAttributes.AttributeRpcJsonrpcVersion, request.JsonRPC);
+#endif
+                                switch (JsonRpcVersion)
+                                {
+                                    case JsonRpcVersion.v2:
 #if DEBUG
-                                    string json2 = responseReader.ReadToEnd();
-                                    var res2 = JsonConvert.DeserializeObject<JsonResponseV2<T>>(json2, settings);
+                                        string json2 = responseReader.ReadToEnd();
+                                        var res2 = JsonConvert.DeserializeObject<JsonResponseV2<T>>(json2, settings);
 #else
-                                    var res2 = (JsonResponseV2<T>)serializer.Deserialize(responseReader, typeof(JsonResponseV2<T>));
+                                        var res2 = (JsonResponseV2<T>)serializer.Deserialize(responseReader, typeof(JsonResponseV2<T>));
 #endif
-                                    if (res2.Error != null)
-                                    {
-                                        var descr = new List<string> { res2.Error.Message };
-                                        descr.AddRange(res2.Error.Data.ToObject<string[]>());
-                                        throw new Failure(descr);
-                                    }
-                                    return res2.Result;
-                                default:
+                                        if (res2.Error != null)
+                                        {
+                                            var descr = new List<string> { res2.Error.Message };
+                                            descr.AddRange(res2.Error.Data.ToObject<string[]>());
+#if (NET8_0_OR_GREATER)
+                                            activity?.SetTag(RpcAttributes.AttributeRpcJsonrpcErrorCode, res2.Error.Code);
+                                            activity?.SetTag(RpcAttributes.AttributeRpcJsonrpcErrorMessage, descr);
+                                            activity?.SetStatus(ActivityStatusCode.Error);
+#endif
+                                            throw new Failure(descr);
+                                        }
+#if (NET8_0_OR_GREATER)
+                                        activity?.SetStatus(ActivityStatusCode.Ok);
+#endif
+                                        return res2.Result;
+                                    default:
 #if DEBUG
-                                    string json1 = responseReader.ReadToEnd();
-                                    var res1 = JsonConvert.DeserializeObject<JsonResponseV1<T>>(json1, settings);
+                                        string json1 = responseReader.ReadToEnd();
+                                        var res1 = JsonConvert.DeserializeObject<JsonResponseV1<T>>(json1, settings);
 #else
-                                    var res1 = (JsonResponseV1<T>)serializer.Deserialize(responseReader, typeof(JsonResponseV1<T>));
+                                        var res1 = (JsonResponseV1<T>)serializer.Deserialize(responseReader, typeof(JsonResponseV1<T>));
 #endif
-                                    if (res1.Error != null)
-                                    {
-                                        var errorArray = res1.Error.ToObject<string[]>();
+                                        var errorArray = res1.Error?.ToObject<string[]>();
                                         if (errorArray != null)
+                                        {
+#if (NET8_0_OR_GREATER)
+                                            activity?.SetStatus(ActivityStatusCode.Error);
+                                            // we can't be sure whether we'll have a Code here
+                                            // the exact format of an error object is not specified in JSONRPC v1
+                                            activity?.SetTag(RpcAttributes.AttributeRpcJsonrpcErrorMessage, errorArray.ToString());
+#endif
                                             throw new Failure(errorArray);
-                                    }
-                                    return res1.Result;
+                                        }
+#if (NET8_0_OR_GREATER)
+                                        activity?.SetStatus(ActivityStatusCode.Ok);
+#endif
+                                        return res1.Result;
+                                }
                             }
                         }
                     }
+#if (NET8_0_OR_GREATER)
                 }
+#endif
             }
         }
 
-
         protected virtual void PerformPostRequest(Stream postStream, Stream responseStream)
         {
+#if (NET8_0_OR_GREATER)
+            HttpClient httpClient = null;
+            HttpClientHandler httpHandler = null;
+            HttpRequestMessage requestMessage = null;
+            HttpResponseMessage responseMessage = null;
+
+            try
+            {
+                httpHandler = new HttpClientHandler
+                {
+                    AllowAutoRedirect = AllowAutoRedirect,
+                    PreAuthenticate = PreAuthenticate,
+                    CookieContainer = Cookies ?? new CookieContainer(),
+                    Proxy = WebProxy
+                };
+
+                Func<HttpRequestMessage, X509Certificate2, X509Chain, SslPolicyErrors, bool> callBack = null;
+                if (ServicePointManager.ServerCertificateValidationCallback != null)
+                    callBack = ServicePointManager.ServerCertificateValidationCallback.Invoke;
+
+                httpHandler.ServerCertificateCustomValidationCallback = ServerCertificateValidationCallback ?? callBack;
+
+                httpClient = new HttpClient(httpHandler) { Timeout = TimeSpan.FromMilliseconds(Timeout) };
+
+                requestMessage = new HttpRequestMessage(HttpMethod.Post, new Uri(JsonRpcUrl));
+                if (ProtocolVersion != null)
+                    requestMessage.Version = ProtocolVersion;
+                requestMessage.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
+                requestMessage.Headers.UserAgent.ParseAdd(UserAgent);
+                requestMessage.Headers.ConnectionClose = !KeepAlive;
+                requestMessage.Headers.ExpectContinue = Expect100Continue;
+                requestMessage.Content = new StreamContent(postStream);
+
+                if (RequestHeaders != null)
+                {
+                    foreach (var header in RequestHeaders)
+                        requestMessage.Headers.Add(header.Key, header.Value);
+                }
+
+                // propagate W3C traceparent and tracestate
+                // HttpClient would do this automatically on .NET 5,
+                // and .NET 6 would provide even more control over this: https://blog.ladeak.net/posts/opentelemetry-net6-httpclient
+                // the caller must ensure that the activity is in W3C format (by inheritance or direct setting)
+                var activity = Activity.Current;
+                if (activity != null)
+                {
+                    if (activity.IdFormat == ActivityIdFormat.W3C)
+                    {
+                        requestMessage.Headers.Add("traceparent", activity.Id);
+                        var state = activity.TraceStateString;
+
+                        if (state?.Length > 0)
+                            requestMessage.Headers.Add("tracestate", state);
+                    }
+
+                    var tags = new ActivityTagsCollection { { RpcAttributes.AttributeRpcMessageType, RpcAttributes.RpcMessageTypeValues.Sent } };
+                    activity.AddEvent(new ActivityEvent(EventRpcMessage, DateTimeOffset.Now, tags));
+                }
+
+                responseMessage = httpClient.SendAsync(requestMessage).Result;
+                responseMessage.EnsureSuccessStatusCode();
+
+                var str = responseMessage.Content.ReadAsStream();
+                str.CopyTo(responseStream);
+                responseStream.Flush();
+
+                ResponseHeaders = responseMessage.Headers.ToDictionary(header => header.Key, header => string.Join(",", header.Value));
+
+                if (activity != null)
+                {
+                    var tags = new ActivityTagsCollection { { RpcAttributes.AttributeRpcMessageType, RpcAttributes.RpcMessageTypeValues.Received } };
+                    activity.AddEvent(new ActivityEvent(EventRpcMessage, DateTimeOffset.Now, tags));
+                }
+            }
+            finally
+            {
+                RequestHeaders = null;
+                responseMessage?.Dispose();
+                requestMessage?.Dispose();
+                httpClient?.Dispose();
+                httpHandler?.Dispose();
+            }
+#else
             var webRequest = (HttpWebRequest)WebRequest.Create(JsonRpcUrl);
             webRequest.Method = "POST";
             webRequest.ContentType = "application/json";
@@ -332,6 +500,7 @@ protected virtual void PerformPostRequest(Stream postStream, Stream responseStre
                 RequestHeaders = null;
                 webResponse?.Dispose();
             }
+#endif
         }
 
         private JsonSerializerSettings CreateSettings(IList<JsonConverter> converters)
diff --git a/ocaml/sdk-gen/csharp/autogen/src/Session.cs b/ocaml/sdk-gen/csharp/autogen/src/Session.cs
index 82db84a8210..1b15037a736 100644
--- a/ocaml/sdk-gen/csharp/autogen/src/Session.cs
+++ b/ocaml/sdk-gen/csharp/autogen/src/Session.cs
@@ -31,6 +31,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
+#if (NET8_0_OR_GREATER)
+using System.Net.Http;
+using System.Security.Cryptography.X509Certificates;
+#endif
 using System.Net.Security;
 using Newtonsoft.Json;
 
@@ -44,7 +48,7 @@ public partial class Session : XenObject<Session>
         /// <summary>
         /// This string is used as the HTTP UserAgent for each request.
         /// </summary>
-        public static string UserAgent = string.Format("XenAPI/{0}", Helper.APIVersionString(API_Version.LATEST));
+        public static string UserAgent = $"XenAPI/{Helper.APIVersionString(API_Version.LATEST)}";
 
         /// <summary>
         /// If null, no proxy is used, otherwise this proxy is used for each request.
@@ -55,8 +59,6 @@ public partial class Session : XenObject<Session>
 
         public object Tag;
 
-        private List<Role> roles = new List<Role>();
-
         #region Constructors
 
         public Session(JsonRpcClient client)
@@ -124,7 +126,7 @@ public Session(Session session)
 
         private static string GetUrl(string hostname, int port)
         {
-            return string.Format("{0}://{1}:{2}", port == 8080 || port == 80 ? "http" : "https", hostname, port);
+            return $"{(port == 8080 || port == 80 ? "http" : "https")}://{hostname}:{port}";
         }
 
         private void SetupSessionDetails()
@@ -159,7 +161,7 @@ private void CopyADFromSession(Session session)
             IsLocalSuperuser = session.IsLocalSuperuser;
             SessionSubject = session.SessionSubject;
             UserSid = session.UserSid;
-            roles = session.Roles;
+            Roles = session.Roles;
             Permissions = session.Permissions;
         }
 
@@ -208,7 +210,7 @@ private void SetRbacPermissions()
                     if (r.subroles.Count > 0 && r.name_label == s)
                     {
                         r.opaque_ref = xr.opaque_ref;
-                        roles.Add(r);
+                        Roles.Add(r);
                         break;
                     }
                 }
@@ -220,7 +222,8 @@ public override void UpdateFrom(Session update)
             throw new Exception("The method or operation is not implemented.");
         }
 
-        public override string SaveChanges(Session session, string _serverOpaqueRef, Session serverObject)
+        [Obsolete("Use the calls setting individual fields of the API object instead.")]
+        public override string SaveChanges(Session session, string serverOpaqueRef, Session serverObject)
         {
             throw new Exception("The method or operation is not implemented.");
         }
@@ -248,11 +251,19 @@ public int Timeout
             set => JsonRpcClient.Timeout = value;
         }
 
+#if (NET8_0_OR_GREATER)
+        public Func<HttpRequestMessage, X509Certificate2, X509Chain, SslPolicyErrors, bool> ServerCertificateValidationCallback
+        {
+            get => JsonRpcClient?.ServerCertificateValidationCallback;
+            set => JsonRpcClient.ServerCertificateValidationCallback = value;
+        }
+#else
         public RemoteCertificateValidationCallback ServerCertificateValidationCallback
         {
             get => JsonRpcClient?.ServerCertificateValidationCallback;
             set => JsonRpcClient.ServerCertificateValidationCallback = value;
         }
+#endif
 
         public ICredentials Credentials => JsonRpcClient?.WebProxy?.Credentials;
 
@@ -306,7 +317,7 @@ public Dictionary<string, string> RequestHeaders
         /// instead use Permissions. This list should only be used for UI purposes.
         /// </summary>
         [JsonConverter(typeof(XenRefListConverter<Role>))]
-        public List<Role> Roles => roles;
+        public List<Role> Roles { get; private set; }
 
         #endregion
 
@@ -315,9 +326,9 @@ public string[] GetSystemMethods()
             return JsonRpcClient.system_list_methods();
         }
 
-        public static Session get_record(Session session, string _session)
+        public static Session get_record(Session session, string sessionOpaqueRef)
         {
-            Session newSession = new Session(session.Url) { opaque_ref = _session };
+            Session newSession = new Session(session.Url) { opaque_ref = sessionOpaqueRef };
             newSession.SetAPIVersion();
             return newSession;
         }
@@ -402,13 +413,13 @@ public void logout(Session session2)
         /// <summary>
         /// Log out of the session with the given reference, using this session for the connection.
         /// </summary>
-        /// <param name="_self">The session to log out</param>
-        public void logout(string _self)
+        /// <param name="self">The session to log out</param>
+        public void logout(string self)
         {
-            if (_self == null)
+            if (self == null)
                 return;
 
-            JsonRpcClient.session_logout(_self);
+            JsonRpcClient.session_logout(self);
         }
 
         public void local_logout()
@@ -451,9 +462,9 @@ public string get_this_host()
             return get_this_host(this, opaque_ref);
         }
 
-        public static string get_this_host(Session session, string _self)
+        public static string get_this_host(Session session, string self)
         {
-            return session.JsonRpcClient.session_get_this_host(session.opaque_ref, _self ?? "");
+            return session.JsonRpcClient.session_get_this_host(session.opaque_ref, self ?? "");
         }
 
         public string get_this_user()
@@ -461,9 +472,9 @@ public string get_this_user()
             return get_this_user(this, opaque_ref);
         }
 
-        public static string get_this_user(Session session, string _self)
+        public static string get_this_user(Session session, string self)
         {
-            return session.JsonRpcClient.session_get_this_user(session.opaque_ref, _self ?? "");
+            return session.JsonRpcClient.session_get_this_user(session.opaque_ref, self ?? "");
         }
 
         public bool get_is_local_superuser()
@@ -471,14 +482,14 @@ public bool get_is_local_superuser()
             return get_is_local_superuser(this, opaque_ref);
         }
 
-        public static bool get_is_local_superuser(Session session, string _self)
+        public static bool get_is_local_superuser(Session session, string self)
         {
-            return session.JsonRpcClient.session_get_is_local_superuser(session.opaque_ref, _self ?? "");
+            return session.JsonRpcClient.session_get_is_local_superuser(session.opaque_ref, self ?? "");
         }
 
-        public static string[] get_rbac_permissions(Session session, string _self)
+        public static string[] get_rbac_permissions(Session session, string self)
         {
-            return session.JsonRpcClient.session_get_rbac_permissions(session.opaque_ref, _self ?? "");
+            return session.JsonRpcClient.session_get_rbac_permissions(session.opaque_ref, self ?? "");
         }
 
         public DateTime get_last_active()
@@ -486,9 +497,9 @@ public DateTime get_last_active()
             return get_last_active(this, opaque_ref);
         }
 
-        public static DateTime get_last_active(Session session, string _self)
+        public static DateTime get_last_active(Session session, string self)
         {
-            return session.JsonRpcClient.session_get_last_active(session.opaque_ref, _self ?? "");
+            return session.JsonRpcClient.session_get_last_active(session.opaque_ref, self ?? "");
         }
 
         public bool get_pool()
@@ -496,9 +507,9 @@ public bool get_pool()
             return get_pool(this, opaque_ref);
         }
 
-        public static bool get_pool(Session session, string _self)
+        public static bool get_pool(Session session, string self)
         {
-            return session.JsonRpcClient.session_get_pool(session.opaque_ref, _self ?? "");
+            return session.JsonRpcClient.session_get_pool(session.opaque_ref, self ?? "");
         }
 
         public XenRef<Subject> get_subject()
@@ -506,9 +517,9 @@ public XenRef<Subject> get_subject()
             return get_subject(this, opaque_ref);
         }
 
-        public static XenRef<Subject> get_subject(Session session, string _self)
+        public static XenRef<Subject> get_subject(Session session, string self)
         {
-            return session.JsonRpcClient.session_get_subject(session.opaque_ref, _self ?? "");
+            return session.JsonRpcClient.session_get_subject(session.opaque_ref, self ?? "");
         }
 
         public string get_auth_user_sid()
@@ -516,9 +527,9 @@ public string get_auth_user_sid()
             return get_auth_user_sid(this, opaque_ref);
         }
 
-        public static string get_auth_user_sid(Session session, string _self)
+        public static string get_auth_user_sid(Session session, string self)
         {
-            return session.JsonRpcClient.session_get_auth_user_sid(session.opaque_ref, _self ?? "");
+            return session.JsonRpcClient.session_get_auth_user_sid(session.opaque_ref, self ?? "");
         }
 
         #region AD SID enumeration and bootout
@@ -543,25 +554,25 @@ public static XenRef<Task> async_get_all_subject_identifiers(Session session)
             return session.JsonRpcClient.async_session_get_all_subject_identifiers(session.opaque_ref);
         }
 
-        public string logout_subject_identifier(string subject_identifier)
+        public string logout_subject_identifier(string subjectIdentifier)
         {
-            return logout_subject_identifier(this, subject_identifier);
+            return logout_subject_identifier(this, subjectIdentifier);
         }
 
-        public static string logout_subject_identifier(Session session, string subject_identifier)
+        public static string logout_subject_identifier(Session session, string subjectIdentifier)
         {
-            session.JsonRpcClient.session_logout_subject_identifier(session.opaque_ref, subject_identifier);
+            session.JsonRpcClient.session_logout_subject_identifier(session.opaque_ref, subjectIdentifier);
             return string.Empty;
         }
 
-        public XenRef<Task> async_logout_subject_identifier(string subject_identifier)
+        public XenRef<Task> async_logout_subject_identifier(string subjectIdentifier)
         {
-            return async_logout_subject_identifier(this, subject_identifier);
+            return async_logout_subject_identifier(this, subjectIdentifier);
         }
 
-        public static XenRef<Task> async_logout_subject_identifier(Session session, string subject_identifier)
+        public static XenRef<Task> async_logout_subject_identifier(Session session, string subjectIdentifier)
         {
-            return session.JsonRpcClient.async_session_logout_subject_identifier(session.opaque_ref, subject_identifier);
+            return session.JsonRpcClient.async_session_logout_subject_identifier(session.opaque_ref, subjectIdentifier);
         }
 
         #endregion
@@ -573,39 +584,39 @@ public Dictionary<string, string> get_other_config()
             return get_other_config(this, opaque_ref);
         }
 
-        public static Dictionary<string, string> get_other_config(Session session, string _self)
+        public static Dictionary<string, string> get_other_config(Session session, string self)
         {
-            return session.JsonRpcClient.session_get_other_config(session.opaque_ref, _self ?? "");
+            return session.JsonRpcClient.session_get_other_config(session.opaque_ref, self ?? "");
         }
 
-        public void set_other_config(Dictionary<string, string> _other_config)
+        public void set_other_config(Dictionary<string, string> otherConfig)
         {
-            set_other_config(this, opaque_ref, _other_config);
+            set_other_config(this, opaque_ref, otherConfig);
         }
 
-        public static void set_other_config(Session session, string _self, Dictionary<string, string> _other_config)
+        public static void set_other_config(Session session, string self, Dictionary<string, string> otherConfig)
         {
-            session.JsonRpcClient.session_set_other_config(session.opaque_ref, _self ?? "", _other_config);
+            session.JsonRpcClient.session_set_other_config(session.opaque_ref, self ?? "", otherConfig);
         }
 
-        public void add_to_other_config(string _key, string _value)
+        public void add_to_other_config(string key, string value)
         {
-            add_to_other_config(this, opaque_ref, _key, _value);
+            add_to_other_config(this, opaque_ref, key, value);
         }
 
-        public static void add_to_other_config(Session session, string _self, string _key, string _value)
+        public static void add_to_other_config(Session session, string self, string key, string value)
         {
-            session.JsonRpcClient.session_add_to_other_config(session.opaque_ref, _self ?? "", _key ?? "", _value ?? "");
+            session.JsonRpcClient.session_add_to_other_config(session.opaque_ref, self ?? "", key ?? "", value ?? "");
         }
 
-        public void remove_from_other_config(string _key)
+        public void remove_from_other_config(string key)
         {
-            remove_from_other_config(this, opaque_ref, _key);
+            remove_from_other_config(this, opaque_ref, key);
         }
 
-        public static void remove_from_other_config(Session session, string _self, string _key)
+        public static void remove_from_other_config(Session session, string self, string key)
         {
-            session.JsonRpcClient.session_remove_from_other_config(session.opaque_ref, _self ?? "", _key ?? "");
+            session.JsonRpcClient.session_remove_from_other_config(session.opaque_ref, self ?? "", key ?? "");
         }
 
         #endregion
diff --git a/ocaml/sdk-gen/csharp/autogen/src/XenObject.cs b/ocaml/sdk-gen/csharp/autogen/src/XenObject.cs
index 3d372799771..10f238a2b04 100644
--- a/ocaml/sdk-gen/csharp/autogen/src/XenObject.cs
+++ b/ocaml/sdk-gen/csharp/autogen/src/XenObject.cs
@@ -42,15 +42,7 @@ public abstract partial class XenObject<S> : IXenObject where S : XenObject<S>
         /// </summary>
         public abstract void UpdateFrom(S record);
 
-        /// <summary>
-        /// Save any changed fields to the server.
-        /// This method is usually invoked on a thread pool thread.
-        /// </summary>
-        /// <param name="session"></param>
-        /// <param name="serverOpaqueRef"/>
-        /// <param name="serverObject">Changes are sent to the server if the field in "this"
-        /// is different from serverObject. Can be the object in the cache, or another reference
-        /// object that we want to save changes to.</param>
+        [Obsolete("Use the calls setting individual fields of the API object instead.")]
         public abstract string SaveChanges(Session session, string serverOpaqueRef, S serverObject);
 
         public string opaque_ref { get; set; }
diff --git a/ocaml/sdk-gen/csharp/autogen/src/XenServer.csproj b/ocaml/sdk-gen/csharp/autogen/src/XenServer.csproj
index 8f36aba76fa..22acc1de24a 100644
--- a/ocaml/sdk-gen/csharp/autogen/src/XenServer.csproj
+++ b/ocaml/sdk-gen/csharp/autogen/src/XenServer.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Version>0.0.0</Version>
-    <TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
+    <TargetFrameworks>net80;netstandard2.0;net45</TargetFrameworks>
     <OutputType>Library</OutputType>
     <RootNamespace>XenAPI</RootNamespace>
     <GenerateAssemblyInfo>True</GenerateAssemblyInfo>
@@ -18,6 +18,7 @@
     <PackageIcon>packageIcon.png</PackageIcon>
     <RepositoryType>git</RepositoryType>
     <PackageReadmeFile>README-NuGet.md</PackageReadmeFile>
+	<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
   <ItemGroup>
     <None Include="..\LICENSE" Pack="true" PackagePath="LICENSE" />
@@ -26,6 +27,7 @@
   </ItemGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <WarningsNotAsErrors>8981</WarningsNotAsErrors>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
diff --git a/ocaml/sdk-gen/csharp/gen_csharp_binding.ml b/ocaml/sdk-gen/csharp/gen_csharp_binding.ml
index 14b6af5e225..45ee61f46c7 100644
--- a/ocaml/sdk-gen/csharp/gen_csharp_binding.ml
+++ b/ocaml/sdk-gen/csharp/gen_csharp_binding.ml
@@ -353,6 +353,8 @@ and gen_class out_chan cls =
   print
     ";\n\
     \        }\n\n\
+    \        [Obsolete(\"Use the calls setting individual fields of the API \
+     object instead.\")]\n\
     \        public override string SaveChanges(Session session, string \
      opaqueRef, %s server)\n\
     \        {\n\
diff --git a/ocaml/sdk-gen/powershell/autogen/src/XenServerPowerShell.csproj b/ocaml/sdk-gen/powershell/autogen/src/XenServerPowerShell.csproj
index 1fb6483bd34..3d952212447 100644
--- a/ocaml/sdk-gen/powershell/autogen/src/XenServerPowerShell.csproj
+++ b/ocaml/sdk-gen/powershell/autogen/src/XenServerPowerShell.csproj
@@ -16,10 +16,7 @@
     <PackageReference Include="System.Management.Automation" Version="7.2.18" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net45'">
-    <Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\WindowsPowerShell\3.0\System.Management.Automation.dll</HintPath>
-    </Reference>
+    <PackageReference Include="Microsoft.PowerShell.5.ReferenceAssemblies" Version="1.1.0" />
   </ItemGroup>
   <ItemGroup>
   <!-- The version number here is a placeholder, remember to update it using the correct XenServer.NET version-->