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.

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

do not export the MSBuild env-var to the outer shell #2754

Merged
merged 2 commits into from
Sep 17, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ if errorlevel 1 (
exit /b %errorlevel%
)

setlocal

set MSBuild=packages\build\RoslynTools.MSBuild\tools\msbuild

packages\build\FAKE\tools\FAKE.exe build.fsx %*

endlocal
3 changes: 1 addition & 2 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ then
if [ $exit_code -ne 0 ]; then
exit $exit_code
fi
export MSBuild=packages/build/RoslynTools.MSBuild/tools/msbuild/MSBuild.exe
packages/build/FAKE/tools/FAKE.exe $@ --fsiargs -d:MONO build.fsx
MSBuild=packages/build/RoslynTools.MSBuild/tools/msbuild/MSBuild.exe packages/build/FAKE/tools/FAKE.exe $@ --fsiargs -d:MONO build.fsx
else
mono .paket/paket.exe restore
exit_code=$?
Expand Down