ab#63856

Keyfactor · Oct 7, 2024 · 5585f2e · 5585f2e
1 parent ce1f2aa
commit 5585f2e
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 8 deletions.
diff --git a/CitrixAdcOrchestratorJobExtension/CitrixAdcStore.cs b/CitrixAdcOrchestratorJobExtension/CitrixAdcStore.cs
@@ -31,11 +31,8 @@
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using Org.BouncyCastle.Crypto;
-using Org.BouncyCastle.Crypto.Parameters;
 using Org.BouncyCastle.OpenSsl;
 using Org.BouncyCastle.Pkcs;
-using Org.BouncyCastle.Security;
-using Org.BouncyCastle.Crypto.Paddings;
 
 namespace Keyfactor.Extensions.Orchestrator.CitricAdc
 {
@@ -626,7 +623,7 @@ private systemfile UploadFile(string alias, string contents, bool isCertificate,
 
             systemfile file = new systemfile()
             {
-                filecontent = contents,
+                filecontent = Convert.ToBase64String(Encoding.ASCII.GetBytes(contents)),
                 filelocation = StorePath,
                 filename = fileName
             };
@@ -643,7 +640,7 @@ private systemfile UploadFile(string alias, string contents, bool isCertificate,
                 if ((ne.HResult.Equals(0x80131500) || ne.Message.Contains("File already exists")))
                 {
                     Logger.LogTrace($"File {file.filename} already exists.  Trying again with new name.");
-                    UploadFile(alias, contents, isCertificate, fileNameSuffix + 1);
+                    file = UploadFile(alias, contents, isCertificate, fileNameSuffix + 1);
                 }
                 else
                 {
@@ -737,7 +734,7 @@ private X509Certificate2 ReadX509Certificate(string certString)
                     }
 
                     // ReSharper disable once PossibleIntendedRethrow
-                    throw e;
+                    throw;
                 }
 
                 return x;

diff --git a/CitrixAdcOrchestratorJobExtension/Inventory.cs b/CitrixAdcOrchestratorJobExtension/Inventory.cs
@@ -22,7 +22,6 @@
 using Keyfactor.Orchestrators.Extensions.Interfaces;
 
 using com.citrix.netscaler.nitro.resource.config.ssl;
-using static Org.BouncyCastle.Math.EC.ECCurve;
 
 namespace Keyfactor.Extensions.Orchestrator.CitricAdc
 {

diff --git a/CitrixAdcOrchestratorJobExtension/Keyfactor.Extensions.Orchestrator.CitricAdc.csproj b/CitrixAdcOrchestratorJobExtension/Keyfactor.Extensions.Orchestrator.CitricAdc.csproj
@@ -1,7 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
+    <TargetFrameworks>net6.0</TargetFrameworks>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    <ImplicitUsings>disable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/CitrixAdcTestConsole/bin/Debug/net6.0/CitrixAdcTestConsole.dll b/CitrixAdcTestConsole/bin/Debug/net6.0/CitrixAdcTestConsole.dll
diff --git a/CitrixAdcTestConsole/bin/Debug/net6.0/CitrixAdcTestConsole.exe b/CitrixAdcTestConsole/bin/Debug/net6.0/CitrixAdcTestConsole.exe
diff --git a/CitrixAdcTestConsole/bin/Debug/net6.0/CitrixAdcTestConsole.pdb b/CitrixAdcTestConsole/bin/Debug/net6.0/CitrixAdcTestConsole.pdb
diff --git a/CitrixAdcTestConsole/bin/Debug/net6.0/Keyfactor.Extensions.Orchestrator.CitricAdc.dll b/CitrixAdcTestConsole/bin/Debug/net6.0/Keyfactor.Extensions.Orchestrator.CitricAdc.dll
diff --git a/CitrixAdcTestConsole/bin/Debug/net6.0/Keyfactor.Extensions.Orchestrator.CitricAdc.pdb b/CitrixAdcTestConsole/bin/Debug/net6.0/Keyfactor.Extensions.Orchestrator.CitricAdc.pdb