Skip to content

Msbuild15 patch #435

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

Merged
merged 4 commits into from
Mar 23, 2017
Merged

Msbuild15 patch #435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bb17f51
Update AUTHORS.md
christopherpow Mar 22, 2017
67dd9c6
Update CHANGELOG.md
christopherpow Mar 22, 2017
8941772
Update setup.py
christopherpow Mar 22, 2017
c7efc52
Update bld.bat
christopherpow Mar 22, 2017
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
1 change: 1 addition & 0 deletions AUTHORS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
- Bradley Friedman ([@leith-bartrich](https://github.com/leith-bartrich))
- Christian Heimes ([@tiran](https://github.com/tiran))
- Christoph Gohlke ([@cgohlke](https://github.com/cgohlke))
- Christopher Pow ([@christopherpow](https://github.com/christopherpow))
- Daniel Fernandez ([@fdanny](https://github.com/fdanny))
- Daniel Santana ([@dgsantana](https://github.com/dgsantana))
- David Lechner ([@dlech](https://github.com/dlech))
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].

### Fixed

- Fixed Visual Studio 2017 compat (#434) for setup.py
- Fixed `FooBar` bug

## [2.3.0][] - 2017-03-11
Expand Down
2 changes: 1 addition & 1 deletion conda.recipe/bld.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
:: build it

:: set path to modern MSBuild
set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH%
set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;C:\Program Files (x86)\MSBuild\15.0\Bin;%PATH%

%PYTHON% setup.py install
3 changes: 3 additions & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@
)

VS_KEYS = (
RegKey(sdk_name="MSBuild 15", key=vs_root.format("15.0"),
value_name="MSBuildToolsPath", suffix=""),

RegKey(sdk_name="MSBuild 14", key=vs_root.format("14.0"),
value_name="MSBuildToolsPath", suffix=""),

Expand Down