Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Search for IKVM.Home and IKVM.Home.Root in AppContext #590

Merged
merged 3 commits into from
Sep 10, 2024
Merged

Search for IKVM.Home and IKVM.Home.Root in AppContext #590

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b354e4
Search in AppContext.
wasabii Sep 8, 2024
ab37f93
bump
wasabii Sep 8, 2024
26d92e4
Merge branch 'develop' into appctx
wasabii Sep 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions src/IKVM.Runtime/JVM.Properties.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Loading