Skip to content
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.

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

Votive support for VS2015 #167

Merged
merged 6 commits into from Nov 14, 2014
Merged

Votive support for VS2015 #167

merged 6 commits into from Nov 14, 2014

Conversation

barnson
Copy link
Member

@barnson 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 and others added 6 commits September 14, 2014 14:52
 WIXBUG:4513 - Fix condition keyword detection in modularization regex.
- 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.
@robmen robmen merged commit 982560b into wixtoolset:develop Nov 14, 2014
robmen added a commit that referenced this pull request Nov 14, 2014
<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">
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed. Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants