Skip to content

Commit

Permalink
Fixes #324 | Bugfix to previous commit
Browse files Browse the repository at this point in the history
  • Loading branch information
pbru87 committed Sep 2, 2023
1 parent 2f2d777 commit 43cae88
Showing 1 changed file with 10 additions and 6 deletions.
16 changes: 10 additions & 6 deletions src/Microsoft.OData.Cli/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,18 @@ static async Task Main(string[] args)
/// </summary>
private static void RegisterMsBuild()
{
string pathToMsBuildExeInLatestVisualStudioVersion = string.Empty;
const string defaultInstallDirOfVisualStudio = @"C:\Program Files\Microsoft Visual Studio\";
var installDirOfLatestVisualStudio = Directory.GetDirectories(defaultInstallDirOfVisualStudio, "????", SearchOption.TopDirectoryOnly)
.Where(x => Path.GetFileName(x).All(char.IsDigit))
.MaxBy(x => Path.GetFileName(x));
if (Directory.Exists(defaultInstallDirOfVisualStudio))
{
var installDirOfLatestVisualStudio = Directory.GetDirectories(defaultInstallDirOfVisualStudio, "????", SearchOption.TopDirectoryOnly)
.Where(x => Path.GetFileName(x).All(char.IsDigit))
.MaxBy(x => Path.GetFileName(x));

string pathToMsBuildExeInLatestVisualStudioVersion = Path.Combine(
Directory.GetDirectories(installDirOfLatestVisualStudio, "*", SearchOption.TopDirectoryOnly).FirstOrDefault() ?? string.Empty,
"MSBuild", "Current", "Bin", "MSBuild.exe");
pathToMsBuildExeInLatestVisualStudioVersion = Path.Combine(
Directory.GetDirectories(installDirOfLatestVisualStudio, "*", SearchOption.TopDirectoryOnly).FirstOrDefault() ?? string.Empty,
"MSBuild", "Current", "Bin", "MSBuild.exe");
}

if (File.Exists(pathToMsBuildExeInLatestVisualStudioVersion))
{
Expand Down

0 comments on commit 43cae88

Please sign in to comment.