Repository: reef
Updated Branches:
refs/heads/master fd2a746ee -> 729128ef9
[REEF-1676] Make REEF compile in VS 2017 RC
This change:
* adds `.vs` to the `.gitignore` list as VS 2017 stores its per-use settings
in that folder.
* adds a new condition for Visual Studio 2017 tools to the Bridge C++ project
file.
JIRA:
[REEF-1676](https://issues.apache.org/jira/browse/REEF-1676)
Pull Request:
This closes #1190
Project: http://git-wip-us.apache.org/repos/asf/reef/repo
Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/729128ef
Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/729128ef
Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/729128ef
Branch: refs/heads/master
Commit: 729128ef9e8753b3aa795873a5e91347699067f8
Parents: fd2a746
Author: Markus Weimer <[email protected]>
Authored: Wed Nov 23 09:07:56 2016 -0800
Committer: Mariia Mykhailova <[email protected]>
Committed: Wed Nov 23 12:10:58 2016 -0800
----------------------------------------------------------------------
.gitignore | 1 +
lang/cs/Org.Apache.REEF.Bridge/Org.Apache.REEF.Bridge.vcxproj | 4 ++++
2 files changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/reef/blob/729128ef/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 6813f72..1db0fc0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,7 @@ atlassian-ide-plugin.xml
*.VC.opendb
*.VC.db
*.vcxproj.user
+.vs
#
# ----------------------------------------------------------------------
# OS Files
http://git-wip-us.apache.org/repos/asf/reef/blob/729128ef/lang/cs/Org.Apache.REEF.Bridge/Org.Apache.REEF.Bridge.vcxproj
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Bridge/Org.Apache.REEF.Bridge.vcxproj
b/lang/cs/Org.Apache.REEF.Bridge/Org.Apache.REEF.Bridge.vcxproj
index a688c44..43e0776 100644
--- a/lang/cs/Org.Apache.REEF.Bridge/Org.Apache.REEF.Bridge.vcxproj
+++ b/lang/cs/Org.Apache.REEF.Bridge/Org.Apache.REEF.Bridge.vcxproj
@@ -58,6 +58,10 @@ under the License.
<PropertyGroup Condition="'$(VisualStudioVersion)' == '14.0'">
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
+ <!-- Visual Studio 2017 (15.0) -->
+ <PropertyGroup Condition="'$(VisualStudioVersion)' == '15.0'">
+ <PlatformToolset>v141</PlatformToolset>
+ </PropertyGroup>
<!--
End of: Switch the PlatformToolset based on the Visual Studio Version
-->
