6 files changed, 8 insertions, 6 deletions

diff --git a/src/WixToolset.MSBuild/WixToolset.MSBuild.csproj b/src/WixToolset.MSBuild/WixToolset.MSBuild.csproj
index 5a9633ae..2d5ea01b 100644
--- a/src/WixToolset.MSBuild/WixToolset.MSBuild.csproj
+++ b/src/WixToolset.MSBuild/WixToolset.MSBuild.csproj
@@ -12,6 +12,13 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <Content Include="tools\wix.ca.targets" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="tools\wix.harvest.targets" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="tools\wix.signing.targets" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="tools\wix.targets" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
+
+  <ItemGroup>
     <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
   </ItemGroup>
 
diff --git a/src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec b/src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec
index 6171a911..ff0d74ee 100644
--- a/src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec
+++ b/src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec
@@ -12,11 +12,6 @@
 
   <files>
     <file src="$projectFolder$$id$.props" target="build" />
-    <file src="$projectFolder$wix.ca.targets" target="tools" />
-    <file src="$projectFolder$wix.harvest.targets" target="tools" />
-    <file src="$projectFolder$wix.signing.targets" target="tools" />
-    <file src="$projectFolder$wix.targets" target="tools" />
-    <file src="net461\**\*" target="tools\net461" />
-    <file src="netcoreapp2.1\**\*" target="tools\netcoreapp2.1" />
+    <file src="tools\**\*" target="tools" />
   </files>
 </package>
diff --git a/src/WixToolset.MSBuild/wix.ca.targets b/src/WixToolset.MSBuild/tools/wix.ca.targets
index 4578c2d8..4578c2d8 100644
--- a/src/WixToolset.MSBuild/wix.ca.targets
+++ b/src/WixToolset.MSBuild/tools/wix.ca.targets
diff --git a/src/WixToolset.MSBuild/wix.harvest.targets b/src/WixToolset.MSBuild/tools/wix.harvest.targets
index e4d866ea..e4d866ea 100644
--- a/src/WixToolset.MSBuild/wix.harvest.targets
+++ b/src/WixToolset.MSBuild/tools/wix.harvest.targets
diff --git a/src/WixToolset.MSBuild/wix.signing.targets b/src/WixToolset.MSBuild/tools/wix.signing.targets
index 7c25175f..7c25175f 100644
--- a/src/WixToolset.MSBuild/wix.signing.targets
+++ b/src/WixToolset.MSBuild/tools/wix.signing.targets
diff --git a/src/WixToolset.MSBuild/wix.targets b/src/WixToolset.MSBuild/tools/wix.targets
index b35d18c7..b35d18c7 100644
--- a/src/WixToolset.MSBuild/wix.targets
+++ b/src/WixToolset.MSBuild/tools/wix.targets