Always set WixBundleOriginalSourceFolder if not already set #257

Merged
merged 1 commit into from Jun 7, 2015

Projects

None yet

2 participants

@heaths
Contributor
heaths commented May 26, 2015

No description provided.

@barnson
Member
barnson commented May 26, 2015

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

@heaths
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
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
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 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