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

---
 .../WixToolset.Dnc.HostGenerator.nuspec                    |  4 +++-
 src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec | 14 ++++++++------
 src/ext/WixExt.props                                       |  2 --
 3 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'src/ext')

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" />
 
-- 
cgit v1.2.3-55-g6feb