ProjectReferences to wixlibs should participate in DefineConstants creation
Also fix documentation in ResolveWixLibraryReferences target. Fixes 7512
Rob Mensching committed
Jun 2, 2023 at 11:45 UTC
783b829e1178809ff5c520adca7f6169a0935dd1
2 files changed
+6
-3
src/test/wix/TestData/WixprojPackageVcxprojWindowsApp/Package.wxs
+4
@@ -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
+
5
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
6
xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
7
<Package Name='!(loc.PackageName)' Manufacturer='WiX Toolset' Version='0.0.1' UpgradeCode='41a2c17e-1976-465b-bcde-eae03516ca68'>
src/wix/WixToolset.Sdk/tools/wix.targets
+2
-3
@@ -331,7 +331,6 @@
331
332
<ItemGroup>
333
<WixLibrary Include="@(_WixResolvedProjectReference)" Condition=" '%(Extension)' == '.wixlib' " />
334
- <_WixResolvedProjectReference Remove="@(WixLibrary)" />
334
</ItemGroup>
335
336
<!-- Convert resolved project references into compiler defines and named and unamed bind paths -->
@@ -366,11 +365,11 @@
365
366
[IN]
367
@(WixLibrary) - the list of .wixlib files.
369
- @(_WixResolvedProjectReference) - resolved project references.
368
$(WixLibrarySearchPaths) - optional search paths used to find .wixlibs.
369
370
[OUT]
373
- @(_ResolvedWixLibraryPaths) - Item group with full paths to libraries
371
+ @(_ResolvedWixLibraryPaths) - Item group with full paths to libraries that were found.
372
+ @(_UnresolvedWixLibraryPaths) - Item group with full paths to libraries that were not found.
373
================================================================================================
374
-->
375
<PropertyGroup>