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

WIXBUG:4474 #115

Merged
merged 3 commits into from
Jul 20, 2014
Merged

WIXBUG:4474 #115

merged 3 commits into from
Jul 20, 2014

Conversation

barnson
Copy link
Member

@barnson barnson commented Jul 17, 2014

Add missing headers; relocate headers to sdk\inc; add missing file and
correct typo to point to deputil directory.

Add missing headers; relocate headers to sdk\inc; add missing file and
correct typo to point to deputil directory.
@@ -29,8 +29,8 @@

<Fragment>
<DirectoryRef Id="SdkFolder">
<Directory Id="SdkIncFolder" Name="inc" />
Copy link
Member

Choose a reason for hiding this comment

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

This will cause the MSIs to share the headers, true? Okay with that?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah, I played around with it a bit. (Even installed Dev11 to get at least two SKUs!) Obviously, generated GUIDs work like a charm. They're sharing well.

Copy link
Member

Choose a reason for hiding this comment

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

Yeah, wasn't worried about that part. More than we are doing this now. Anyway, I'll wait on thread on wix-devs. If all looks good, this will go for the RC2.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yep, hence my mail. :)

<Directory Id="VisualStudioTargetSdkFolder" Name ="VS$(var.VisualStudioTargetVersion)">
<Directory Id="SdkIncFolder" Name="inc" />
<Directory Id="VisualStudioTargetSdkFolder" Name="VS$(var.VisualStudioTargetVersion)">
<Directory Id="SdkIncFolder" Name="inc" />
Copy link
Member

Choose a reason for hiding this comment

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

I don't follow what's happening here. Is this just a spacing change? If so, it doesn't quite look right...

Copy link
Member Author

Choose a reason for hiding this comment

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

Sorry, didn't indent when I undid the folder move.

@rseanhall
Copy link
Contributor

Looks good.

@robmen robmen merged commit 9b6d3fc into wixtoolset:develop Jul 20, 2014
robmen added a commit that referenced this pull request Jul 20, 2014
@barnson barnson deleted the bug4474 branch May 8, 2015 04:13
@barnson barnson restored the bug4474 branch February 12, 2017 21:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants