diff options
| author | Rob Mensching <rob@firegiant.com> | 2022-10-14 14:27:03 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2022-10-15 11:45:54 -0700 |
| commit | a3af25607b56f5ecf21d6712a8367217e5c43eb0 (patch) | |
| tree | 213634eab88ea51ab6775ea49df85a73a0f54287 /src/ext/Http/wixext/WixToolset.Http.wixext.targets | |
| parent | 08f53f409020b12dffaa2aeefa943b667a4b9328 (diff) | |
| download | wix-a3af25607b56f5ecf21d6712a8367217e5c43eb0.tar.gz wix-a3af25607b56f5ecf21d6712a8367217e5c43eb0.tar.bz2 wix-a3af25607b56f5ecf21d6712a8367217e5c43eb0.zip | |
Use "wixext4" instead of "tools" as the root folder in ".wixext.nupkg"s
Fixes 6944
Diffstat (limited to 'src/ext/Http/wixext/WixToolset.Http.wixext.targets')
| -rw-r--r-- | src/ext/Http/wixext/WixToolset.Http.wixext.targets | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/ext/Http/wixext/WixToolset.Http.wixext.targets b/src/ext/Http/wixext/WixToolset.Http.wixext.targets index 254b0010..bf6df083 100644 --- a/src/ext/Http/wixext/WixToolset.Http.wixext.targets +++ b/src/ext/Http/wixext/WixToolset.Http.wixext.targets | |||
| @@ -1,11 +1,11 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> |
| 3 | 3 | ||
| 4 | <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> | 4 | <Project> |
| 5 | <PropertyGroup> | ||
| 6 | <WixToolsetHttpWixextPath Condition=" '$(WixToolsetHttpWixextPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\WixToolset.Http.wixext.dll</WixToolsetHttpWixextPath> | ||
| 7 | </PropertyGroup> | ||
| 8 | <ItemGroup> | 5 | <ItemGroup> |
| 9 | <WixExtension Include="$(WixToolsetHttpWixextPath)" /> | 6 | <WixExtension Include="$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll" |
| 7 | Condition=" Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " /> | ||
| 8 | <UnsupportedWixExtension Include="$(MSBuildThisFileName)" | ||
| 9 | Condition=" !Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " /> | ||
| 10 | </ItemGroup> | 10 | </ItemGroup> |
| 11 | </Project> | 11 | </Project> |