Bug 4532 - InstallPrivileges and InstallScope can specify contradicting values #265

Merged
merged 2 commits into from Jun 10, 2015

Projects

None yet

3 participants

@BMurri
Contributor
BMurri commented Jun 9, 2015

This is the wix3 version of the fix for this bug. I felt that I couldn't simply return an error when both attributes are supplied, but since the error is opened in 3.x, I felt that I can still return an error.

This code will continue to accept both attributes being present as long as the respective values are compatible. If they are not, an error that recommends keeping only the InstallScope attribute.

The wix4 version of the fix is here.

@rseanhall rseanhall commented on the diff Jun 9, 2015
History.md
@@ -1,3 +1,5 @@
+* BMurri: WIXBUG:4532 - Make it an error for InstallPrivileges and InstallScope to specify contradictory values.
@rseanhall
rseanhall Jun 9, 2015 Member

MikeGC had a great idea of creating a file for each history entry instead of manually updating History.md to avoid merge conflicts. See https://github.com/wixtoolset/wix3/tree/develop/history for details.

@BMurri
BMurri Jun 9, 2015 Contributor

That's a great idea. I'll update my pull requests to align with this within 24 hours or so.

@barnson barnson merged commit 953804b into wixtoolset:develop Jun 10, 2015
@BMurri BMurri deleted the BMurri:issue4532 branch Jun 24, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment