@joebigelow / wix-1 / commits / 7e498d63

Ensure all published .nupkgs have an icon

Rob Mensching committed Nov 8, 2022 at 12:50 UTC 7e498d6348c26583972ea1cdf7d51dadc8f5b792
13 files changed +38 -15
src/Directory.Build.props
+1
@@ -30,6 +30,7 @@
30 <PackageLicenseExpression>MS-RL</PackageLicenseExpression>
31 <Product>WiX Toolset</Product>
32 <ProjectUrl>https://wixtoolset.org/</ProjectUrl>
33 + <PackageIcon>wix.png</PackageIcon>
34
35 <GitThisAssembly>false</GitThisAssembly>
36 <GitVersionFile>version.txt</GitVersionFile>
src/Directory.csproj.props
+4
@@ -9,4 +9,8 @@
9 <DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
10 <DebugType Condition=" '$(DebugType)'=='' ">embedded</DebugType>
11 </PropertyGroup>
12 +
13 + <ItemGroup>
14 + <Content Include="$(MSBuildThisFileDirectory)internal\images\wix.png" PackagePath="/" />
15 + </ItemGroup>
16 </Project>
src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.nuspec
+2
@@ -6,6 +6,7 @@
6 <title>$title$</title>
7 <description>$description$</description>
8 <authors>$authors$</authors>
9 + <icon>wix.png</icon>
10 <license type="expression">MS-RL</license>
11 <requireLicenseAcceptance>false</requireLicenseAcceptance>
12 <copyright>$copyright$</copyright>
@@ -15,6 +16,7 @@
16
17 <files>
18 <file src="$projectFolder$\build\$id$.props" target="build\" />
19 + <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
20 <file src="$projectFolder$\inc\*" target="build\native\include" />
21 </files>
22 </package>
src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec
+2
@@ -6,6 +6,7 @@
6 <title>$title$</title>
7 <description>$description$</description>
8 <authors>$authors$</authors>
9 + <icon>wix.png</icon>
10 <license type="expression">MS-RL</license>
11 <requireLicenseAcceptance>false</requireLicenseAcceptance>
12 <copyright>$copyright$</copyright>
@@ -18,6 +19,7 @@
19 </metadata>
20
21 <files>
22 + <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
23 <file src="net20\$id$.dll" target="lib\net20" />
24 <file src="net20\$id$.xml" target="lib\net20" />
25 <file src="netstandard2.0\$id$.dll" target="lib\netstandard2.0" />
src/api/burn/balutil/balutil.nuspec
+4 -2
@@ -1,11 +1,12 @@
1 -<?xml version="1.0"?>
2 -<package >
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
3 <metadata minClientVersion="4.0">
4 <id>$id$</id>
5 <version>$version$</version>
6 <title>$title$</title>
7 <description>$description$</description>
8 <authors>$authors$</authors>
9 + <icon>wix.png</icon>
10 <license type="expression">MS-RL</license>
11 <requireLicenseAcceptance>false</requireLicenseAcceptance>
12 <copyright>$copyright$</copyright>
@@ -19,6 +20,7 @@
20
21 <files>
22 <file src="$projectFolder$\build\$id$.props" target="build\" />
23 + <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
24 <file src="$projectFolder$\inc\*" target="build\native\include" />
25 <file src="..\..\v141\x86\balutil.lib" target="build\native\v14\x86" />
26 <file src="..\..\v141\x64\balutil.lib" target="build\native\v14\x64" />
src/api/burn/bextutil/bextutil.nuspec
+4 -2
@@ -1,11 +1,12 @@
1 -<?xml version="1.0"?>
2 -<package >
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
3 <metadata minClientVersion="4.0">
4 <id>$id$</id>
5 <version>$version$</version>
6 <title>$title$</title>
7 <description>$description$</description>
8 <authors>$authors$</authors>
9 + <icon>wix.png</icon>
10 <license type="expression">MS-RL</license>
11 <requireLicenseAcceptance>false</requireLicenseAcceptance>
12 <copyright>$copyright$</copyright>
@@ -19,6 +20,7 @@
20
21 <files>
22 <file src="$projectFolder$\build\$id$.props" target="build\" />
23 + <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
24 <file src="$projectFolder$\inc\*" target="build\native\include" />
25 <file src="..\..\v141\x86\bextutil.lib" target="build\native\v14\x86" />
26 <file src="..\..\v141\x64\bextutil.lib" target="build\native\v14\x64" />
src/ext/Bal/WixToolset.Dnc.HostGenerator/WixToolset.Dnc.HostGenerator.nuspec
+3 -1
@@ -6,17 +6,19 @@
6 <title>$title$</title>
7 <description>$description$</description>
8 <authors>$authors$</authors>
9 + <icon>wix.png</icon>
10 <license type="expression">MS-RL</license>
11 <requireLicenseAcceptance>false</requireLicenseAcceptance>
12 <copyright>$copyright$</copyright>
13 <projectUrl>$projectUrl$</projectUrl>
14 <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
15 <dependencies>
15 - <dependency id="WixToolset.Mba.Core" version="[$version$,5)" />
16 + <dependency id="WixToolset.Mba.Core" version="[$version$,5)" />
17 </dependencies>
18 </metadata>
19
20 <files>
21 + <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
22 <file src="$id$.dll" target="analyzers/dotnet/cs" />
23 <file src="build\**\*" target="build" />
24 </files>
src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec
+8 -6
@@ -1,15 +1,16 @@
1 -<?xml version="1.0"?>
2 -<package >
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
3 <metadata>
4 <id>$id$</id>
5 <version>$version$</version>
6 - <authors>WiX Toolset Team</authors>
7 - <owners>WiX Toolset Team</owners>
6 + <title>$title$</title>
7 + <description>$description$</description>
8 + <authors>$authors$</authors>
9 + <icon>wix.png</icon>
10 <license type="expression">MS-RL</license>
9 - <projectUrl>https://github.com/wixtoolset/Bal.wixext</projectUrl>
11 <requireLicenseAcceptance>false</requireLicenseAcceptance>
11 - <description>$description$</description>
12 <copyright>$copyright$</copyright>
13 + <projectUrl>$projectUrl$</projectUrl>
14 <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
15 <dependencies>
16 <group targetFramework=".NETFramework2.0" />
@@ -17,6 +18,7 @@
18 </metadata>
19
20 <files>
21 + <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
22 <file src="net20\$id$.config" target="samples" />
23 <file src="net20\$id$.dll" target="lib\net20" />
24 </files>
src/ext/WixExt.props
-2
@@ -3,14 +3,12 @@
3
4 <Project>
5 <PropertyGroup>
6 - <PackageIcon>wix.png</PackageIcon>
6 <IncludeBuildOutput>false</IncludeBuildOutput>
7 <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
8 <NoWarn>NU5100</NoWarn>
9 </PropertyGroup>
10
11 <ItemGroup>
13 - <Content Include="$(MSBuildThisFileDirectory)..\internal\images\wix.png" PackagePath="/" />
12 <Content Include="$(MSBuildProjectName).targets" PackagePath="build" />
13 <Content Include="$(TargetPath)" PackagePath="wixext4" />
14
src/libs/dutil/WixToolset.DUtil/dutil.nuspec
+4 -2
@@ -1,11 +1,12 @@
1 -<?xml version="1.0"?>
2 -<package >
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
3 <metadata minClientVersion="4.0">
4 <id>$id$</id>
5 <version>$version$</version>
6 <title>$title$</title>
7 <description>$description$</description>
8 <authors>$authors$</authors>
9 + <icon>wix.png</icon>
10 <license type="expression">MS-RL</license>
11 <requireLicenseAcceptance>false</requireLicenseAcceptance>
12 <copyright>$copyright$</copyright>
@@ -15,6 +16,7 @@
16
17 <files>
18 <file src="$projectFolder$\build\$id$.props" target="build\" />
19 + <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
20 <file src="$projectFolder$\inc\*" target="build\native\include" />
21 <file src="..\..\v141\x64\dutil.lib" target="build\native\v14\x64" />
22 <file src="..\..\v141\x86\dutil.lib" target="build\native\v14\x86" />
src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec
+2
@@ -6,6 +6,7 @@
6 <title>$title$</title>
7 <description>$description$</description>
8 <authors>$authors$</authors>
9 + <icon>wix.png</icon>
10 <license type="expression">MS-RL</license>
11 <requireLicenseAcceptance>false</requireLicenseAcceptance>
12 <copyright>$copyright$</copyright>
@@ -18,6 +19,7 @@
19
20 <files>
21 <file src="$projectFolder$\build\$id$.props" target="build\" />
22 + <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
23 <file src="$projectFolder$\inc\*" target="build\native\include" />
24 <file src="..\..\v141\x64\wcautil.lib" target="build\native\v14\x64" />
25 <file src="..\..\v141\x86\wcautil.lib" target="build\native\v14\x86" />
src/tools/WixToolset.Heat/WixToolset.Heat.nuspec
+2
@@ -6,6 +6,7 @@
6 <title>$title$</title>
7 <description>$description$</description>
8 <authors>$authors$</authors>
9 + <icon>wix.png</icon>
10 <license type="expression">MS-RL</license>
11 <requireLicenseAcceptance>false</requireLicenseAcceptance>
12 <copyright>$copyright$</copyright>
@@ -15,6 +16,7 @@
16
17 <files>
18 <file src="$projectFolder$\$id$.targets" target="build" />
19 + <file src="$projectFolder$\..\..\internal\images\wix.png" />
20 <file src="tools\**\*" target="tools" />
21 </files>
22 </package>
src/wix/WixToolset.Sdk/WixToolset.Sdk.nuspec
+2
@@ -6,6 +6,7 @@
6 <title>$title$</title>
7 <description>$description$</description>
8 <authors>$authors$</authors>
9 + <icon>wix.png</icon>
10 <license type="expression">MS-RL</license>
11 <requireLicenseAcceptance>false</requireLicenseAcceptance>
12 <copyright>$copyright$</copyright>
@@ -14,6 +15,7 @@
15 </metadata>
16
17 <files>
18 + <file src="$projectFolder$\..\..\internal\images\wix.png" />
19 <file src="build\**\*" target="build" />
20 <file src="Sdk\**\*" target="Sdk" />
21 <file src="tools\**\*" target="tools" exclude="**\*.xml;**\WixToolset.Core.Native.targets" />