Correctly set Compressed, Description, DisplayName in BootstrapperApplicationData
Fixes wixtoolset/issues#6371 Fixes wixtoolset/issues#6372
Rob Mensching committed
Mar 23, 2021 at 02:44 UTC
8a3ce82d689e16424620e3b52161f19771d19d1d
4 files changed
+15
-11
src/WixToolset.Core.Burn/Bundles/CreateBootstrapperApplicationManifestCommand.cs
+1
-1
@@ -129,7 +129,7 @@ namespace WixToolset.Core.Burn.Bundles
129
writer.WriteAttributeString("Permanent", package.PackageSymbol.Permanent ? "yes" : "no");
130
writer.WriteAttributeString("LogPathVariable", package.PackageSymbol.LogPathVariable);
131
writer.WriteAttributeString("RollbackLogPathVariable", package.PackageSymbol.RollbackLogPathVariable);
132
- writer.WriteAttributeString("Compressed", packagePayload.Compressed == true ? "yes" : "no");
132
+ writer.WriteAttributeString("Compressed", packagePayload.Packaging == PackagingType.Embedded ? "yes" : "no");
133
134
if (package.SpecificPackageSymbol is WixBundleMsiPackageSymbol msiPackage)
135
{
src/WixToolset.Core/Compiler_Bundle.cs
+6
-2
@@ -1961,6 +1961,8 @@ namespace WixToolset.Core
1961
string installCondition = null;
1962
var cache = YesNoAlwaysType.Yes; // the default is to cache everything in tradeoff for stability over disk space.
1963
string cacheId = null;
1964
+ string description = null;
1965
+ string displayName = null;
1966
var logPathVariable = (packageType == WixBundlePackageType.Msu) ? String.Empty : null;
1967
var rollbackPathVariable = (packageType == WixBundlePackageType.Msu) ? String.Empty : null;
1968
var permanent = YesNoType.NotSet;
@@ -2038,10 +2040,10 @@ namespace WixToolset.Core
2040
cacheId = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
2041
break;
2042
case "Description":
2041
- compilerPayload.ParseDescription(attrib);
2043
+ description = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
2044
break;
2045
case "DisplayName":
2044
- compilerPayload.ParseDisplayName(attrib);
2046
+ displayName = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
2047
break;
2048
case "EnableFeatureSelection":
2049
enableFeatureSelection = this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib);
@@ -2302,6 +2304,8 @@ namespace WixToolset.Core
2304
Attributes = attributes,
2305
InstallCondition = installCondition,
2306
CacheId = cacheId,
2307
+ Description = description,
2308
+ DisplayName = displayName,
2309
LogPathVariable = logPathVariable,
2310
RollbackLogPathVariable = rollbackPathVariable,
2311
});
src/test/WixToolsetTest.CoreIntegration/BundleManifestFixture.cs
+4
-4
@@ -51,7 +51,7 @@ namespace WixToolsetTest.CoreIntegration
51
}
52
}
53
54
- [Fact(Skip = "https://github.com/wixtoolset/issues/issues/6372")]
54
+ [Fact]
55
public void PopulatesBAManifestWithPackageInformation()
56
{
57
var folder = TestData.Get(@"TestData");
@@ -278,7 +278,7 @@ namespace WixToolsetTest.CoreIntegration
278
}
279
}
280
281
- [Fact(Skip = "https://github.com/wixtoolset/issues/issues/6370")]
281
+ [Fact]
282
public void PopulatesManifestWithExePackages()
283
{
284
var folder = TestData.Get(@"TestData");
@@ -315,8 +315,8 @@ namespace WixToolsetTest.CoreIntegration
315
{ "ExePackage", new List<string> { "CacheId", "InstallSize", "Size" } },
316
};
317
Assert.Equal(2, exePackageElements.Count);
318
- Assert.Equal("<ExePackage Id='credwiz.exe' Cache='yes' CacheId='*' InstallSize='*' Size='*' PerMachine='yes' Permanent='yes' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' LogPathVariable='WixBundleLog_credwiz.exe' RollbackLogPathVariable='WixBundleRollbackLog_credwiz.exe' DetectCondition='' InstallArguments='' UninstallArguments='' RepairArguments='' Repairable='no'><PayloadRef Id='credwiz.exe' /><PayloadRef Id='payue_e5DuhsDGlzJxWYPhqr6S7rkc' /></ExePackage>", exePackageElements[0].GetTestXml(ignoreAttributesByElementName));
319
- Assert.Equal("<ExePackage Id='cscript.exe' Cache='yes' CacheId='*' InstallSize='*' Size='*' PerMachine='yes' Permanent='yes' Vital='yes' RollbackBoundaryBackward='WixDefaultBoundary' LogPathVariable='WixBundleLog_cscript.exe' RollbackLogPathVariable='WixBundleRollbackLog_cscript.exe' DetectCondition='' InstallArguments='' UninstallArguments='' RepairArguments='' Repairable='no'><PayloadRef Id='cscript.exe' /><PayloadRef Id='payue_e5DuhsDGlzJxWYPhqr6S7rkc' /></ExePackage>", exePackageElements[1].GetTestXml(ignoreAttributesByElementName));
318
+ Assert.Equal("<ExePackage Id='credwiz.exe' Cache='yes' CacheId='*' InstallSize='*' Size='*' PerMachine='yes' Permanent='yes' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' LogPathVariable='WixBundleLog_credwiz.exe' RollbackLogPathVariable='WixBundleRollbackLog_credwiz.exe' DetectCondition='' InstallArguments='' UninstallArguments='' RepairArguments='' Repairable='no'><PayloadRef Id='credwiz.exe' /><PayloadRef Id='SourceFilePayload' /></ExePackage>", exePackageElements[0].GetTestXml(ignoreAttributesByElementName));
319
+ Assert.Equal("<ExePackage Id='cscript.exe' Cache='yes' CacheId='*' InstallSize='*' Size='*' PerMachine='yes' Permanent='yes' Vital='yes' RollbackBoundaryBackward='WixDefaultBoundary' LogPathVariable='WixBundleLog_cscript.exe' RollbackLogPathVariable='WixBundleRollbackLog_cscript.exe' DetectCondition='' InstallArguments='' UninstallArguments='' RepairArguments='' Repairable='no'><PayloadRef Id='cscript.exe' /><PayloadRef Id='SourceFilePayload' /></ExePackage>", exePackageElements[1].GetTestXml(ignoreAttributesByElementName));
320
}
321
}
322
src/test/WixToolsetTest.CoreIntegration/TestData/CustomPackageDescription/CustomPackageDescription.wxs
+4
-4
@@ -2,11 +2,11 @@
2
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
3
<Fragment>
4
<PackageGroup Id="BundlePackages">
5
- <ExePackage SourceFile="burn.exe" Permanent="yes" />
6
- <ExePackage Id="RemotePayloadExe" Name="fake.exe" Compressed="no" DownloadUrl="example.com" Description="Override RemotePayload description" DisplayName="Override RemotePayload display name" Permanent="yes">
7
- <RemotePayload Description="RemotePayload description" Hash="a" ProductName="RemotePayload product name" Size="1" Version="1.0.0.0" />
5
+ <ExePackage DetectCondition="ForTestPurposesOnly" SourceFile="burn.exe" Permanent="yes" />
6
+ <ExePackage Id="RemotePayloadExe" DetectCondition="ForTestPurposesOnly" Description="Override RemotePayload description" DisplayName="Override RemotePayload display name" Permanent="yes">
7
+ <ExePackagePayload Description="RemotePayload description" Hash="a" ProductName="RemotePayload product name" Size="1" Version="1.0.0.0" Name="fake.exe" DownloadUrl="example.com" />
8
</ExePackage>
9
- <ExePackage SourceFile="C:\Windows\system32\calc.exe" Permanent="yes" Description="Override harvested description" DisplayName="Override harvested display name" />
9
+ <ExePackage DetectCondition="ForTestPurposesOnly" SourceFile="C:\Windows\system32\calc.exe" Permanent="yes" Description="Override harvested description" DisplayName="Override harvested display name" />
10
</PackageGroup>
11
</Fragment>
12
</Wix>