diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-05-10 13:49:09 +1000 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-05-10 14:20:58 +1000 |
| commit | a5f59cb11a6372a6da8540bd1bebf6dec20e92e3 (patch) | |
| tree | 95c20f7962fca750fd48d1a6118f506262659d84 /src/WixToolset.MSBuild/WixToolset.MSBuild.props | |
| parent | 00eb63b1a04fd455699b3d0ae5039c4092cf3aa7 (diff) | |
| download | wix-a5f59cb11a6372a6da8540bd1bebf6dec20e92e3.tar.gz wix-a5f59cb11a6372a6da8540bd1bebf6dec20e92e3.tar.bz2 wix-a5f59cb11a6372a6da8540bd1bebf6dec20e92e3.zip | |
Remove x86 restriction (introduced from previous commit) from published contents.
Remove unused net472 BuildTasks.
Make BuildTasks target netcoreapp instead of netstandard since publishing isn't supported for netstandard.
Diffstat (limited to 'src/WixToolset.MSBuild/WixToolset.MSBuild.props')
| -rw-r--r-- | src/WixToolset.MSBuild/WixToolset.MSBuild.props | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/WixToolset.MSBuild/WixToolset.MSBuild.props b/src/WixToolset.MSBuild/WixToolset.MSBuild.props index b0b7e7e3..b1d207f4 100644 --- a/src/WixToolset.MSBuild/WixToolset.MSBuild.props +++ b/src/WixToolset.MSBuild/WixToolset.MSBuild.props | |||
| @@ -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 | <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' and '$(MSBuildRuntimeType)' == 'Core' ">$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\tools\netstandard2.0\wix.targets'))</WixTargetsPath> | 6 | <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' and '$(MSBuildRuntimeType)' == 'Core' ">$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\tools\netcoreapp2.1\wix.targets'))</WixTargetsPath> |
| 7 | <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\tools\net461\wix.targets'))</WixTargetsPath> | 7 | <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\tools\net461\wix.targets'))</WixTargetsPath> |
| 8 | </PropertyGroup> | 8 | </PropertyGroup> |
| 9 | </Project> | 9 | </Project> |