Skip to content

Commit a94e155

Browse files
christopherpowvmuriart
authored andcommitted
Msbuild15 patch (pythonnet#435)
* Update AUTHORS.md * Update CHANGELOG.md * Update setup.py * Update bld.bat
1 parent 4df6105 commit a94e155

File tree

4 files changed

+6
-1
lines changed

4 files changed

+6
-1
lines changed

AUTHORS.md

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
- Bradley Friedman ([@leith-bartrich](https://github.com/leith-bartrich))
1717
- Christian Heimes ([@tiran](https://github.com/tiran))
1818
- Christoph Gohlke ([@cgohlke](https://github.com/cgohlke))
19+
- Christopher Pow ([@christopherpow](https://github.com/christopherpow))
1920
- Daniel Fernandez ([@fdanny](https://github.com/fdanny))
2021
- Daniel Santana ([@dgsantana](https://github.com/dgsantana))
2122
- David Lechner ([@dlech](https://github.com/dlech))

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
1717

1818
### Fixed
1919

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

2223
## [2.3.0][] - 2017-03-11

conda.recipe/bld.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
:: build it
22

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

66
%PYTHON% setup.py install

setup.py

+3
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@
6565
)
6666

6767
VS_KEYS = (
68+
RegKey(sdk_name="MSBuild 15", key=vs_root.format("15.0"),
69+
value_name="MSBuildToolsPath", suffix=""),
70+
6871
RegKey(sdk_name="MSBuild 14", key=vs_root.format("14.0"),
6972
value_name="MSBuildToolsPath", suffix=""),
7073

0 commit comments

Comments
 (0)