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/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj | 3 ++-
 src/test/WixToolsetTest.WixCop/WixToolsetTest.WixCop.csproj         | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/test')

diff --git a/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj b/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
index c5498de4..eba81c0c 100644
--- a/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
+++ b/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
@@ -21,7 +21,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="14.3" PrivateAssets="All" />
+    <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)'=='netcoreapp2.1' " />
     <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" />
   </ItemGroup>
 
diff --git a/src/test/WixToolsetTest.WixCop/WixToolsetTest.WixCop.csproj b/src/test/WixToolsetTest.WixCop/WixToolsetTest.WixCop.csproj
index 45f8c57d..c58b6091 100644
--- a/src/test/WixToolsetTest.WixCop/WixToolsetTest.WixCop.csproj
+++ b/src/test/WixToolsetTest.WixCop/WixToolsetTest.WixCop.csproj
@@ -3,11 +3,15 @@
 
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <IsPackable>false</IsPackable>
     <DebugType>embedded</DebugType>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <NoWarn>NU1603</NoWarn>
+  </PropertyGroup>
+
   <ItemGroup>
     <None Remove="TestData\SingleFile\ConvertedSingleFile.wxs" />
     <None Remove="TestData\SingleFile\SingleFile.wxs" />
-- 
cgit v1.2.3-55-g6feb