Auto-generate ProductCode for ProductWithComponentGroupRef if undefined
Sean Hall committed
Apr 11, 2021 at 14:49 UTC
abfcbadf4e9c47ed813416fa4754e5a0d20958ff
2 files changed
+5
-1
src/test/WixToolsetTest.CoreIntegration/CustomTableFixture.cs
+1
@@ -205,6 +205,7 @@ namespace WixToolsetTest.CoreIntegration
205
var result = WixRunner.Execute(new[]
206
{
207
"build",
208
+ "-d", "ProductCode=83f9c623-26fe-42ab-951e-170022117f54",
209
Path.Combine(folder, "CustomTable", "CustomTable.wxs"),
210
Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
211
Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
src/test/WixToolsetTest.CoreIntegration/TestData/ProductWithComponentGroupRef/Product.wxs
+4
-1
@@ -1,5 +1,8 @@
1
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
2
- <Package Name="MsiPackage" Codepage="1252" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="12E4699F-E774-4D05-8A01-5BDD41BBA127" Compressed="no" Scope="perMachine" ProductCode="83f9c623-26fe-42ab-951e-170022117f54">
2
+ <?ifndef ProductCode?>
3
+ <?define ProductCode = *?>
4
+ <?endif?>
5
+ <Package Name="MsiPackage" Codepage="1252" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="12E4699F-E774-4D05-8A01-5BDD41BBA127" Compressed="no" Scope="perMachine" ProductCode="$(var.ProductCode)">
6
7
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
8