From 5524dd89431695bf9d710e694ec49401d3cecfde Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Fri, 29 Dec 2017 04:09:35 -0800
Subject: Store different framework target separately

---
 appveyor.cmd                                                      | 6 +++---
 .../WixToolset.Core.InternalPackage.csproj                        | 8 +++++---
 .../WixToolset.Core.InternalPackage.nuspec                        | 7 +++----
 .../WixToolset.Core.InternalPackage.props                         | 2 +-
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/appveyor.cmd b/appveyor.cmd
index 42465be8..2bd0bbbb 100644
--- a/appveyor.cmd
+++ b/appveyor.cmd
@@ -6,9 +6,9 @@ dotnet build -c Release src\test\WixToolsetTest.BuildTasks
 dotnet build -c Release src\test\WixToolsetTest.CoreIntegration
 dotnet build -c Release src\test\WixToolsetTest.LightIntegration
 
-dotnet publish -c Release -o %_P% -r win-x86 src\wix
-dotnet publish -c Release -o %_P% -r win-x86 src\light
-dotnet publish -c Release -o %_P% -r win-x86 src\WixToolset.BuildTasks
+dotnet publish -c Release -o %_P%\netcoreapp2.0 -r win-x86 src\wix
+dotnet publish -c Release -o %_P%\net461 -r win-x86 src\light
+dotnet publish -c Release -o %_P%\net461 -r win-x86 src\WixToolset.BuildTasks
 
 dotnet pack -c Release src\WixToolset.Core.InternalPackage
 
diff --git a/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.csproj b/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.csproj
index 687e8955..bc830163 100644
--- a/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.csproj
+++ b/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.csproj
@@ -15,9 +15,11 @@
     <PackageReference Include="Nerdbank.GitVersioning" Version="2.0.41" PrivateAssets="all" />
   </ItemGroup>
 
-  <Target Name="SetNuspecVersion"
-          AfterTargets="GetBuildVersion">
-    <Error Text="Cannot pack $(MSBuildThisFileName) until all projects are published to: $(NuspecBasePath). Run appveyor.cmd to publish projects properly." Condition=" !Exists('$(NuspecBasePath)') " />
+  <PropertyGroup>
+    <GenerateNuspecDependsOn>$(GenerateNuspecDependsOn);SetNuspecVersion</GenerateNuspecDependsOn>
+  </PropertyGroup>
+  <Target Name="SetNuspecVersion">
+    <Error Text="Cannot pack $(MSBuildThisFileName) until all projects are published to: '$(NuspecBasePath)'. Run appveyor.cmd to publish projects properly." Condition=" !Exists('$(NuspecBasePath)') " />
 
     <PropertyGroup>
       <NuspecProperties>$(NuspecProperties);Version=$(Version);ProjectFolder=$(MSBuildThisFileDirectory)</NuspecProperties>
diff --git a/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.nuspec b/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.nuspec
index 5b81d615..00b01683 100644
--- a/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.nuspec
+++ b/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.nuspec
@@ -13,9 +13,8 @@
   <files>
     <file src="$projectFolder$$id$.props" target="build" />
 
-    <file src="redirects\wix.targets" target="msbuild" />
-    <file src="redirects\wix.ca.targets" target="msbuild" />
-
-    <file src="*" target="tools" />
+    <file src="netcoreapp2.0\*" target="tools\netcoreapp2.0" />
+    <file src="net461\*" target="tools\net461" />
+    <file src="net461\redirects\*" target="msbuild" />
   </files>
 </package>
diff --git a/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.props b/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.props
index 24aab72e..8d71aa66 100644
--- a/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.props
+++ b/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.props
@@ -3,6 +3,6 @@
 
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
-    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\wix.targets</WixTargetsPath>
+    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\net461\wix.targets</WixTargetsPath>
   </PropertyGroup>
 </Project>
-- 
cgit v1.2.3-55-g6feb