Votive support for VS2015 #167

Merged
merged 6 commits into from Nov 14, 2014

Projects

None yet

3 participants

@barnson
Member
barnson commented Nov 14, 2014
  • Update WiX version numbers to v3.10
  • Add/register Votive for VS2015 (plus VS2013, VS2012, and VS2010).
  • Fix MSBuild targets for v3.10 installation directory.
  • Also fix setup to add missing schema files.
barnson added some commits Sep 14, 2014
@barnson barnson Merge pull request #146 from robmen/bug4513-modregex
 WIXBUG:4513 - Fix condition keyword detection in modularization regex.
3a50fe2
@barnson barnson Merge branch 'develop' of https://github.com/wixtoolset/wix3 into dev…
…elop
ff50a72
@barnson barnson Merge branch 'develop' of https://github.com/wixtoolset/wix3 into dev…
…elop
263824d
@barnson barnson Merge branch 'UnbreakTestsOnDev10' into start310 81a03e5
@barnson barnson Update WiX version numbers to v3.10 fb0d556
@barnson barnson Votive support for VS2015
- Add/register Votive for VS2015 (plus VS2013, VS2012, and VS2010).
- Fix MSBuild targets for v3.10 installation directory.
- Also fix setup to add missing schema files.
982560b
@robmen robmen merged commit 982560b into wixtoolset:develop Nov 14, 2014
@ilmax ilmax commented on the diff Nov 14, 2014
src/Setup/VotiveMsi/VotiveMsi.wxs
@@ -54,6 +54,17 @@
<ComponentGroupRef Id="Votive2013Components" />
<ComponentGroupRef Id="FileAssociationComponents" />
</Feature>
+
+ <Feature Id="Intellisense2015" Title="IntelliSense 2015" Description="Schema files for IntelliSense in the Visual Studio 2015 editor" AllowAdvertise="no" Display="expand" InstallDefault="local" Level="0" TypicalDefault="install">
+ <Condition Level="1">VS14DEVENV OR VS14_ROOT_FOLDER OR REMOVE</Condition>
+ <ComponentGroupRef Id="Votive2015SchemaComponents" />
+ </Feature>
+
+ <Feature Id="Votive2015" Title="Project Templates 2015" Description="Votive Package for Visual Studio 2013" AllowAdvertise="no" Display="expand" InstallDefault="local" Level="0" TypicalDefault="install">
@ilmax
ilmax Nov 14, 2014

Shouldn't "Votive Package for Visual Studio 2013" be "Votive Package for Visual Studio 2015" here?

@barnson
barnson Nov 14, 2014 Member

Fixed. Thanks!

@barnson barnson deleted the barnson:start310 branch May 8, 2015
@wixbot wixbot referenced this pull request in wixtoolset/issues Dec 20, 2015
Closed

Add support for Visual Studio 2015 #4593

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment