updated version of Newtonsoft.Json to 10.0.2.

Orange-OpenSource · Feb 23, 2020 · cd242c0 · cd242c0
1 parent 5ea954f
commit cd242c0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/VaultSyncPlugin/SynchronousVaultClient.cs b/VaultSyncPlugin/SynchronousVaultClient.cs
@@ -62,7 +62,15 @@ public SynchronousVaultClient(Uri vaultUrl, string authPath, string vaultLogin,
             this.authPath = authPath;
             this.vaultLogin = vaultLogin;
             this.vaultPassword = vaultPassword;
-            this.client = new VaultClient(vaultUrl);
+
+            if (authPath.Equals("token"))
+            {
+                this.client = new VaultClient(vaultUrl, token = vaultPassword);
+            }
+            else {
+                this.client = new VaultClient(vaultUrl);
+            }
+
         }
 
         /// <summary>

diff --git a/VaultSyncPlugin/app.config b/VaultSyncPlugin/app.config
@@ -4,7 +4,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-10.0.2.0" newVersion="10.0.3.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
@@ -32,4 +32,4 @@
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+</configuration>
diff --git a/VaultSyncPlugin/packages.config b/VaultSyncPlugin/packages.config
@@ -7,7 +7,7 @@
   <package id="Microsoft.NETCore.Platforms" version="1.1.1" targetFramework="net46" />
   <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net46" />
   <package id="NETStandard.Library" version="1.6.1" targetFramework="net46" />
-  <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net46" />
+  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net46" />
   <package id="PlgxTool" version="1.0.0" targetFramework="net45" />
   <package id="System.AppContext" version="4.3.0" targetFramework="net46" />
   <package id="System.Collections" version="4.3.0" targetFramework="net46" />
@@ -55,4 +55,4 @@
   <package id="System.Xml.ReaderWriter" version="4.3.1" targetFramework="net46" />
   <package id="System.Xml.XDocument" version="4.3.0" targetFramework="net46" />
   <package id="Vault" version="0.9.1.3" targetFramework="net45" />
-</packages>
+</packages>