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.BuildTasks/WixToolset.BuildTasks.csproj | |
| 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.BuildTasks/WixToolset.BuildTasks.csproj')
| -rw-r--r-- | src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj b/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj index cfa0b1d8..8724f2fc 100644 --- a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj +++ b/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj | |||
| @@ -3,12 +3,13 @@ | |||
| 3 | 3 | ||
| 4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <TargetFrameworks>netstandard2.0;net461;net472</TargetFrameworks> | 6 | <TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks> |
| 7 | <Description></Description> | 7 | <Description></Description> |
| 8 | <Title>WiX Toolset MSBuild Tasks</Title> | 8 | <Title>WiX Toolset MSBuild Tasks</Title> |
| 9 | <DebugType>embedded</DebugType> | 9 | <DebugType>embedded</DebugType> |
| 10 | <PublishRepositoryUrl>true</PublishRepositoryUrl> | 10 | <PublishRepositoryUrl>true</PublishRepositoryUrl> |
| 11 | <RuntimeIdentifier>win-x86</RuntimeIdentifier> | 11 | <RuntimeIdentifier Condition=" '$(RuntimeIdentifier)'=='' and '$(TargetFramework)'!='netcoreapp2.1' ">win-x86</RuntimeIdentifier> |
| 12 | <PlatformTarget>AnyCPU</PlatformTarget> | ||
| 12 | </PropertyGroup> | 13 | </PropertyGroup> |
| 13 | 14 | ||
| 14 | <PropertyGroup> | 15 | <PropertyGroup> |
| @@ -36,8 +37,8 @@ | |||
| 36 | </ItemGroup> | 37 | </ItemGroup> |
| 37 | 38 | ||
| 38 | <ItemGroup> | 39 | <ItemGroup> |
| 39 | <PackageReference Include="Microsoft.Build.Tasks.Core" Version="14.3" Condition="'$(TargetFramework)'=='net461' or '$(TargetFramework)'=='net472'" /> | 40 | <PackageReference Include="Microsoft.Build.Tasks.Core" Version="14.3" Condition="'$(TargetFramework)'=='net461'" /> |
| 40 | <PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.7.179" Condition="'$(TargetFramework)'=='netstandard2.0' " /> | 41 | <PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.7.179" Condition="'$(TargetFramework)'=='netcoreapp2.1' " /> |
| 41 | </ItemGroup> | 42 | </ItemGroup> |
| 42 | 43 | ||
| 43 | <ItemGroup> | 44 | <ItemGroup> |