diff options
| author | Rob Mensching <rob@firegiant.com> | 2022-02-23 13:28:40 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2022-02-23 18:33:52 -0800 |
| commit | c2b365428686b326bbd0f594e9da1d43fa3420d3 (patch) | |
| tree | b4bf5c6c8b3d22cd2bcd54afe00f7f50d94b512c | |
| parent | 4fedc39af8de23f7393a2fe6c80ecd8944ca5d72 (diff) | |
| download | wix-c2b365428686b326bbd0f594e9da1d43fa3420d3.tar.gz wix-c2b365428686b326bbd0f594e9da1d43fa3420d3.tar.bz2 wix-c2b365428686b326bbd0f594e9da1d43fa3420d3.zip | |
Remove redundant assignment of WixTargetsPath in .targets
The WixTargetsPath is correctly assigned in the WixToolset.Sdk.props
file. Doing so again in the WixToolset.Sdk.targets file is redundant.
| -rw-r--r-- | src/wix/WixToolset.Sdk/build/WixToolset.Sdk.targets | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/wix/WixToolset.Sdk/build/WixToolset.Sdk.targets b/src/wix/WixToolset.Sdk/build/WixToolset.Sdk.targets index ca722959..3940d6d5 100644 --- a/src/wix/WixToolset.Sdk/build/WixToolset.Sdk.targets +++ b/src/wix/WixToolset.Sdk/build/WixToolset.Sdk.targets | |||
| @@ -2,9 +2,5 @@ | |||
| 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"> | 4 | <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 5 | <PropertyGroup> | ||
| 6 | <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$([MSBuild]::NormalizePath($(MSBuildThisFileDirectory), '..\tools\wix.targets'))</WixTargetsPath> | ||
| 7 | </PropertyGroup> | ||
| 8 | |||
| 9 | <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' and Exists('$(WixTargetsPath)')" /> | 5 | <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' and Exists('$(WixTargetsPath)')" /> |
| 10 | </Project> | 6 | </Project> |