From a5f59cb11a6372a6da8540bd1bebf6dec20e92e3 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Sun, 10 May 2020 13:49:09 +1000
Subject: Remove x86 restriction (introduced from previous commit) from
 published contents. Remove unused net472 BuildTasks. Make BuildTasks target
 netcoreapp instead of netstandard since publishing isn't supported for
 netstandard.

---
 src/WixToolset.MSBuild/WixToolset.MSBuild.csproj | 2 +-
 src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec | 3 +--
 src/WixToolset.MSBuild/WixToolset.MSBuild.props  | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/WixToolset.MSBuild')

diff --git a/src/WixToolset.MSBuild/WixToolset.MSBuild.csproj b/src/WixToolset.MSBuild/WixToolset.MSBuild.csproj
index 76e42911..5a9633ae 100644
--- a/src/WixToolset.MSBuild/WixToolset.MSBuild.csproj
+++ b/src/WixToolset.MSBuild/WixToolset.MSBuild.csproj
@@ -3,7 +3,7 @@
 
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <Description>WiX Toolset MSBuild integration</Description>
     <NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile>
diff --git a/src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec b/src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec
index ba16aa92..c9e5cdf2 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="net472\*" target="tools\net472" />
-    <file src="netstandard2.0\*" target="tools\netstandard2.0" />
+    <file src="netcoreapp2.1\*" target="tools\netcoreapp2.1" />
   </files>
 </package>
diff --git a/src/WixToolset.MSBuild/WixToolset.MSBuild.props b/src/WixToolset.MSBuild/WixToolset.MSBuild.props
index b0b7e7e3..b1d207f4 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\netstandard2.0\wix.targets'))</WixTargetsPath>
+    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' and '$(MSBuildRuntimeType)' == 'Core' ">$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\tools\netcoreapp2.1\wix.targets'))</WixTargetsPath>
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\tools\net461\wix.targets'))</WixTargetsPath>
   </PropertyGroup>
 </Project>
-- 
cgit v1.2.3-55-g6feb