aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2022-11-08 12:50:13 -0800
committerRob Mensching <rob@firegiant.com>2022-11-08 16:20:25 -0800
commit7e498d6348c26583972ea1cdf7d51dadc8f5b792 (patch)
treea6de8db79a4d18a6c373385792f07f402b2d2482
parent86146e8c044a1aea2ea162701b1fc344d19e4dc3 (diff)
downloadwix-7e498d6348c26583972ea1cdf7d51dadc8f5b792.tar.gz
wix-7e498d6348c26583972ea1cdf7d51dadc8f5b792.tar.bz2
wix-7e498d6348c26583972ea1cdf7d51dadc8f5b792.zip
Ensure all published .nupkgs have an icon
Diffstat
-rw-r--r--src/Directory.Build.props1
-rw-r--r--src/Directory.csproj.props4
-rw-r--r--src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.nuspec2
-rw-r--r--src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec2
-rw-r--r--src/api/burn/balutil/balutil.nuspec6
-rw-r--r--src/api/burn/bextutil/bextutil.nuspec6
-rw-r--r--src/ext/Bal/WixToolset.Dnc.HostGenerator/WixToolset.Dnc.HostGenerator.nuspec4
-rw-r--r--src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec14
-rw-r--r--src/ext/WixExt.props2
-rw-r--r--src/libs/dutil/WixToolset.DUtil/dutil.nuspec6
-rw-r--r--src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec2
-rw-r--r--src/tools/WixToolset.Heat/WixToolset.Heat.nuspec2
-rw-r--r--src/wix/WixToolset.Sdk/WixToolset.Sdk.nuspec2
13 files changed, 38 insertions, 15 deletions
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 @@
30 <PackageLicenseExpression>MS-RL</PackageLicenseExpression> 30 <PackageLicenseExpression>MS-RL</PackageLicenseExpression>
31 <Product>WiX Toolset</Product> 31 <Product>WiX Toolset</Product>
32 <ProjectUrl>https://wixtoolset.org/</ProjectUrl> 32 <ProjectUrl>https://wixtoolset.org/</ProjectUrl>
33 <PackageIcon>wix.png</PackageIcon>
33 34
34 <GitThisAssembly>false</GitThisAssembly> 35 <GitThisAssembly>false</GitThisAssembly>
35 <GitVersionFile>version.txt</GitVersionFile> 36 <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 @@
9 <DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile> 9 <DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
10 <DebugType Condition=" '$(DebugType)'=='' ">embedded</DebugType> 10 <DebugType Condition=" '$(DebugType)'=='' ">embedded</DebugType>
11 </PropertyGroup> 11 </PropertyGroup>
12
13 <ItemGroup>
14 <Content Include="$(MSBuildThisFileDirectory)internal\images\wix.png" PackagePath="/" />
15 </ItemGroup>
12</Project> 16</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 @@
6 <title>$title$</title> 6 <title>$title$</title>
7 <description>$description$</description> 7 <description>$description$</description>
8 <authors>$authors$</authors> 8 <authors>$authors$</authors>
9 <icon>wix.png</icon>
9 <license type="expression">MS-RL</license> 10 <license type="expression">MS-RL</license>
10 <requireLicenseAcceptance>false</requireLicenseAcceptance> 11 <requireLicenseAcceptance>false</requireLicenseAcceptance>
11 <copyright>$copyright$</copyright> 12 <copyright>$copyright$</copyright>
@@ -15,6 +16,7 @@
15 16
16 <files> 17 <files>
17 <file src="$projectFolder$\build\$id$.props" target="build\" /> 18 <file src="$projectFolder$\build\$id$.props" target="build\" />
19 <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
18 <file src="$projectFolder$\inc\*" target="build\native\include" /> 20 <file src="$projectFolder$\inc\*" target="build\native\include" />
19 </files> 21 </files>
20</package> 22</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 @@
6 <title>$title$</title> 6 <title>$title$</title>
7 <description>$description$</description> 7 <description>$description$</description>
8 <authors>$authors$</authors> 8 <authors>$authors$</authors>
9 <icon>wix.png</icon>
9 <license type="expression">MS-RL</license> 10 <license type="expression">MS-RL</license>
10 <requireLicenseAcceptance>false</requireLicenseAcceptance> 11 <requireLicenseAcceptance>false</requireLicenseAcceptance>
11 <copyright>$copyright$</copyright> 12 <copyright>$copyright$</copyright>
@@ -18,6 +19,7 @@
18 </metadata> 19 </metadata>
19 20
20 <files> 21 <files>
22 <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
21 <file src="net20\$id$.dll" target="lib\net20" /> 23 <file src="net20\$id$.dll" target="lib\net20" />
22 <file src="net20\$id$.xml" target="lib\net20" /> 24 <file src="net20\$id$.xml" target="lib\net20" />
23 <file src="netstandard2.0\$id$.dll" target="lib\netstandard2.0" /> 25 <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 @@
1<?xml version="1.0"?> 1<?xml version="1.0" encoding="utf-8"?>
2<package > 2<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
3 <metadata minClientVersion="4.0"> 3 <metadata minClientVersion="4.0">
4 <id>$id$</id> 4 <id>$id$</id>
5 <version>$version$</version> 5 <version>$version$</version>
6 <title>$title$</title> 6 <title>$title$</title>
7 <description>$description$</description> 7 <description>$description$</description>
8 <authors>$authors$</authors> 8 <authors>$authors$</authors>
9 <icon>wix.png</icon>
9 <license type="expression">MS-RL</license> 10 <license type="expression">MS-RL</license>
10 <requireLicenseAcceptance>false</requireLicenseAcceptance> 11 <requireLicenseAcceptance>false</requireLicenseAcceptance>
11 <copyright>$copyright$</copyright> 12 <copyright>$copyright$</copyright>
@@ -19,6 +20,7 @@
19 20
20 <files> 21 <files>
21 <file src="$projectFolder$\build\$id$.props" target="build\" /> 22 <file src="$projectFolder$\build\$id$.props" target="build\" />
23 <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
22 <file src="$projectFolder$\inc\*" target="build\native\include" /> 24 <file src="$projectFolder$\inc\*" target="build\native\include" />
23 <file src="..\..\v141\x86\balutil.lib" target="build\native\v14\x86" /> 25 <file src="..\..\v141\x86\balutil.lib" target="build\native\v14\x86" />
24 <file src="..\..\v141\x64\balutil.lib" target="build\native\v14\x64" /> 26 <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 @@
1<?xml version="1.0"?> 1<?xml version="1.0" encoding="utf-8"?>
2<package > 2<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
3 <metadata minClientVersion="4.0"> 3 <metadata minClientVersion="4.0">
4 <id>$id$</id> 4 <id>$id$</id>
5 <version>$version$</version> 5 <version>$version$</version>
6 <title>$title$</title> 6 <title>$title$</title>
7 <description>$description$</description> 7 <description>$description$</description>
8 <authors>$authors$</authors> 8 <authors>$authors$</authors>
9 <icon>wix.png</icon>
9 <license type="expression">MS-RL</license> 10 <license type="expression">MS-RL</license>
10 <requireLicenseAcceptance>false</requireLicenseAcceptance> 11 <requireLicenseAcceptance>false</requireLicenseAcceptance>
11 <copyright>$copyright$</copyright> 12 <copyright>$copyright$</copyright>
@@ -19,6 +20,7 @@
19 20
20 <files> 21 <files>
21 <file src="$projectFolder$\build\$id$.props" target="build\" /> 22 <file src="$projectFolder$\build\$id$.props" target="build\" />
23 <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
22 <file src="$projectFolder$\inc\*" target="build\native\include" /> 24 <file src="$projectFolder$\inc\*" target="build\native\include" />
23 <file src="..\..\v141\x86\bextutil.lib" target="build\native\v14\x86" /> 25 <file src="..\..\v141\x86\bextutil.lib" target="build\native\v14\x86" />
24 <file src="..\..\v141\x64\bextutil.lib" target="build\native\v14\x64" /> 26 <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 @@
6 <title>$title$</title> 6 <title>$title$</title>
7 <description>$description$</description> 7 <description>$description$</description>
8 <authors>$authors$</authors> 8 <authors>$authors$</authors>
9 <icon>wix.png</icon>
9 <license type="expression">MS-RL</license> 10 <license type="expression">MS-RL</license>
10 <requireLicenseAcceptance>false</requireLicenseAcceptance> 11 <requireLicenseAcceptance>false</requireLicenseAcceptance>
11 <copyright>$copyright$</copyright> 12 <copyright>$copyright$</copyright>
12 <projectUrl>$projectUrl$</projectUrl> 13 <projectUrl>$projectUrl$</projectUrl>
13 <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" /> 14 <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
14 <dependencies> 15 <dependencies>
15 <dependency id="WixToolset.Mba.Core" version="[$version$,5)" /> 16 <dependency id="WixToolset.Mba.Core" version="[$version$,5)" />
16 </dependencies> 17 </dependencies>
17 </metadata> 18 </metadata>
18 19
19 <files> 20 <files>
21 <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
20 <file src="$id$.dll" target="analyzers/dotnet/cs" /> 22 <file src="$id$.dll" target="analyzers/dotnet/cs" />
21 <file src="build\**\*" target="build" /> 23 <file src="build\**\*" target="build" />
22 </files> 24 </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 @@
1<?xml version="1.0"?> 1<?xml version="1.0" encoding="utf-8"?>
2<package > 2<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
3 <metadata> 3 <metadata>
4 <id>$id$</id> 4 <id>$id$</id>
5 <version>$version$</version> 5 <version>$version$</version>
6 <authors>WiX Toolset Team</authors> 6 <title>$title$</title>
7 <owners>WiX Toolset Team</owners> 7 <description>$description$</description>
8 <authors>$authors$</authors>
9 <icon>wix.png</icon>
8 <license type="expression">MS-RL</license> 10 <license type="expression">MS-RL</license>
9 <projectUrl>https://github.com/wixtoolset/Bal.wixext</projectUrl>
10 <requireLicenseAcceptance>false</requireLicenseAcceptance> 11 <requireLicenseAcceptance>false</requireLicenseAcceptance>
11 <description>$description$</description>
12 <copyright>$copyright$</copyright> 12 <copyright>$copyright$</copyright>
13 <projectUrl>$projectUrl$</projectUrl>
13 <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" /> 14 <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
14 <dependencies> 15 <dependencies>
15 <group targetFramework=".NETFramework2.0" /> 16 <group targetFramework=".NETFramework2.0" />
@@ -17,6 +18,7 @@
17 </metadata> 18 </metadata>
18 19
19 <files> 20 <files>
21 <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
20 <file src="net20\$id$.config" target="samples" /> 22 <file src="net20\$id$.config" target="samples" />
21 <file src="net20\$id$.dll" target="lib\net20" /> 23 <file src="net20\$id$.dll" target="lib\net20" />
22 </files> 24 </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 @@
3 3
4<Project> 4<Project>
5 <PropertyGroup> 5 <PropertyGroup>
6 <PackageIcon>wix.png</PackageIcon>
7 <IncludeBuildOutput>false</IncludeBuildOutput> 6 <IncludeBuildOutput>false</IncludeBuildOutput>
8 <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking> 7 <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
9 <NoWarn>NU5100</NoWarn> 8 <NoWarn>NU5100</NoWarn>
10 </PropertyGroup> 9 </PropertyGroup>
11 10
12 <ItemGroup> 11 <ItemGroup>
13 <Content Include="$(MSBuildThisFileDirectory)..\internal\images\wix.png" PackagePath="/" />
14 <Content Include="$(MSBuildProjectName).targets" PackagePath="build" /> 12 <Content Include="$(MSBuildProjectName).targets" PackagePath="build" />
15 <Content Include="$(TargetPath)" PackagePath="wixext4" /> 13 <Content Include="$(TargetPath)" PackagePath="wixext4" />
16 14
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 @@
1<?xml version="1.0"?> 1<?xml version="1.0" encoding="utf-8"?>
2<package > 2<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
3 <metadata minClientVersion="4.0"> 3 <metadata minClientVersion="4.0">
4 <id>$id$</id> 4 <id>$id$</id>
5 <version>$version$</version> 5 <version>$version$</version>
6 <title>$title$</title> 6 <title>$title$</title>
7 <description>$description$</description> 7 <description>$description$</description>
8 <authors>$authors$</authors> 8 <authors>$authors$</authors>
9 <icon>wix.png</icon>
9 <license type="expression">MS-RL</license> 10 <license type="expression">MS-RL</license>
10 <requireLicenseAcceptance>false</requireLicenseAcceptance> 11 <requireLicenseAcceptance>false</requireLicenseAcceptance>
11 <copyright>$copyright$</copyright> 12 <copyright>$copyright$</copyright>
@@ -15,6 +16,7 @@
15 16
16 <files> 17 <files>
17 <file src="$projectFolder$\build\$id$.props" target="build\" /> 18 <file src="$projectFolder$\build\$id$.props" target="build\" />
19 <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
18 <file src="$projectFolder$\inc\*" target="build\native\include" /> 20 <file src="$projectFolder$\inc\*" target="build\native\include" />
19 <file src="..\..\v141\x64\dutil.lib" target="build\native\v14\x64" /> 21 <file src="..\..\v141\x64\dutil.lib" target="build\native\v14\x64" />
20 <file src="..\..\v141\x86\dutil.lib" target="build\native\v14\x86" /> 22 <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 @@
6 <title>$title$</title> 6 <title>$title$</title>
7 <description>$description$</description> 7 <description>$description$</description>
8 <authors>$authors$</authors> 8 <authors>$authors$</authors>
9 <icon>wix.png</icon>
9 <license type="expression">MS-RL</license> 10 <license type="expression">MS-RL</license>
10 <requireLicenseAcceptance>false</requireLicenseAcceptance> 11 <requireLicenseAcceptance>false</requireLicenseAcceptance>
11 <copyright>$copyright$</copyright> 12 <copyright>$copyright$</copyright>
@@ -18,6 +19,7 @@
18 19
19 <files> 20 <files>
20 <file src="$projectFolder$\build\$id$.props" target="build\" /> 21 <file src="$projectFolder$\build\$id$.props" target="build\" />
22 <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
21 <file src="$projectFolder$\inc\*" target="build\native\include" /> 23 <file src="$projectFolder$\inc\*" target="build\native\include" />
22 <file src="..\..\v141\x64\wcautil.lib" target="build\native\v14\x64" /> 24 <file src="..\..\v141\x64\wcautil.lib" target="build\native\v14\x64" />
23 <file src="..\..\v141\x86\wcautil.lib" target="build\native\v14\x86" /> 25 <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 @@
6 <title>$title$</title> 6 <title>$title$</title>
7 <description>$description$</description> 7 <description>$description$</description>
8 <authors>$authors$</authors> 8 <authors>$authors$</authors>
9 <icon>wix.png</icon>
9 <license type="expression">MS-RL</license> 10 <license type="expression">MS-RL</license>
10 <requireLicenseAcceptance>false</requireLicenseAcceptance> 11 <requireLicenseAcceptance>false</requireLicenseAcceptance>
11 <copyright>$copyright$</copyright> 12 <copyright>$copyright$</copyright>
@@ -15,6 +16,7 @@
15 16
16 <files> 17 <files>
17 <file src="$projectFolder$\$id$.targets" target="build" /> 18 <file src="$projectFolder$\$id$.targets" target="build" />
19 <file src="$projectFolder$\..\..\internal\images\wix.png" />
18 <file src="tools\**\*" target="tools" /> 20 <file src="tools\**\*" target="tools" />
19 </files> 21 </files>
20</package> 22</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 @@
6 <title>$title$</title> 6 <title>$title$</title>
7 <description>$description$</description> 7 <description>$description$</description>
8 <authors>$authors$</authors> 8 <authors>$authors$</authors>
9 <icon>wix.png</icon>
9 <license type="expression">MS-RL</license> 10 <license type="expression">MS-RL</license>
10 <requireLicenseAcceptance>false</requireLicenseAcceptance> 11 <requireLicenseAcceptance>false</requireLicenseAcceptance>
11 <copyright>$copyright$</copyright> 12 <copyright>$copyright$</copyright>
@@ -14,6 +15,7 @@
14 </metadata> 15 </metadata>
15 16
16 <files> 17 <files>
18 <file src="$projectFolder$\..\..\internal\images\wix.png" />
17 <file src="build\**\*" target="build" /> 19 <file src="build\**\*" target="build" />
18 <file src="Sdk\**\*" target="Sdk" /> 20 <file src="Sdk\**\*" target="Sdk" />
19 <file src="tools\**\*" target="tools" exclude="**\*.xml;**\WixToolset.Core.Native.targets" /> 21 <file src="tools\**\*" target="tools" exclude="**\*.xml;**\WixToolset.Core.Native.targets" />
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-16 23:19:03 +0000