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

…tory - dotnet#21750
PreciousNyasulu · Apr 12, 2024 · f97b8d9 · f97b8d9
1 parent 0a562dc
commit f97b8d9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/BlazorWebView/src/WindowsForms/BlazorWebView.cs b/src/BlazorWebView/src/WindowsForms/BlazorWebView.cs
@@ -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;
@@ -177,7 +178,7 @@ private void StartWebViewCoreIfPossible()
 			}
 			else
 			{
-				appRootDir = Environment.CurrentDirectory;
+			}
 			}
 			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
@@ -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;
@@ -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)!;