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.MSBuild/WixToolset.MSBuild.nuspec | 3 +--
 src/WixToolset.MSBuild/WixToolset.MSBuild.props  | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/WixToolset.MSBuild')

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>
-- 
cgit v1.2.3-55-g6feb