admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up ApplicationBase work-around

Browse Source
This commit is contained in:
Andrew Schwartzmeyer
2016-07-26 11:49:54 -07:00
parent d40131ae44
commit f0e64c2c6c
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/System.Management.Automation/engine/Utils.cs
+10 -7
View File
@@ -231,15 +231,18 @@ namespace System.Management.Automation
/// </exception>
internal static string GetApplicationBase(string shellId)
{
if (!Platform.IsCore)
// TODO: #1184 will resolve this work-around
// The application base cannot be resolved from the registry for side-by-side versions
// of PowerShell.
#if !CORECLR
// try to get the path from the registry first
string result = GetApplicationBaseFromRegistry(shellId);
if (result != null)
{
// try to get the path from the registry first
string result = GetApplicationBaseFromRegistry(shellId);
if (result != null)
{
return result;
}
return result;
}
#endif
#if CORECLR // Use the location of SMA.dll as the application base
// Assembly.GetEntryAssembly is not in CoreCLR. GAC is not in CoreCLR.