From ac0fe4952b66b7c88c3fb594a54a7fc097f94f6a Mon Sep 17 00:00:00 2001
From: Andy Gocke <angocke@microsoft.com>
Date: Mon, 12 Feb 2018 08:57:15 -0800
Subject: [PATCH] Fix ValidateBuildEnvironment task to work on multiple OSes
 (#24765)

---
 src/Tools/BuildUtil/ValidateBuildEnvironment.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Tools/BuildUtil/ValidateBuildEnvironment.cs b/src/Tools/BuildUtil/ValidateBuildEnvironment.cs
index e278edb25488d..77366d04b66f2 100644
--- 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);