diff options
| author | Rob Mensching <rob@firegiant.com> | 2019-10-20 01:00:05 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2019-10-20 01:06:43 -0700 |
| commit | cef6ac5735e9cf47fb51746f136d6703f2d45de6 (patch) | |
| tree | 71726a5acb05914212eeee7b2cad36de71f91419 /src/WixToolset.BuildTasks | |
| parent | c8c22de1957f8eeb2c9fc03df12db6af41613ca9 (diff) | |
| download | wix-cef6ac5735e9cf47fb51746f136d6703f2d45de6.tar.gz wix-cef6ac5735e9cf47fb51746f136d6703f2d45de6.tar.bz2 wix-cef6ac5735e9cf47fb51746f136d6703f2d45de6.zip | |
Better support all .NETs and fix-up integration tests
Diffstat (limited to 'src/WixToolset.BuildTasks')
| -rw-r--r-- | src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj b/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj index c5b609c6..f8983121 100644 --- a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj +++ b/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | 3 | ||
| 4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks> | 6 | <TargetFrameworks>netstandard2.0;net461;net472</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> |
| @@ -14,10 +14,6 @@ | |||
| 14 | <NoWarn>NU1701</NoWarn> | 14 | <NoWarn>NU1701</NoWarn> |
| 15 | </PropertyGroup> | 15 | </PropertyGroup> |
| 16 | 16 | ||
| 17 | <PropertyGroup> | ||
| 18 | <!-- <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> --> | ||
| 19 | </PropertyGroup> | ||
| 20 | |||
| 21 | <ItemGroup> | 17 | <ItemGroup> |
| 22 | <Content Include="redirects\wix.targets" CopyToOutputDirectory="PreserveNewest" /> | 18 | <Content Include="redirects\wix.targets" CopyToOutputDirectory="PreserveNewest" /> |
| 23 | <Content Include="redirects\wix.ca.targets" CopyToOutputDirectory="PreserveNewest" /> | 19 | <Content Include="redirects\wix.ca.targets" CopyToOutputDirectory="PreserveNewest" /> |
| @@ -38,8 +34,8 @@ | |||
| 38 | </ItemGroup> | 34 | </ItemGroup> |
| 39 | 35 | ||
| 40 | <ItemGroup> | 36 | <ItemGroup> |
| 41 | <PackageReference Include="Microsoft.Build.Tasks.Core" Version="14.3" Condition="'$(TargetFramework)'=='net461' " /> | 37 | <PackageReference Include="Microsoft.Build.Tasks.Core" Version="14.3" Condition="'$(TargetFramework)'=='net461' or '$(TargetFramework)'=='net472'" /> |
| 42 | <PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.7.179" Condition="'$(TargetFramework)'=='netcoreapp2.1' " /> | 38 | <PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.7.179" Condition="'$(TargetFramework)'=='netstandard2.0' " /> |
| 43 | </ItemGroup> | 39 | </ItemGroup> |
| 44 | 40 | ||
| 45 | <ItemGroup> | 41 | <ItemGroup> |