Revert "Set AppContext.BaseDirectory and the lookup path for AssemblyDirectory to the directory containing the NativeAOT module"

src/coreclr/nativeaot/System.Private.CoreLib/src/Internal/DeveloperExperience/DeveloperExperience.cs

@@ -25,7 +25,7 @@ public virtual string CreateStackTraceString(IntPtr ip, bool includeFileInfo, ou
             }
 
             // If we don't have precise information, try to map it at least back to the right module.
-            string? moduleFullFileName = RuntimeAugments.TryGetFullPathToApplicationModule(ip, out IntPtr moduleBase);
+            string moduleFullFileName = RuntimeAugments.TryGetFullPathToApplicationModule(ip, out IntPtr moduleBase);
 
             // Without any callbacks or the ability to map ip correctly we better admit that we don't know
             if (string.IsNullOrEmpty(moduleFullFileName))

src/coreclr/nativeaot/System.Private.CoreLib/src/Internal/Runtime/Augments/RuntimeAugments.cs

@@ -641,7 +641,7 @@ public static RuntimeTypeHandle GetNullableType(RuntimeTypeHandle nullableType)
         /// </summary>
         /// <param name="ip">Address inside the module</param>
         /// <param name="moduleBase">Module base address</param>
-        public static unsafe string? TryGetFullPathToApplicationModule(IntPtr ip, out IntPtr moduleBase)
+        public static unsafe string TryGetFullPathToApplicationModule(IntPtr ip, out IntPtr moduleBase)
         {
             moduleBase = RuntimeImports.RhGetOSModuleFromPointer(ip);
             if (moduleBase == IntPtr.Zero)

src/coreclr/nativeaot/System.Private.CoreLib/src/System/AppContext.NativeAot.cs

@@ -1,7 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using Internal.Runtime.Augments;
 using System.Collections.Generic;
 using System.Runtime;
 using System.Runtime.ExceptionServices;
@@ -37,21 +36,5 @@ internal static void OnUnhandledException(object e)
         {
             UnhandledException?.Invoke(/* AppDomain */ null, new UnhandledExceptionEventArgs(e, true));
         }
-
-        private static unsafe string GetRuntimeModulePath()
-        {
-            // We aren't going to call this method, we just need an address that we know is in this module.
-            // As this code is NativeAOT only, we know that this method will be AOT compiled into the executable,
-            // so the entry point address will be in the module.
-            void* ip = (void*)(delegate*<string>)&GetRuntimeModulePath;
-            if (RuntimeAugments.TryGetFullPathToApplicationModule((nint)ip, out _) is string modulePath)
-            {
-                return modulePath;
-            }
-
-            // If this method isn't in a dynamically loaded module,
-            // then it's in the executable. In that case, we can use the process path.
-            return Environment.ProcessPath;
-        }
     }
 }

src/libraries/System.Private.CoreLib/src/System/AppContext.AnyOS.cs

@@ -19,7 +19,7 @@ private static string GetBaseDirectoryCore()
         {
             // Fallback path for hosts that do not set APP_CONTEXT_BASE_DIRECTORY explicitly
 #if NATIVEAOT
-            string? path = GetRuntimeModulePath();
+            string? path = Environment.ProcessPath;
 #else
             string? path = Assembly.GetEntryAssembly()?.Location;
 #endif