diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2021-04-11 14:49:33 -0500 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2021-04-11 14:53:06 -0500 |
| commit | abfcbadf4e9c47ed813416fa4754e5a0d20958ff (patch) | |
| tree | 889ef87246ffd998d0e166b06b26558f4e403d47 /src/test | |
| parent | 999621b156ae6be4c06205e3e992b2a76dce7926 (diff) | |
| download | wix-abfcbadf4e9c47ed813416fa4754e5a0d20958ff.tar.gz wix-abfcbadf4e9c47ed813416fa4754e5a0d20958ff.tar.bz2 wix-abfcbadf4e9c47ed813416fa4754e5a0d20958ff.zip | |
Auto-generate ProductCode for ProductWithComponentGroupRef if undefined
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/WixToolsetTest.CoreIntegration/CustomTableFixture.cs | 1 | ||||
| -rw-r--r-- | src/test/WixToolsetTest.CoreIntegration/TestData/ProductWithComponentGroupRef/Product.wxs | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/CustomTableFixture.cs b/src/test/WixToolsetTest.CoreIntegration/CustomTableFixture.cs index f9cd2c70..ee93b03a 100644 --- a/src/test/WixToolsetTest.CoreIntegration/CustomTableFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/CustomTableFixture.cs | |||
| @@ -205,6 +205,7 @@ namespace WixToolsetTest.CoreIntegration | |||
| 205 | var result = WixRunner.Execute(new[] | 205 | var result = WixRunner.Execute(new[] |
| 206 | { | 206 | { |
| 207 | "build", | 207 | "build", |
| 208 | "-d", "ProductCode=83f9c623-26fe-42ab-951e-170022117f54", | ||
| 208 | Path.Combine(folder, "CustomTable", "CustomTable.wxs"), | 209 | Path.Combine(folder, "CustomTable", "CustomTable.wxs"), |
| 209 | Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"), | 210 | Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"), |
| 210 | Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"), | 211 | Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"), |
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ProductWithComponentGroupRef/Product.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ProductWithComponentGroupRef/Product.wxs index b71627a2..433be7f0 100644 --- a/src/test/WixToolsetTest.CoreIntegration/TestData/ProductWithComponentGroupRef/Product.wxs +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/ProductWithComponentGroupRef/Product.wxs | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 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)"> | ||
| 3 | 6 | ||
| 4 | <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> | 7 | <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> |
| 5 | 8 | ||