Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix link to corehost build requirements on Windows #38253

Merged
merged 2 commits into from
Jun 23, 2020
Merged

Fix link to corehost build requirements on Windows #38253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bccfcbf
Fix link to corehost build requirements on Windows
elinor-fung Jun 23, 2020
188ba68
Remove mention VS 2017 in error message
elinor-fung Jun 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/coreclr/setup_vs_tools.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@ if defined VisualStudioVersion (
goto skip_setup
)

echo %__MsgPrefix%Searching ^for Visual Studio 2017 or later installation
echo %__MsgPrefix%Searching ^for Visual Studio installation
set _VSWHERE="%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
if exist %_VSWHERE% (
for /f "usebackq tokens=*" %%i in (`%_VSWHERE% -latest -prerelease -property installationPath`) do set _VSCOMNTOOLS=%%i\Common7\Tools
goto call_vs
)
echo Visual Studio 2017 or later not found

:call_vs
if not exist "%_VSCOMNTOOLS%" (
echo %__MsgPrefix%Error: Visual Studio 2017 or 2019 required.
echo %__MsgPrefix%Error: Visual Studio 2019 required.
echo Please see https://github.com/dotnet/runtime/blob/master/docs/workflow/requirements/windows-requirements.md for build instructions.
exit /b 1
)
Expand Down
6 changes: 3 additions & 3 deletions src/installer/corehost/build.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ if "%VisualStudioVersion%"=="16.0" (
)

:MissingVersion
:: Can't find VS 2017, 2019
echo Error: Visual Studio 2017 or 2019 required
echo Please see https://github.com/dotnet/runtime/tree/master/docs/installer/building/windows-instructions.md for build instructions.
:: Can't find required VS install
echo Error: Visual Studio 2019 required
echo Please see https://github.com/dotnet/runtime/blob/master/docs/workflow/requirements/windows-requirements.md for build requirements.
exit /b 1

:VS2019
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/Native/build-native.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ if "%VisualStudioVersion%"=="16.0" (
)

:MissingVersion
:: Can't find VS 2017, 2019
echo Error: Visual Studio 2017 or 2019 required
:: Can't find appropriate VS install
echo Error: Visual Studio 2019 required
echo Please see https://github.com/dotnet/runtime/tree/master/docs/workflow/building/libraries for build instructions.
exit /b 1

Expand Down