Merge pull request #986 from Erguotou/master

Add Visual Studio 2015 support
cefsharp · Apr 29, 2015 · 744edbc · 744edbc
2 parents e03c10e + 3e941de
commit 744edbc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -35,3 +35,4 @@ CefSharp.BrowserSubprocess.lib
 Win32/Release
 x64/Release
 Win32/Release
+.vs/
diff --git a/CefSharp.props b/CefSharp.props
@@ -5,10 +5,14 @@
     <VisualStudioProductVersion>2010</VisualStudioProductVersion>
     <VisualStudioProductVersion Condition="'$(VisualStudioVersion)'=='11.0'">2012</VisualStudioProductVersion>
     <VisualStudioProductVersion Condition="'$(VisualStudioVersion)'=='12.0'">2013</VisualStudioProductVersion>
+    <!-- For Visual Studio 2015, use VS 2013 binaries -->
+    <VisualStudioProductVersion Condition="'$(VisualStudioVersion)'=='14.0'">2013</VisualStudioProductVersion>
 
     <PlatformToolset>v100</PlatformToolset>
     <PlatformToolset Condition="'$(VisualStudioVersion)'=='11.0'">v110</PlatformToolset>
     <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
+    <!-- For Visual Studio 2015, use VS 2013 tool set for now -->
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v120</PlatformToolset>
   </PropertyGroup>
 
 </Project>