From 7e498d6348c26583972ea1cdf7d51dadc8f5b792 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Tue, 8 Nov 2022 12:50:13 -0800
Subject: Ensure all published .nupkgs have an icon

---
 src/Directory.Build.props                                  |  1 +
 src/Directory.csproj.props                                 |  4 ++++
 .../WixToolset.BootstrapperCore.Native.nuspec              |  2 ++
 .../burn/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec    |  2 ++
 src/api/burn/balutil/balutil.nuspec                        |  6 ++++--
 src/api/burn/bextutil/bextutil.nuspec                      |  6 ++++--
 .../WixToolset.Dnc.HostGenerator.nuspec                    |  4 +++-
 src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec | 14 ++++++++------
 src/ext/WixExt.props                                       |  2 --
 src/libs/dutil/WixToolset.DUtil/dutil.nuspec               |  6 ++++--
 src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec         |  2 ++
 src/tools/WixToolset.Heat/WixToolset.Heat.nuspec           |  2 ++
 src/wix/WixToolset.Sdk/WixToolset.Sdk.nuspec               |  2 ++
 13 files changed, 38 insertions(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 90de177c..db9bf0b2 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -30,6 +30,7 @@
     <PackageLicenseExpression>MS-RL</PackageLicenseExpression>
     <Product>WiX Toolset</Product>
     <ProjectUrl>https://wixtoolset.org/</ProjectUrl>
+    <PackageIcon>wix.png</PackageIcon>
 
     <GitThisAssembly>false</GitThisAssembly>
     <GitVersionFile>version.txt</GitVersionFile>
diff --git a/src/Directory.csproj.props b/src/Directory.csproj.props
index ef0070ed..56c724ee 100644
--- a/src/Directory.csproj.props
+++ b/src/Directory.csproj.props
@@ -9,4 +9,8 @@
     <DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
     <DebugType Condition=" '$(DebugType)'=='' ">embedded</DebugType>
   </PropertyGroup>
+
+  <ItemGroup>
+    <Content Include="$(MSBuildThisFileDirectory)internal\images\wix.png" PackagePath="/" />
+  </ItemGroup>
 </Project>
diff --git a/src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.nuspec b/src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.nuspec
index d86bb3cd..37757d7c 100644
--- a/src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.nuspec
+++ b/src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.nuspec
@@ -6,6 +6,7 @@
     <title>$title$</title>
     <description>$description$</description>
     <authors>$authors$</authors>
+    <icon>wix.png</icon>
     <license type="expression">MS-RL</license>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <copyright>$copyright$</copyright>
@@ -15,6 +16,7 @@
 
   <files>
     <file src="$projectFolder$\build\$id$.props" target="build\" />
+    <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
     <file src="$projectFolder$\inc\*" target="build\native\include" />
   </files>
 </package>
diff --git a/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec b/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec
index 36fe83cc..6eda95db 100644
--- a/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec
+++ b/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec
@@ -6,6 +6,7 @@
     <title>$title$</title>
     <description>$description$</description>
     <authors>$authors$</authors>
+    <icon>wix.png</icon>
     <license type="expression">MS-RL</license>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <copyright>$copyright$</copyright>
@@ -18,6 +19,7 @@
   </metadata>
 
   <files>
+    <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
     <file src="net20\$id$.dll" target="lib\net20" />
     <file src="net20\$id$.xml" target="lib\net20" />
     <file src="netstandard2.0\$id$.dll" target="lib\netstandard2.0" />
diff --git a/src/api/burn/balutil/balutil.nuspec b/src/api/burn/balutil/balutil.nuspec
index 666e47d0..be51ec79 100644
--- a/src/api/burn/balutil/balutil.nuspec
+++ b/src/api/burn/balutil/balutil.nuspec
@@ -1,11 +1,12 @@
-<?xml version="1.0"?>
-<package >
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata minClientVersion="4.0">
     <id>$id$</id>
     <version>$version$</version>
     <title>$title$</title>
     <description>$description$</description>
     <authors>$authors$</authors>
+    <icon>wix.png</icon>
     <license type="expression">MS-RL</license>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <copyright>$copyright$</copyright>
@@ -19,6 +20,7 @@
 
   <files>
     <file src="$projectFolder$\build\$id$.props" target="build\" />
+    <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
     <file src="$projectFolder$\inc\*" target="build\native\include" />
     <file src="..\..\v141\x86\balutil.lib" target="build\native\v14\x86" />
     <file src="..\..\v141\x64\balutil.lib" target="build\native\v14\x64" />
diff --git a/src/api/burn/bextutil/bextutil.nuspec b/src/api/burn/bextutil/bextutil.nuspec
index 1ce2c7fb..125e8807 100644
--- a/src/api/burn/bextutil/bextutil.nuspec
+++ b/src/api/burn/bextutil/bextutil.nuspec
@@ -1,11 +1,12 @@
-<?xml version="1.0"?>
-<package >
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata minClientVersion="4.0">
     <id>$id$</id>
     <version>$version$</version>
     <title>$title$</title>
     <description>$description$</description>
     <authors>$authors$</authors>
+    <icon>wix.png</icon>
     <license type="expression">MS-RL</license>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <copyright>$copyright$</copyright>
@@ -19,6 +20,7 @@
 
   <files>
     <file src="$projectFolder$\build\$id$.props" target="build\" />
+    <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
     <file src="$projectFolder$\inc\*" target="build\native\include" />
     <file src="..\..\v141\x86\bextutil.lib" target="build\native\v14\x86" />
     <file src="..\..\v141\x64\bextutil.lib" target="build\native\v14\x64" />
diff --git a/src/ext/Bal/WixToolset.Dnc.HostGenerator/WixToolset.Dnc.HostGenerator.nuspec b/src/ext/Bal/WixToolset.Dnc.HostGenerator/WixToolset.Dnc.HostGenerator.nuspec
index 46dd7248..8f4de5e8 100644
--- a/src/ext/Bal/WixToolset.Dnc.HostGenerator/WixToolset.Dnc.HostGenerator.nuspec
+++ b/src/ext/Bal/WixToolset.Dnc.HostGenerator/WixToolset.Dnc.HostGenerator.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>
     <copyright>$copyright$</copyright>
     <projectUrl>$projectUrl$</projectUrl>
     <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
     <dependencies>
-        <dependency id="WixToolset.Mba.Core" version="[$version$,5)" />
+      <dependency id="WixToolset.Mba.Core" version="[$version$,5)" />
     </dependencies>
   </metadata>
 
   <files>
+    <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
     <file src="$id$.dll" target="analyzers/dotnet/cs" />
     <file src="build\**\*" target="build" />
   </files>
diff --git a/src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec b/src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec
index 00fd21ac..bcd7b89a 100644
--- a/src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec
+++ b/src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec
@@ -1,15 +1,16 @@
-<?xml version="1.0"?>
-<package >
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>$id$</id>
     <version>$version$</version>
-    <authors>WiX Toolset Team</authors>
-    <owners>WiX Toolset Team</owners>
+    <title>$title$</title>
+    <description>$description$</description>
+    <authors>$authors$</authors>
+    <icon>wix.png</icon>
     <license type="expression">MS-RL</license>
-    <projectUrl>https://github.com/wixtoolset/Bal.wixext</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>$description$</description>
     <copyright>$copyright$</copyright>
+    <projectUrl>$projectUrl$</projectUrl>
     <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
     <dependencies>
       <group targetFramework=".NETFramework2.0" />
@@ -17,6 +18,7 @@
   </metadata>
 
   <files>
+    <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
     <file src="net20\$id$.config" target="samples" />
     <file src="net20\$id$.dll" target="lib\net20" />
   </files>
diff --git a/src/ext/WixExt.props b/src/ext/WixExt.props
index 23bce7fa..fecfdd78 100644
--- a/src/ext/WixExt.props
+++ b/src/ext/WixExt.props
@@ -3,14 +3,12 @@
 
 <Project>
   <PropertyGroup>
-    <PackageIcon>wix.png</PackageIcon>
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
     <NoWarn>NU5100</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
-    <Content Include="$(MSBuildThisFileDirectory)..\internal\images\wix.png" PackagePath="/" />
     <Content Include="$(MSBuildProjectName).targets" PackagePath="build" />
     <Content Include="$(TargetPath)" PackagePath="wixext4" />
 
diff --git a/src/libs/dutil/WixToolset.DUtil/dutil.nuspec b/src/libs/dutil/WixToolset.DUtil/dutil.nuspec
index d68183cd..122ad9f9 100644
--- a/src/libs/dutil/WixToolset.DUtil/dutil.nuspec
+++ b/src/libs/dutil/WixToolset.DUtil/dutil.nuspec
@@ -1,11 +1,12 @@
-<?xml version="1.0"?>
-<package >
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata minClientVersion="4.0">
     <id>$id$</id>
     <version>$version$</version>
     <title>$title$</title>
     <description>$description$</description>
     <authors>$authors$</authors>
+    <icon>wix.png</icon>
     <license type="expression">MS-RL</license>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <copyright>$copyright$</copyright>
@@ -15,6 +16,7 @@
 
   <files>
     <file src="$projectFolder$\build\$id$.props" target="build\" />
+    <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
     <file src="$projectFolder$\inc\*" target="build\native\include" />
     <file src="..\..\v141\x64\dutil.lib" target="build\native\v14\x64" />
     <file src="..\..\v141\x86\dutil.lib" target="build\native\v14\x86" />
diff --git a/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec b/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec
index ad724e63..74e925fe 100644
--- a/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec
+++ b/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec
@@ -6,6 +6,7 @@
     <title>$title$</title>
     <description>$description$</description>
     <authors>$authors$</authors>
+    <icon>wix.png</icon>
     <license type="expression">MS-RL</license>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <copyright>$copyright$</copyright>
@@ -18,6 +19,7 @@
 
   <files>
     <file src="$projectFolder$\build\$id$.props" target="build\" />
+    <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
     <file src="$projectFolder$\inc\*" target="build\native\include" />
     <file src="..\..\v141\x64\wcautil.lib" target="build\native\v14\x64" />
     <file src="..\..\v141\x86\wcautil.lib" target="build\native\v14\x86" />
diff --git a/src/tools/WixToolset.Heat/WixToolset.Heat.nuspec b/src/tools/WixToolset.Heat/WixToolset.Heat.nuspec
index 5242773b..d3ee59f7 100644
--- a/src/tools/WixToolset.Heat/WixToolset.Heat.nuspec
+++ b/src/tools/WixToolset.Heat/WixToolset.Heat.nuspec
@@ -6,6 +6,7 @@
     <title>$title$</title>
     <description>$description$</description>
     <authors>$authors$</authors>
+    <icon>wix.png</icon>
     <license type="expression">MS-RL</license>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <copyright>$copyright$</copyright>
@@ -15,6 +16,7 @@
 
   <files>
     <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/wix/WixToolset.Sdk/WixToolset.Sdk.nuspec b/src/wix/WixToolset.Sdk/WixToolset.Sdk.nuspec
index e0fb1534..4e00501a 100644
--- a/src/wix/WixToolset.Sdk/WixToolset.Sdk.nuspec
+++ b/src/wix/WixToolset.Sdk/WixToolset.Sdk.nuspec
@@ -6,6 +6,7 @@
     <title>$title$</title>
     <description>$description$</description>
     <authors>$authors$</authors>
+    <icon>wix.png</icon>
     <license type="expression">MS-RL</license>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <copyright>$copyright$</copyright>
@@ -14,6 +15,7 @@
   </metadata>
 
   <files>
+    <file src="$projectFolder$\..\..\internal\images\wix.png" />
     <file src="build\**\*" target="build" />
     <file src="Sdk\**\*" target="Sdk" />
     <file src="tools\**\*" target="tools" exclude="**\*.xml;**\WixToolset.Core.Native.targets" />
-- 
cgit v1.2.3-55-g6feb