From cef6ac5735e9cf47fb51746f136d6703f2d45de6 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Sun, 20 Oct 2019 01:00:05 -0700
Subject: Better support all .NETs and fix-up integration tests

---
 src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'src/WixToolset.BuildTasks')

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 @@
 
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net461;net472</TargetFrameworks>
     <Description></Description>
     <Title>WiX Toolset MSBuild Tasks</Title>
     <DebugType>embedded</DebugType>
@@ -14,10 +14,6 @@
     <NoWarn>NU1701</NoWarn>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <!-- <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> -->
-  </PropertyGroup>
-
   <ItemGroup>
     <Content Include="redirects\wix.targets" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="redirects\wix.ca.targets" CopyToOutputDirectory="PreserveNewest" />
@@ -38,8 +34,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="14.3" Condition="'$(TargetFramework)'=='net461' " />
-    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.7.179" Condition="'$(TargetFramework)'=='netcoreapp2.1' " />
+    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="14.3" Condition="'$(TargetFramework)'=='net461' or '$(TargetFramework)'=='net472'" />
+    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.7.179" Condition="'$(TargetFramework)'=='netstandard2.0' " />
   </ItemGroup>
 
   <ItemGroup>
-- 
cgit v1.2.3-55-g6feb