diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-05-28 23:00:05 +1000 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-05-28 23:10:12 +1000 |
| commit | ef0dbdc18c4335fef395fb954845031ea90503be (patch) | |
| tree | 1d9bec91f1fbef5b24cdfdb45a05ef2ee5e6caee /src/WixToolset.MSBuild/WixToolset.MSBuild.props | |
| parent | 551f2a43de0465202e3a3aca24379481cc35733e (diff) | |
| download | wix-ef0dbdc18c4335fef395fb954845031ea90503be.tar.gz wix-ef0dbdc18c4335fef395fb954845031ea90503be.tar.bz2 wix-ef0dbdc18c4335fef395fb954845031ea90503be.zip | |
Move the targets files into the top-level tools folder.
Diffstat (limited to 'src/WixToolset.MSBuild/WixToolset.MSBuild.props')
| -rw-r--r-- | src/WixToolset.MSBuild/WixToolset.MSBuild.props | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/WixToolset.MSBuild/WixToolset.MSBuild.props b/src/WixToolset.MSBuild/WixToolset.MSBuild.props index b1d207f4..b453361b 100644 --- a/src/WixToolset.MSBuild/WixToolset.MSBuild.props +++ b/src/WixToolset.MSBuild/WixToolset.MSBuild.props | |||
| @@ -3,7 +3,6 @@ | |||
| 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 | <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' and '$(MSBuildRuntimeType)' == 'Core' ">$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\tools\netcoreapp2.1\wix.targets'))</WixTargetsPath> | 6 | <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\tools\wix.targets'))</WixTargetsPath> |
| 7 | <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\tools\net461\wix.targets'))</WixTargetsPath> | ||
| 8 | </PropertyGroup> | 7 | </PropertyGroup> |
| 9 | </Project> | 8 | </Project> |