From 0b41a1dd77a5a1c3857f231a54290039fc4cb0ec Mon Sep 17 00:00:00 2001 From: Immo Landwerth Date: Sat, 7 Feb 2015 21:27:08 -0800 Subject: [PATCH 1/4] Rename variable to not include the VS version This minimizes the number of changes when the tool has to target a higher version of Visual Studio. Besides, it doesn't actually point to Visual Studio per-se. --- build.cmd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.cmd b/build.cmd index 92e0a44f..a8acbda6 100644 --- a/build.cmd +++ b/build.cmd @@ -4,9 +4,9 @@ SETLOCAL SET CACHED_NUGET=%LocalAppData%\NuGet\NuGet.exe SET SOLUTION_PATH=%~dp0src\CodeFormatter.sln -SET VS2015_BUILD_TOOLS_PATH="%ProgramFiles(x86)%\MSBuild\14.0\bin\MSBuild.exe" +SET BUILD_TOOLS_PATH="%ProgramFiles(x86)%\MSBuild\14.0\bin\MSBuild.exe" -IF NOT EXIST %VS2015_BUILD_TOOLS_PATH% ( +IF NOT EXIST %BUILD_TOOLS_PATH% ( echo In order to build or run this tool you need either Visual Studio 2015 Preview or echo Microsoft Build Tools 2015 Preview tools installed. echo. From c2f3854af107c563bb706a66270a3ec5b6466273 Mon Sep 17 00:00:00 2001 From: Immo Landwerth Date: Sat, 7 Feb 2015 21:29:57 -0800 Subject: [PATCH 2/4] Reuse path already captured in a variable --- build.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.cmd b/build.cmd index a8acbda6..bd191f50 100644 --- a/build.cmd +++ b/build.cmd @@ -26,4 +26,4 @@ IF EXIST "%~dp0src\packages" goto build :build -"%ProgramFiles(x86)%\MSBuild\14.0\bin\MSBuild.exe" %SOLUTION_PATH% /p:OutDir="%~dp0bin " /nologo /m /v:m /flp:verbosity=normal %* +%BUILD_TOOLS_PATH% %SOLUTION_PATH% /p:OutDir="%~dp0bin " /nologo /m /v:m /flp:verbosity=normal %* From 8ac1349c3f49895b3e2053ba302fa970c40db2e2 Mon Sep 17 00:00:00 2001 From: Immo Landwerth Date: Sat, 7 Feb 2015 21:34:10 -0800 Subject: [PATCH 3/4] Remove 'Preview' qualifier from VS and MSBuild Firstly, they don't add much and secondly, we'll have to remove them eventually anyways. --- build.cmd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.cmd b/build.cmd index bd191f50..738301b2 100644 --- a/build.cmd +++ b/build.cmd @@ -7,8 +7,8 @@ SET SOLUTION_PATH=%~dp0src\CodeFormatter.sln SET BUILD_TOOLS_PATH="%ProgramFiles(x86)%\MSBuild\14.0\bin\MSBuild.exe" IF NOT EXIST %BUILD_TOOLS_PATH% ( - echo In order to build or run this tool you need either Visual Studio 2015 Preview or - echo Microsoft Build Tools 2015 Preview tools installed. + echo In order to build or run this tool you need either Visual Studio 2015 or + echo Microsoft Build Tools 2015 tools installed. echo. echo Visit http://www.visualstudio.com/en-us/downloads/visual-studio-2015-downloads-vs echo to download either. From ef4e5ef46b8f3d0b5c74a3b38fb483518da9579f Mon Sep 17 00:00:00 2001 From: Immo Landwerth Date: Sat, 7 Feb 2015 21:30:52 -0800 Subject: [PATCH 4/4] Beatify output of the download URL --- build.cmd | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build.cmd b/build.cmd index 738301b2..f87bfb39 100644 --- a/build.cmd +++ b/build.cmd @@ -10,8 +10,10 @@ IF NOT EXIST %BUILD_TOOLS_PATH% ( echo In order to build or run this tool you need either Visual Studio 2015 or echo Microsoft Build Tools 2015 tools installed. echo. - echo Visit http://www.visualstudio.com/en-us/downloads/visual-studio-2015-downloads-vs - echo to download either. + echo Visit this page to download either: + echo. + echo http://www.visualstudio.com/en-us/downloads/visual-studio-2015-downloads-vs + echo. goto :eof )