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

---
 appveyor.cmd                                                   |  6 +++---
 src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj         | 10 +++-------
 src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec               |  3 +--
 src/WixToolset.MSBuild/WixToolset.MSBuild.props                |  2 +-
 src/WixToolset.Tools.Core/WixToolset.Tools.Core.csproj         |  2 +-
 .../WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj |  3 ++-
 src/test/WixToolsetTest.WixCop/WixToolsetTest.WixCop.csproj    |  6 +++++-
 src/wix/wix.csproj                                             |  2 +-
 src/wixcop/WixCop.csproj                                       |  2 +-
 9 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/appveyor.cmd b/appveyor.cmd
index a41f8c19..5d738995 100644
--- a/appveyor.cmd
+++ b/appveyor.cmd
@@ -4,12 +4,12 @@
 
 nuget restore
 
-dotnet build -c Release src\test\WixToolsetTest.BuildTasks
-dotnet build -c Release src\test\WixToolsetTest.WixCop
+dotnet test -c Release src\test\WixToolsetTest.BuildTasks
+dotnet test -c Release src\test\WixToolsetTest.WixCop
 
 dotnet publish -c Release -o %_P%\dotnet-wix\ -f netcoreapp2.1 src\wix
 dotnet publish -c Release -o %_P%\WixToolset.MSBuild\net461\ -f net461 src\WixToolset.BuildTasks
-dotnet publish -c Release -o %_P%\WixToolset.MSBuild\netcoreapp2.1\ -f netcoreapp2.1 src\WixToolset.BuildTasks
+dotnet publish -c Release -o %_P%\WixToolset.MSBuild\netstandard2.0\ -f netstandard2.0 src\WixToolset.BuildTasks
 
 @rem dotnet publish -c Release -o %_P%\netcoreapp2.1 -r win-x86 src\wix
 @rem dotnet publish -c Release -o %_P%\net461 -r win-x86 src\light
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>
diff --git a/src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec b/src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec
index 6bca928a..c49efff0 100644
--- a/src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec
+++ b/src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec
@@ -13,7 +13,6 @@
   <files>
     <file src="$projectFolder$$id$.props" target="build" />
     <file src="net461\*" target="tools\net461" />
-    <file src="netcoreapp2.1\*" target="tools\netcoreapp2.1" />
-    <file src="netcoreapp2.1\runtimes\**" target="tools\netcoreapp2.1\runtimes" />
+    <file src="netstandard2.0\*" target="tools\netstandard2.0" />
   </files>
 </package>
diff --git a/src/WixToolset.MSBuild/WixToolset.MSBuild.props b/src/WixToolset.MSBuild/WixToolset.MSBuild.props
index b1d207f4..b0b7e7e3 100644
--- a/src/WixToolset.MSBuild/WixToolset.MSBuild.props
+++ b/src/WixToolset.MSBuild/WixToolset.MSBuild.props
@@ -3,7 +3,7 @@
 
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
-    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' and '$(MSBuildRuntimeType)' == 'Core' ">$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\tools\netcoreapp2.1\wix.targets'))</WixTargetsPath>
+    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' and '$(MSBuildRuntimeType)' == 'Core' ">$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\tools\netstandard2.0\wix.targets'))</WixTargetsPath>
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\tools\net461\wix.targets'))</WixTargetsPath>
   </PropertyGroup>
 </Project>
diff --git a/src/WixToolset.Tools.Core/WixToolset.Tools.Core.csproj b/src/WixToolset.Tools.Core/WixToolset.Tools.Core.csproj
index 0f67db73..04869f00 100644
--- a/src/WixToolset.Tools.Core/WixToolset.Tools.Core.csproj
+++ b/src/WixToolset.Tools.Core/WixToolset.Tools.Core.csproj
@@ -3,7 +3,7 @@
 
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0;net461;net472</TargetFrameworks>
     <Description>Tools Core</Description>
     <Title>WiX Toolset Tools Core</Title>
     <DebugType>embedded</DebugType>
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" />
diff --git a/src/wix/wix.csproj b/src/wix/wix.csproj
index 1f2c61e0..ea820230 100644
--- a/src/wix/wix.csproj
+++ b/src/wix/wix.csproj
@@ -3,7 +3,7 @@
 
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;net461;net472</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <Description>Compiler</Description>
     <Title>WiX Toolset Compiler</Title>
diff --git a/src/wixcop/WixCop.csproj b/src/wixcop/WixCop.csproj
index 4c0d9a16..858d3b52 100644
--- a/src/wixcop/WixCop.csproj
+++ b/src/wixcop/WixCop.csproj
@@ -3,7 +3,7 @@
 
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;net461;net472</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <Description>Converter</Description>
     <Title>WiX Error Correction Tool</Title>
-- 
cgit v1.2.3-55-g6feb