Merge pull request #590 from ikvmnet/appctx

Search for IKVM.Home and IKVM.Home.Root in AppContext
ikvmnet · Sep 10, 2024 · ea6323f · ea6323f
2 parents f6fd873 + 26d92e4
commit ea6323f
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/src/IKVM.Runtime/JVM.Properties.cs b/src/IKVM.Runtime/JVM.Properties.cs
@@ -128,6 +128,13 @@ static string GetHomePath()
                     if (Directory.Exists(Path.GetFullPath(Path.Combine(ikvmHomeEntry.BasePath, ikvmHomeEntry.Value))))
                         return Path.GetFullPath(Path.Combine(ikvmHomeEntry.BasePath, ikvmHomeEntry.Value));
 
+#if NET
+                // specified home directory in runtime.json, where path is relative to application
+                if (AppContext.GetData("IKVM.Home") is string confHome && !string.IsNullOrWhiteSpace(confHome))
+                    if (Directory.Exists(Path.GetFullPath(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, confHome))))
+                        return Path.GetFullPath(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, confHome));
+#endif
+
 #if NETFRAMEWORK
                 // attempt to find settings in legacy app.config
                 try
@@ -153,6 +160,13 @@ static string GetHomePath()
                     if (ResolveHomePathFromRoot(Path.GetFullPath(Path.Combine(ikvmHomeRootEntry.BasePath, ikvmHomeRootEntry.Value))) is string ikvmHomeRootPath)
                         return ikvmHomeRootPath;
 
+#if NET
+                // specified home root directory in runtime.json, where path is relative to application
+                if (AppContext.GetData("IKVM.Home.Root") is string confHomeRoot && !string.IsNullOrWhiteSpace(confHomeRoot))
+                    if (ResolveHomePathFromRoot(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, confHomeRoot)) is string confHomeRootPath)
+                        return confHomeRootPath;
+#endif
+
 #if NETFRAMEWORK
                 // attempt to find settings in legacy app.config
                 try