Fix ValidateBuildEnvironment task to work on multiple OSes (dotnet#24765

)
ViktorHofer · Feb 12, 2018 · ac0fe49 · ac0fe49
1 parent 5c9cd2a
commit ac0fe49
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/Tools/BuildUtil/ValidateBuildEnvironment.cs b/src/Tools/BuildUtil/ValidateBuildEnvironment.cs
@@ -36,7 +36,8 @@ public override bool Execute()
 
             if (MSBuildMinimumFileVersion != null)
             {
-                var msbuildFilePath = Path.Combine(MSBuildBinPath, "msbuild.exe");
+                var msbuildFileName = "MSBuild." + (Environment.NewLine == "\r\n" ? "exe" : "dll");
+                var msbuildFilePath = Path.Combine(MSBuildBinPath, msbuildFileName);
                 var fileVersionInfo = FileVersionInfo.GetVersionInfo(msbuildFilePath);
                 var fileVersion = new Version(fileVersionInfo.FileVersion);
                 var minimumVersion = new Version(MSBuildMinimumFileVersion);