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

…tory (dotnet#21797) dotnet#21750 --------- Co-authored-by: Eilon Lipton <[email protected]> Co-authored-by: Jonathan Peppers <[email protected]>
RussKie · Apr 17, 2024 · d6a3c50 · d6a3c50
1 parent a7aeade
commit d6a3c50
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/BlazorWebView/src/WindowsForms/BlazorWebView.cs b/src/BlazorWebView/src/WindowsForms/BlazorWebView.cs
@@ -177,7 +177,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)!;

diff --git a/src/BlazorWebView/src/Wpf/BlazorWebView.cs b/src/BlazorWebView/src/Wpf/BlazorWebView.cs
@@ -262,7 +262,7 @@ private void StartWebViewCoreIfPossible()
 			}
 			else
 			{
-				appRootDir = Environment.CurrentDirectory;
+				appRootDir = AppContext.BaseDirectory;
 			}
 			var hostPageFullPath = Path.GetFullPath(Path.Combine(appRootDir, HostPage));
 			var contentRootDirFullPath = Path.GetDirectoryName(hostPageFullPath)!;