diff options
| author | Rob Mensching <rob@firegiant.com> | 2018-01-01 23:02:24 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2018-01-01 23:02:24 -0800 |
| commit | 12872c0066bad5740f5bbc7165b84a8bff1b002a (patch) | |
| tree | bd93d502ca226a20f8fc2bf3d9b1d8c6fbb43fba /src | |
| parent | a5b99dfd10f8c429af08c7b33de97ffbbf8502c9 (diff) | |
| download | wix-12872c0066bad5740f5bbc7165b84a8bff1b002a.tar.gz wix-12872c0066bad5740f5bbc7165b84a8bff1b002a.tar.bz2 wix-12872c0066bad5740f5bbc7165b84a8bff1b002a.zip | |
Fix path to WixExtension in .targets file
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/WixToolsetTest.Util/UtilExtensionFixture.cs | 2 | ||||
| -rw-r--r-- | src/wixext/WixToolset.Util.wixext.targets | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs index 41c872d4..3f112dc8 100644 --- a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs +++ b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | // 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. | 1 | // 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 | 2 | ||
| 3 | namespace WixToolsetTest.VisualStudio | 3 | namespace WixToolsetTest.Util |
| 4 | { | 4 | { |
| 5 | using System.Linq; | 5 | using System.Linq; |
| 6 | using WixBuildTools.TestSupport; | 6 | using WixBuildTools.TestSupport; |
diff --git a/src/wixext/WixToolset.Util.wixext.targets b/src/wixext/WixToolset.Util.wixext.targets index e298b06e..64dff429 100644 --- a/src/wixext/WixToolset.Util.wixext.targets +++ b/src/wixext/WixToolset.Util.wixext.targets | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | 3 | ||
| 4 | <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> | 4 | <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> |
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <WixToolsetUtilWixextPath Condition=" '$(WixToolsetUtilWixextPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\WixToolset.Util.wixext.dll"</WixToolsetUtilWixextPath> | 6 | <WixToolsetUtilWixextPath Condition=" '$(WixToolsetUtilWixextPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\WixToolset.Util.wixext.dll</WixToolsetUtilWixextPath> |
| 7 | </PropertyGroup> | 7 | </PropertyGroup> |
| 8 | <ItemGroup> | 8 | <ItemGroup> |
| 9 | <WixExtension Include="$(WixToolsetUtilWixextPath)" /> | 9 | <WixExtension Include="$(WixToolsetUtilWixextPath)" /> |