diff options
Diffstat (limited to '')
| -rw-r--r-- | src/test/wix/TestData/WixprojPackageVcxprojWindowsApp/Package.wxs | 4 | ||||
| -rw-r--r-- | src/wix/WixToolset.Sdk/tools/wix.targets | 5 |
2 files changed, 6 insertions, 3 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'> |
diff --git a/src/wix/WixToolset.Sdk/tools/wix.targets b/src/wix/WixToolset.Sdk/tools/wix.targets index 0decbbeb..1ba6746b 100644 --- a/src/wix/WixToolset.Sdk/tools/wix.targets +++ b/src/wix/WixToolset.Sdk/tools/wix.targets | |||
| @@ -331,7 +331,6 @@ | |||
| 331 | 331 | ||
| 332 | <ItemGroup> | 332 | <ItemGroup> |
| 333 | <WixLibrary Include="@(_WixResolvedProjectReference)" Condition=" '%(Extension)' == '.wixlib' " /> | 333 | <WixLibrary Include="@(_WixResolvedProjectReference)" Condition=" '%(Extension)' == '.wixlib' " /> |
| 334 | <_WixResolvedProjectReference Remove="@(WixLibrary)" /> | ||
| 335 | </ItemGroup> | 334 | </ItemGroup> |
| 336 | 335 | ||
| 337 | <!-- Convert resolved project references into compiler defines and named and unamed bind paths --> | 336 | <!-- Convert resolved project references into compiler defines and named and unamed bind paths --> |
| @@ -366,11 +365,11 @@ | |||
| 366 | 365 | ||
| 367 | [IN] | 366 | [IN] |
| 368 | @(WixLibrary) - the list of .wixlib files. | 367 | @(WixLibrary) - the list of .wixlib files. |
| 369 | @(_WixResolvedProjectReference) - resolved project references. | ||
| 370 | $(WixLibrarySearchPaths) - optional search paths used to find .wixlibs. | 368 | $(WixLibrarySearchPaths) - optional search paths used to find .wixlibs. |
| 371 | 369 | ||
| 372 | [OUT] | 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. | ||
| 374 | ================================================================================================ | 373 | ================================================================================================ |
| 375 | --> | 374 | --> |
| 376 | <PropertyGroup> | 375 | <PropertyGroup> |
