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

Always set WixBundleOriginalSourceFolder if not already set #257

Merged
merged 1 commit into from Jun 7, 2015

Conversation

Projects
None yet
2 participants
@heaths
Contributor

heaths commented May 26, 2015

No description provided.

@barnson

This comment has been minimized.

Show comment
Hide comment
@barnson

barnson May 26, 2015

Member

Also needs to set it if /originalsource is passed on the command line.

Member

barnson commented May 26, 2015

Also needs to set it if /originalsource is passed on the command line.

@heaths

This comment has been minimized.

Show comment
Hide comment
@heaths

heaths May 26, 2015

Contributor

Seems it would. The two are nearly independent - just that WixBundleOriginalSourceFolder uses the parent of WixBundleOriginalSource if it was set. If WixBundleOriginalSourceFolder is set from the command line, it would override that behavior. This is the same fix we had internally, except that didn't take into account you might only set WixBundleOriginalSourceFolder (since our BA was setting both but setting WixBundleOriginalSourceFolder was ignored without this fix).

Contributor

heaths commented May 26, 2015

Seems it would. The two are nearly independent - just that WixBundleOriginalSourceFolder uses the parent of WixBundleOriginalSource if it was set. If WixBundleOriginalSourceFolder is set from the command line, it would override that behavior. This is the same fix we had internally, except that didn't take into account you might only set WixBundleOriginalSourceFolder (since our BA was setting both but setting WixBundleOriginalSourceFolder was ignored without this fix).

@barnson

This comment has been minimized.

Show comment
Hide comment
@barnson

barnson May 31, 2015

Member

I don't understand why they'd be independent. WixBundleOriginalSourceFolder should be WixBundleOriginalSource without the file name. If the engine lets you set WixBundleOriginalSource, it should then set WixBundleOriginalSourceFolder appropriately. Why wouldn't that be the right behavior?

Member

barnson commented May 31, 2015

I don't understand why they'd be independent. WixBundleOriginalSourceFolder should be WixBundleOriginalSource without the file name. If the engine lets you set WixBundleOriginalSource, it should then set WixBundleOriginalSourceFolder appropriately. Why wouldn't that be the right behavior?

@heaths

This comment has been minimized.

Show comment
Hide comment
@heaths

heaths Jun 1, 2015

Contributor

That behavior works. By default WixBundleOriginalSourceFolder is the parent folder of WixBundleOriginalSource unless explicitly set already.

A BA may not set WixBundleOriginalSource because, perhaps, the bundle has a different name (like all the different VS editions that share the vast majority of package content). So the BA may only set the WixBundleOriginalSourceFolder.

Contributor

heaths commented Jun 1, 2015

That behavior works. By default WixBundleOriginalSourceFolder is the parent folder of WixBundleOriginalSource unless explicitly set already.

A BA may not set WixBundleOriginalSource because, perhaps, the bundle has a different name (like all the different VS editions that share the vast majority of package content). So the BA may only set the WixBundleOriginalSourceFolder.

barnson added a commit that referenced this pull request Jun 7, 2015

Merge pull request #257 from heaths/issue4775
Always set WixBundleOriginalSourceFolder if not already set

@barnson barnson merged commit ec0d0e6 into wixtoolset:develop Jun 7, 2015

@heaths heaths deleted the heaths:issue4775 branch Jun 7, 2015

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