From 95657bb4d77753f407c6e791ab5afbffa2d26f9e Mon Sep 17 00:00:00 2001
From: Tom Deseyn <tom.deseyn@gmail.com>
Date: Thu, 6 Feb 2025 11:42:58 +0100
Subject: [PATCH 1/2] System.Configuration.ConfigurationManager.Tests: use
 Assembly.Location to determine ThisApplicationPath.

---
 .../tests/Mono/TestUtil.cs                                  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/libraries/System.Configuration.ConfigurationManager/tests/Mono/TestUtil.cs b/src/libraries/System.Configuration.ConfigurationManager/tests/Mono/TestUtil.cs
index b14d833c97a218..1a86c66cc5cf5c 100644
--- a/src/libraries/System.Configuration.ConfigurationManager/tests/Mono/TestUtil.cs
+++ b/src/libraries/System.Configuration.ConfigurationManager/tests/Mono/TestUtil.cs
@@ -58,8 +58,10 @@ public static string ThisApplicationPath
         {
             get
             {
-                return Path.Combine(AppDomain.CurrentDomain.BaseDirectory,
-                    Assembly.GetEntryAssembly().ManifestModule.Name);
+                Assembly assembly = Assembly.GetEntryAssembly();
+                string directory = Path.GetDirectoryName(assembly.Location);
+                string fileName = assembly.ManifestModule.Name;
+                return Path.Combine(directory, fileName);
             }
         }
 

From 691f6cd4368ee0140f2339305131eea4003f39cd Mon Sep 17 00:00:00 2001
From: Tom Deseyn <tom.deseyn@gmail.com>
Date: Mon, 10 Feb 2025 08:48:00 +0100
Subject: [PATCH 2/2] Remove exePath_UserLevelNone test.

This is functionally covered other tests (OpenExeConfiguration2 and OpenExeConfiguration2_ExePath_DoesNotExist)
that do not rely on the test deployment.
---
 .../tests/Mono/ConfigurationManagerTest.cs            |  9 ---------
 .../tests/Mono/TestUtil.cs                            | 11 -----------
 2 files changed, 20 deletions(-)

diff --git a/src/libraries/System.Configuration.ConfigurationManager/tests/Mono/ConfigurationManagerTest.cs b/src/libraries/System.Configuration.ConfigurationManager/tests/Mono/ConfigurationManagerTest.cs
index f60a6fff75036e..ca65cb92533a72 100644
--- a/src/libraries/System.Configuration.ConfigurationManager/tests/Mono/ConfigurationManagerTest.cs
+++ b/src/libraries/System.Configuration.ConfigurationManager/tests/Mono/ConfigurationManagerTest.cs
@@ -131,15 +131,6 @@ public void OpenExeConfiguration2_ExePath_DoesNotExist()
             }
         }
 
-        [Fact]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/21319", TargetFrameworkMonikers.NetFramework)]
-        public void exePath_UserLevelNone()
-        {
-            string name = TestUtil.ThisApplicationPath;
-            SysConfig config = ConfigurationManager.OpenExeConfiguration(name);
-            Assert.Equal(TestUtil.ThisApplicationPath + ".config", config.FilePath);
-        }
-
         [Fact]
         public void exePath_UserLevelPerRoaming()
         {
diff --git a/src/libraries/System.Configuration.ConfigurationManager/tests/Mono/TestUtil.cs b/src/libraries/System.Configuration.ConfigurationManager/tests/Mono/TestUtil.cs
index 1a86c66cc5cf5c..be2254e89ce52a 100644
--- a/src/libraries/System.Configuration.ConfigurationManager/tests/Mono/TestUtil.cs
+++ b/src/libraries/System.Configuration.ConfigurationManager/tests/Mono/TestUtil.cs
@@ -54,17 +54,6 @@ public static void RunWithTempFiles(MyAction<string, string> action)
             }
         }
 
-        public static string ThisApplicationPath
-        {
-            get
-            {
-                Assembly assembly = Assembly.GetEntryAssembly();
-                string directory = Path.GetDirectoryName(assembly.Location);
-                string fileName = assembly.ManifestModule.Name;
-                return Path.Combine(directory, fileName);
-            }
-        }
-
         public static string ThisConfigFileName
         {
             get