* RobMen: WIXBUG:4879 - support x64 folders and bind variables in SWID Tags. #293

Merged
merged 2 commits into from Sep 1, 2015

Projects

None yet

4 participants

@firegiantco

No description provided.

@barnson barnson commented on the diff Sep 1, 2015
src/ext/TagExtension/wixext/Xsd/tag.xsd
@@ -118,4 +132,28 @@
</xs:attribute>
</xs:complexType>
</xs:element>
+
@barnson
barnson Sep 1, 2015 Member

Why are these now necessary? @Win64 is a string...

@barnson barnson commented on the diff Sep 1, 2015
src/ext/TagExtension/wixext/TagBinder.cs
@@ -198,11 +198,18 @@ private List<WixFileRow> CreateProductTagFiles(Output output)
private static Version CreateFourPartVersion(string versionString)
{
- Version version = new Version(versionString);
- return new Version(version.Major,
- -1 < version.Minor ? version.Minor : 0,
- -1 < version.Build ? version.Build : 0,
- -1 < version.Revision ? version.Revision : 0);
+ try
@barnson
barnson Sep 1, 2015 Member

So a bind-time variable always results in 0.0.0.0?

@heaths
heaths Sep 1, 2015 Contributor

Worse: 0.0.-1.-1

@robmen
robmen Sep 1, 2015 Member

Turns out the tag is generated twice. First time just to get the size about right and second time to actually get the tag fully populated with access to bind variables. Thus the version may start as "0.0" and be updated to bind values. So it works out okay.

@barnson barnson merged commit be03d56 into wixtoolset:develop Sep 1, 2015
@barnson barnson deleted the firegiant:4879-x64-swidtag branch Sep 1, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment