Correct searching config base on exe file name.

soroshsabz · Jul 10, 2022 · ec1cf7c · ec1cf7c
1 parent 98a36b3
commit ec1cf7c
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/src/Lib/PCLAppConfig.FileSystemStream.UWP/UWPAppConfigPathExtractor.cs b/src/Lib/PCLAppConfig.FileSystemStream.UWP/UWPAppConfigPathExtractor.cs
@@ -15,15 +15,20 @@ public string Path
 			get
 			{
 				string rootPath = Package.Current.InstalledLocation.Path;
-				string exeConfig = System.IO.Path.Combine(rootPath, Package.Current.DisplayName + ".exe.config");
-				if (!File.Exists(exeConfig))
+				string packageConfig = System.IO.Path.Combine(rootPath, Package.Current.DisplayName + ".exe.config");
+				string exeConfig = System.IO.Path.Combine(rootPath, System.AppDomain.CurrentDomain.FriendlyName + ".exe.config");
+				if (File.Exists(packageConfig))
 				{
-					return System.IO.Path.Combine(rootPath, "App.config");
+					return packageConfig;
 				}
-				else
+				else if (File.Exists(exeConfig))
 				{
 					return exeConfig;
 				}
+				else
+				{
+					return System.IO.Path.Combine(rootPath, "App.config");
+				}
 			}
 		}
 	}