Skip to content

Commit

Permalink
removing the conflicting assembly (#11254)
Browse files Browse the repository at this point in the history
  • Loading branch information
SimaTian authored Jan 13, 2025
1 parent 3898228 commit bfa266d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/Shared/FrameworkLocationHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1392,8 +1392,8 @@ public virtual string GetPathToDotNetFramework(DotNetFrameworkArchitecture archi
// Context: https://github.com/dotnet/msbuild/pull/7689
if (this._hasMsBuild &&
generatedPathToDotNetFramework != null &&
(!FileSystems.Default.FileExists(Path.Combine(generatedPathToDotNetFramework, NativeMethodsShared.IsWindows ? "MSBuild.exe" : "mcs.exe")) &&
!FileSystems.Default.FileExists(Path.Combine(generatedPathToDotNetFramework, "Microsoft.Build.dll"))))
(!File.Exists(Path.Combine(generatedPathToDotNetFramework, NativeMethodsShared.IsWindows ? "MSBuild.exe" : "mcs.exe")) &&
!File.Exists(Path.Combine(generatedPathToDotNetFramework, "Microsoft.Build.dll"))))
{
return null;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Utilities/ToolLocationHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3584,7 +3584,7 @@ public static string GetPathToBuildToolsFile(string fileName, string toolsVersio
{
toolPath = Path.Combine(toolPath, fileName);

if (!FileSystems.Default.FileExists(toolPath))
if (!File.Exists(toolPath))
{
toolPath = null;
}
Expand Down

0 comments on commit bfa266d

Please sign in to comment.