diff options
| author | Rob Mensching <rob@firegiant.com> | 2023-06-02 11:45:10 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2023-06-03 01:24:39 -0700 |
| commit | e25aa4354c58d49665517956c0a30b0eaeae7342 (patch) | |
| tree | 51f0d83990544d7799203eb27975509edb81376b /src/test | |
| parent | 29cec14e4197080bdac5d6c1b66f4aaf9b53e91c (diff) | |
| download | wix-e25aa4354c58d49665517956c0a30b0eaeae7342.tar.gz wix-e25aa4354c58d49665517956c0a30b0eaeae7342.tar.bz2 wix-e25aa4354c58d49665517956c0a30b0eaeae7342.zip | |
ProjectReferences to wixlibs should participate in DefineConstants creation
Also fix documentation in ResolveWixLibraryReferences target.
Fixes 7512
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/wix/TestData/WixprojPackageVcxprojWindowsApp/Package.wxs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/test/wix/TestData/WixprojPackageVcxprojWindowsApp/Package.wxs b/src/test/wix/TestData/WixprojPackageVcxprojWindowsApp/Package.wxs index 508d4721..75b22b86 100644 --- a/src/test/wix/TestData/WixprojPackageVcxprojWindowsApp/Package.wxs +++ b/src/test/wix/TestData/WixprojPackageVcxprojWindowsApp/Package.wxs | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | <?ifndef WixprojLibraryVcxprojDll.ProjectDir ?> | ||
| 2 | <?error This error should not be hit when wixlib ProjectReferences correctly create their DefineConstants. ?> | ||
| 3 | <?endif?> | ||
| 4 | |||
| 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" | 5 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" |
| 2 | xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui"> | 6 | xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui"> |
| 3 | <Package Name='!(loc.PackageName)' Manufacturer='WiX Toolset' Version='0.0.1' UpgradeCode='41a2c17e-1976-465b-bcde-eae03516ca68'> | 7 | <Package Name='!(loc.PackageName)' Manufacturer='WiX Toolset' Version='0.0.1' UpgradeCode='41a2c17e-1976-465b-bcde-eae03516ca68'> |