Skip to content

fix: Use AppContext.BaseDirectory instead of Environment.CurrentDirec… #21797

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

Merged
merged 4 commits into from
Apr 17, 2024
Merged

fix: Use AppContext.BaseDirectory instead of Environment.CurrentDirec… #21797

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f97b8d9
fix: Use AppContext.BaseDirectory instead of Environment.CurrentDirec…
PreciousNyasulu Apr 12, 2024
e638be8
Update src/BlazorWebView/src/WindowsForms/BlazorWebView.cs
Eilon Apr 16, 2024
e9cb336
Update src/BlazorWebView/src/WindowsForms/BlazorWebView.cs
Eilon Apr 16, 2024
4b03b54
Update src/BlazorWebView/src/Wpf/BlazorWebView.cs
Eilon Apr 16, 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
3 changes: 2 additions & 1 deletion src/BlazorWebView/src/WindowsForms/BlazorWebView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
using System.Reflection;
using System.Threading.Tasks;
using System.Windows.Forms;
using System.AppContext;
using Microsoft.AspNetCore.Components.WebView.WebView2;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.FileProviders;
Expand Down Expand Up @@ -177,7 +178,7 @@ private void StartWebViewCoreIfPossible()
}
else
{
appRootDir = Environment.CurrentDirectory;
appRootDir = AppContext.BaseDirectory;
}
var hostPageFullPath = Path.GetFullPath(Path.Combine(appRootDir, HostPage!)); // HostPage is nonnull because RequiredStartupPropertiesSet is checked above
var contentRootDirFullPath = Path.GetDirectoryName(hostPageFullPath)!;
Expand Down
3 changes: 2 additions & 1 deletion src/BlazorWebView/src/Wpf/BlazorWebView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
using System.AppContext;
using Microsoft.AspNetCore.Components.WebView.WebView2;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.FileProviders;
Expand Down Expand Up @@ -262,7 +263,7 @@ private void StartWebViewCoreIfPossible()
}
else
{
appRootDir = Environment.CurrentDirectory;
appRootDir = AppContext.BaseDirectory;
}
var hostPageFullPath = Path.GetFullPath(Path.Combine(appRootDir, HostPage));
var contentRootDirFullPath = Path.GetDirectoryName(hostPageFullPath)!;
Expand Down