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

WIXFEAT:4161 - Allow more than one MBA prereq #30

Merged
merged 2 commits into from May 22, 2014

Conversation

Projects
None yet
2 participants
@rseanhall
Member

rseanhall commented May 11, 2014

Add the MBAPrereqSupportPackage attribute to all package types so that more than one package can be installed by the Prereq BA.

rseanhall added some commits May 11, 2014

Add the MBAPrereqSupportPackage attribute to all package types so tha…
…t more than one package can be installed by the Prereq BA.
Rename the MBAPrereqSupportPackage attribute to PrereqSupportPackage,…
… the WixMBAPrereqSupportPackage table to MbaPrerequisiteSupportPackage, and respect the InstallCondition on the MbaPrereqPackage if the new attribute is set.
@rseanhall

This comment has been minimized.

Show comment
Hide comment
@rseanhall

rseanhall May 21, 2014

Member

Allowing the MbaPrereqPackage to be conditionally installed made the infinite loop detection more complicated.

Member

rseanhall commented May 21, 2014

Allowing the MbaPrereqPackage to be conditionally installed made the infinite loop detection more complicated.

}
else
{
m_fPrereqInstalled = FALSE;

This comment has been minimized.

@robmen

robmen May 22, 2014

Member

Technically speaking, we could break; here, right?

@robmen

robmen May 22, 2014

Member

Technically speaking, we could break; here, right?

@@ -2771,6 +2962,10 @@ class CWixStandardBootstrapperApplication : public CBalBaseBootstrapperApplicati
STRINGDICT_HANDLE m_sdOverridableVariables;
WIXSTDBA_PREREQ_PACKAGE* m_rgPrereqPackages;
UINT m_cPrereqPackages;

This comment has been minimized.

@robmen

robmen May 22, 2014

Member

Why UINT? Typically see DWORD in WiX native code...

@robmen

robmen May 22, 2014

Member

Why UINT? Typically see DWORD in WiX native code...

string packageId;
if (!contextValues.TryGetValue("PackageId", out packageId) || String.IsNullOrEmpty(packageId))
{
this.Core.OnMessage(WixErrors.ExpectedAttribute(sourceLineNumbers, parentElement.LocalName, "Id"));

This comment has been minimized.

@robmen

robmen May 22, 2014

Member

I would add attribute.LocalName to the end of the WixErrors.ExpectedAttribute call. That will give a message like:

            The {0}/@{1} attribute was not found; it is required when attribute {2} is specified.
@robmen

robmen May 22, 2014

Member

I would add attribute.LocalName to the end of the WixErrors.ExpectedAttribute call. That will give a message like:

            The {0}/@{1} attribute was not found; it is required when attribute {2} is specified.

@robmen robmen merged commit fd7cec6 into wixtoolset:develop May 22, 2014

robmen added a commit that referenced this pull request May 22, 2014

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