From 50829b410e96d8cb62f557342e33f1815df7d82b Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Thu, 18 Mar 2021 09:17:59 -0500
Subject: Deploy .targets file to buildTransitive folder since the assets are
 needed in the final project.

---
 src/WixToolset.Core.Native/WixToolset.Core.Native.csproj | 2 ++
 src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj b/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj
index 14de87cd..d53a155b 100644
--- a/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj
+++ b/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj
@@ -9,6 +9,8 @@
     <Description>WiX Toolset Native Processing</Description>
     <IncludeSymbols>true</IncludeSymbols>
     <CreateDocumentationFile>true</CreateDocumentationFile>
+    <!-- https://github.com/NuGet/Home/issues/10665 -->
+    <NoWarn>NU5128</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec b/src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec
index fa6a32b6..3091ccd5 100644
--- a/src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec
+++ b/src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec
@@ -22,10 +22,12 @@
     <file src="netstandard2.0\$id$.dll" target="lib\netstandard2.0" />
     <file src="netstandard2.0\$id$.xml" target="lib\netstandard2.0" />
 
-    <file src="netstandard2.0\targets\WixToolset.Core.Native.targets" target="build\WixToolset.Core.Native.targets" />
     <file src="netstandard2.0\cubes\darice.cub" target="lib\netstandard2.0\cubes" />
     <file src="netstandard2.0\cubes\mergemod.cub" target="lib\netstandard2.0\cubes" />
 
+    <file src="netstandard2.0\targets\$id$.targets" target="build" />
+    <file src="netstandard2.0\targets\$id$.targets" target="buildTransitive" />
+
     <file src="ARM64\mergemod.dll" target="runtimes\win-arm64\native" />
     <file src="ARM64\wixnative.exe" target="runtimes\win-arm64\native" />
     <file src="ARM64\wixnative.pdb" target="runtimes\win-arm64\native" />
-- 
cgit v1.2.3-55-g6feb