Merge pull request #1124 from DickvdBrink/vs2015-doc-fix

Document Visual Studio 2015 support

4 files changed, 10 insertions, 7 deletions

diff --git a/Documentation/building/windows-instructions.md b/Documentation/building/windows-instructions.md
index 4cbbcedba7..8ab6cbcbe3 100644
--- a/Documentation/building/windows-instructions.md
+++ b/Documentation/building/windows-instructions.md
@@ -15,8 +15,9 @@ Visual Studio must be installed. Supported versions:
 
 - [Visual Studio Community 2013](http://go.microsoft.com/fwlink/?LinkId=517284) - **Free** for Open Source development!
 - [Visual Studio 2013 Update 3](http://www.visualstudio.com/downloads/download-visual-studio-vs) or later (Pro, Premium, Ultimate)
+- [Visual Studio 2015](https://www.visualstudio.com/downloads/visual-studio-2015-downloads-vs) (Community, Professional, Enterprise)
 
-Visual Studio Express is not supported. Visual Studio 2015 isn't supported yet (see [issue #30](https://github.com/dotnet/coreclr/issues/30)).
+Visual Studio Express is not supported.
 
 **Known Issues**
 
@@ -71,6 +72,8 @@ To build CoreCLR, run `build.cmd` from the root of the coreclr repository. This
 	Product binaries are available at C:\git\coreclr\bin\Product\Windows_NT.x64.debug
 	Test binaries are available at C:\git\coreclr\bin\tests\Windows_NT.x64.debug
 
+**Note:** for building using Visual Studio 2015 the parameter `vs2015` should be added to the `build` command.
+
 **build /?** will list supported parameters.
 
 Check the build output.
diff --git a/build.cmd b/build.cmd
index a964a1589e..d94c28d53f 100644
--- a/build.cmd
+++ b/build.cmd
@@ -96,14 +96,14 @@ goto CheckVS
 :CheckVS
 :: Check presence of VS
 if defined VS%__VSProductVersion%COMNTOOLS goto CheckVSExistence
-echo Visual Studio 2013 Community (free) is a pre-requisite to build this repository.
+echo Visual Studio 2013+ (Community is free) is a pre-requisite to build this repository.
 echo See: https://github.com/dotnet/coreclr/blob/master/Documentation/project-docs/developer-guide.md#prerequisites
 exit /b 1
 
 :CheckVSExistence
 :: Does VS 2013 or VS 2015 really exist?
 if exist "!VS%__VSProductVersion%COMNTOOLS!\..\IDE\devenv.exe" goto CheckMSBuild
-echo Visual Studio 2013 Community (free) is a pre-requisite to build this repository.
+echo Visual Studio 2013+ (Community is free) is a pre-requisite to build this repository.
 echo See: https://github.com/dotnet/coreclr/blob/master/Documentation/project-docs/developer-guide.md#prerequisites
 exit /b 1
 
@@ -142,7 +142,7 @@ at VS install location of previous version. Workaround is to copy DIA SDK folder
 of previous version to "%VSINSTALLDIR%" and then resume build.
 :: DIA SDK not included in Express editions
 echo Visual Studio 2013 Express does not include the DIA SDK. ^
-You need Visual Studio 2013 Community (free).
+You need Visual Studio 2013+ (Community is free).
 echo See: https://github.com/dotnet/coreclr/blob/master/Documentation/project-docs/developer-guide.md#prerequisites
 exit /b 1
 
diff --git a/tests/buildtest.cmd b/tests/buildtest.cmd
index 2f44f53d34..3533144821 100644
--- a/tests/buildtest.cmd
+++ b/tests/buildtest.cmd
@@ -81,13 +81,13 @@ for /f "delims=" %%a in ('powershell -NoProfile -ExecutionPolicy RemoteSigned "&
 
 :: Check presence of VS
 if defined VS%__VSProductVersion%COMNTOOLS goto CheckVSExistence
-echo Installation of VS 2013 is a pre-requisite to build this repository.
+echo Visual Studio 2013+ (Community is free) is a pre-requisite to build this repository.
 exit /b 1
 
 :CheckVSExistence
 :: Does VS 2013 or VS 2015 really exist?
 if exist "!VS%__VSProductVersion%COMNTOOLS!\..\IDE\devenv.exe" goto CheckMSBuild
-echo Installation of VS 2013 is a pre-requisite to build this repository.
+echo Visual Studio 2013+ (Community is free) is a pre-requisite to build this repository.
 exit /b 1
 
 :CheckMSBuild
diff --git a/tests/runtest.cmd b/tests/runtest.cmd
index c9232c90d6..2b6e8587b3 100644
--- a/tests/runtest.cmd
+++ b/tests/runtest.cmd
@@ -31,7 +31,7 @@ shift
 
 :: Check presence of VS
 if defined VS%__VSProductVersion%COMNTOOLS goto CheckMSbuild
-echo Installation of VS 2013 is a pre-requisite to build this repository.
+echo InVisual Studio 2013+ (Community is free) is a pre-requisite to build this repository.
 exit /b 1
 
 :CheckMSBuild