Skip to content

Commit 69d2734

Browse files
author
ENDAVA\mzorec
committed
Adds msbuild 17 path for compile solution task.
1 parent 7a870d3 commit 69d2734

File tree

2 files changed

+22
-0
lines changed

2 files changed

+22
-0
lines changed

src/FlubuCore/Services/FlubuEnvironment.cs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,5 +126,26 @@ internal static void FillMsBuild16Path(SortedDictionary<Version, string> toolsVe
126126
}
127127
}
128128
}
129+
130+
internal static void FillMsBuild17Path(SortedDictionary<Version, string> toolsVersions)
131+
{
132+
string programFilesX86DirPath = Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles);
133+
134+
foreach (var vsEdition in _vsEditions)
135+
{
136+
var msbuildPath = Path.Combine(programFilesX86DirPath, "Microsoft Visual Studio/2022", vsEdition, "MSBuild/Current/Bin");
137+
138+
if (Directory.Exists(msbuildPath))
139+
{
140+
if (Environment.Is64BitOperatingSystem)
141+
{
142+
msbuildPath = Path.Combine(msbuildPath, "amd64");
143+
}
144+
145+
toolsVersions.Add(new Version("17.0"), msbuildPath);
146+
return;
147+
}
148+
}
149+
}
129150
}
130151
}

src/FlubuCore/Services/FlubuEnvironmentService.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ public IDictionary<Version, string> ListAvailableMSBuildToolsVersions()
1313
FlubuEnvironment.FillVersionsFromMsBuildToolsVersionsRegPath(toolsVersions);
1414
FlubuEnvironment.FillVersion15FromVisualStudio2017(toolsVersions);
1515
FlubuEnvironment.FillMsBuild16Path(toolsVersions);
16+
FlubuEnvironment.FillMsBuild17Path(toolsVersions);
1617
return toolsVersions;
1718
}
1819

0 commit comments

Comments
 (0)