merge cinflict fix

Author: Aditya Abhishek

src/VirtualClient/VirtualClient.Core/KeyVaultManager.cs

@@ -5,13 +5,15 @@ namespace VirtualClient
 {
     using System;
     using System.Net;
+    using System.Runtime.ConstrainedExecution;
     using System.Threading;
     using System.Threading.Tasks;
     using Azure;
     using Azure.Core;
     using Azure.Security.KeyVault.Certificates;
     using Azure.Security.KeyVault.Keys;
     using Azure.Security.KeyVault.Secrets;
+    using Microsoft.CodeAnalysis.CSharp.Syntax;
     using Polly;
     using VirtualClient.Common.Extensions;
     using VirtualClient.Contracts;

src/VirtualClient/VirtualClient.Main/OptionFactory.cs

@@ -866,6 +866,11 @@ public static Option CreateProxyApiOption(bool required = false, object defaultV
                     "EventHubStore",
                     "Invalid usage. An Event Hub option cannot be supplied at the same time as a proxy API option. When using a proxy API, all telemetry is uploaded through the proxy.");
 
+                OptionFactory.ThrowIfOptionExists(
+                    result,
+                    "KeyVault",
+                    "Invalid usage. A Key Vault option cannot be supplied at the same time as a proxy API option. When using a proxy API, all secrets and certificates are resolved through the proxy.");
+
                 return string.Empty;
             });