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

Fix other path constructions using Path.Join (#17825)

Browse Source
This commit is contained in:
Dongbo Wang
2022-08-03 11:06:01 +05:00
committed by GitHub
parent b66a93f74e
commit e7f90f0aa7
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/System.Management.Automation/CoreCLR/CorePsAssemblyLoadContext.cs
+3 -7
View File
@@ -346,9 +346,6 @@ namespace System.Management.Automation
return false;
}
bool assemblyFound = false;
char dirSeparator = IO.Path.DirectorySeparatorChar;
if (string.IsNullOrEmpty(_winDir))
{
// cache value of '_winDir' folder in member variable.
@@ -358,10 +355,10 @@ namespace System.Management.Automation
if (string.IsNullOrEmpty(_gacPathMSIL))
{
// cache value of '_gacPathMSIL' folder in member variable.
_gacPathMSIL = $"{_winDir}{dirSeparator}Microsoft.NET{dirSeparator}assembly{dirSeparator}GAC_MSIL";
_gacPathMSIL = Path.Join(_winDir, "Microsoft.NET", "assembly", "GAC_MSIL");
}
assemblyFound = FindInGac(_gacPathMSIL, assemblyName, out assemblyFilePath);
bool assemblyFound = FindInGac(_gacPathMSIL, assemblyName, out assemblyFilePath);
if (!assemblyFound)
{
@@ -399,8 +396,7 @@ namespace System.Management.Automation
bool assemblyFound = false;
assemblyPath = null;
char dirSeparator = IO.Path.DirectorySeparatorChar;
string tempAssemblyDirPath = $"{gacRoot}{dirSeparator}{assemblyName.Name}";
string tempAssemblyDirPath = Path.Join(gacRoot, assemblyName.Name);
if (Directory.Exists(tempAssemblyDirPath))
{