Release 2.5 (#44)

Keyfactor · Jun 24, 2022 · 5a49f57 · 5a49f57
1 parent 63bf001
commit 5a49f57
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/keyfactor-starter-workflow.yml b/.github/workflows/keyfactor-starter-workflow.yml
@@ -11,7 +11,7 @@ jobs:
     with:
       release_version: ${{ needs.call-create-github-release-workflow.outputs.release_version }}
       release_url: ${{ needs.call-create-github-release-workflow.outputs.release_url }}
-      release_dir: JavaKeyStoreSSH/bin/Release/netcoreapp3.1
+      release_dir: JavaKeyStoreSSH/bin/Release
     secrets: 
       token: ${{ secrets.PRIVATE_PACKAGE_ACCESS }}
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,10 @@
+v2.5
+- Bug fixes for installation on Linux hosted Universal Orchestrator
+
 v2.4
 - Add new config.json setting DefaultLinuxPermissionsOnStoreCreation, and certificate store type custom parameter linuxFilePermissionsOnStoreCreation
 - Add ability to use client machine credentials for WinRM Windows servers rather than always using the Keyfactor service account 
 
-
 v2.3
 - Limit the valid characters that can be used for store paths to protect against command injection.
 

diff --git a/Images/Image1d.png b/Images/Image1d.png
diff --git a/JavaKeyStoreSSH/ApplicationSettings.cs b/JavaKeyStoreSSH/ApplicationSettings.cs
@@ -32,10 +32,10 @@ public static void Initialize(string currLocation)
             string configContents = string.Empty;
             string currDir = Path.GetDirectoryName(currLocation);
 
-            if (!File.Exists($@"{currDir}\config.json"))
+            if (!File.Exists($@"{currDir}{Path.DirectorySeparatorChar}config.json"))
                 throw new JKSException($"config.json file does not exist in {currDir}");
 
-            using (StreamReader sr = new StreamReader($@"{currDir}\config.json"))
+            using (StreamReader sr = new StreamReader($@"{currDir}{Path.DirectorySeparatorChar}config.json"))
             {
                 configContents = sr.ReadToEnd();
             }

diff --git a/JavaKeyStoreSSH/JavaKeyStoreSSH.csproj b/JavaKeyStoreSSH/JavaKeyStoreSSH.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-    <Version>2.1.0</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

diff --git a/README.md b/README.md
@@ -16,6 +16,7 @@ The Universal Orchestrator is the successor to the Windows Orchestrator. This Ca
 
 
 
+
 ---
 
 <!-- add integration specific information below -->
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,6 +16,7 @@ The Universal Orchestrator is the successor to the Windows Orchestrator. This Ca




		---

		<!-- add integration specific information below -->
Expand Down