2 files changed, 8 insertions, 6 deletions

diff --git a/src/tools/WixToolset.Heat/WixToolset.Heat.nuspec b/src/tools/WixToolset.Heat/WixToolset.Heat.nuspec
index d3ee59f7..48e94797 100644
--- a/src/tools/WixToolset.Heat/WixToolset.Heat.nuspec
+++ b/src/tools/WixToolset.Heat/WixToolset.Heat.nuspec
@@ -6,17 +6,19 @@
     <title>$title$</title>
     <description>$description$</description>
     <authors>$authors$</authors>
-    <icon>wix.png</icon>
-    <license type="expression">MS-RL</license>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <icon>icon.png</icon>
+    <license type="file">OSMFEULA.txt</license>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <tags>$packageTags$</tags>
     <copyright>$copyright$</copyright>
     <projectUrl>$projectUrl$</projectUrl>
     <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
   </metadata>
 
   <files>
+    <file src="$eulaTxt$" />
+    <file src="$iconPng$" />
     <file src="$projectFolder$\$id$.targets" target="build" />
-    <file src="$projectFolder$\..\..\internal\images\wix.png" />
     <file src="tools\**\*" target="tools" />
   </files>
 </package>
diff --git a/src/tools/tools_t.proj b/src/tools/tools_t.proj
index 60685ef1..96a0cf2a 100644
--- a/src/tools/tools_t.proj
+++ b/src/tools/tools_t.proj
@@ -12,8 +12,8 @@
     <!-- <ProjectReference Include="heat\heat.csproj" />
     <ProjectReference Include="WixToolset.HeatTasks\WixToolset.HeatTasks.csproj" /> -->
 
-    <ProjectReference Include="test\WixToolsetTest.HeatTasks\WixToolsetTest.HeatTasks.csproj" />
-    <ProjectReference Include="test\WixToolsetTest.Heat\WixToolsetTest.Heat.csproj" />
+    <ProjectReference Include="test\WixToolsetTest.HeatTasks\WixToolsetTest.HeatTasks.csproj" Targets="Test" />
+    <ProjectReference Include="test\WixToolsetTest.Heat\WixToolsetTest.Heat.csproj" Targets="Test" />
 
     <ProjectReference Include="WixToolset.Heat\WixToolset.Heat.csproj" Targets="Pack" />
   </ItemGroup>