Formalize official WiX build and update tags in nupkgs

23 files changed, 75 insertions, 43 deletions

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 36e0583c..78720df2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -22,6 +22,8 @@ jobs:
     name: Build
     runs-on: windows-2022
     env:
+      RepoOrg: ${{ github.repository_owner }}
+      SignBuild: ${{ github.repository_owner == 'wixtoolset' && startsWith(github.ref, 'refs/tags/v') }}
       WixOfficialBuild: ${{ github.repository_owner == 'wixtoolset' && startsWith(github.ref, 'refs/tags/v') }}
     permissions:
       packages: write
@@ -37,7 +39,7 @@ jobs:
       #   run: ./src/vs_config.cmd
 
       - name: Install sign tool
-        if: ${{ env.WixOfficialBuild == 'true' }}
+        if: ${{ env.SignBuild == 'true' }}
         shell: cmd
         run: dotnet tool install --tool-path build\.tools sign --version 0.9.1-beta.24170.3
 
@@ -54,7 +56,7 @@ jobs:
           reg add "HKLM\SOFTWARE\WOW6432Node\Microsoft\Windows\Windows Error Reporting\LocalDumps" /t REG_DWORD /v DumpType /d 1
 
       # - name: 'Az CLI login'
-      #   if: ${{ env.WixOfficialBuild == 'true' }}
+      #   if: ${{ env.SignBuild == 'true' }}
       #   uses: azure/login@v1
       #   with:
       #     allow-no-subscriptions: true
@@ -66,11 +68,11 @@ jobs:
         run: ./src/build_official.cmd
         env:
           RuntimeTestsEnabled: true
-          SigningKeyVaultUri:  ${{ env.WixOfficialBuild == 'true' && secrets.WIX_SIGNING_VAULTURI || '' }}
-          SigningTenantId:  ${{ env.WixOfficialBuild == 'true' && secrets.WIX_SIGNING_TENANTID || '' }}
-          SigningClientId:  ${{ env.WixOfficialBuild == 'true' && secrets.WIX_SIGNING_CLIENTID || '' }}
-          SigningClientSecret:  ${{ env.WixOfficialBuild == 'true' && secrets.WIX_SIGNING_SECRET || '' }}
-          SigningCertName:  ${{ env.WixOfficialBuild == 'true' && secrets.WIX_SIGNING_CERTNAME || '' }}
+          SigningKeyVaultUri:  ${{ env.SignBuild == 'true' && secrets.WIX_SIGNING_VAULTURI || '' }}
+          SigningTenantId:  ${{ env.SignBuild == 'true' && secrets.WIX_SIGNING_TENANTID || '' }}
+          SigningClientId:  ${{ env.SignBuild == 'true' && secrets.WIX_SIGNING_CLIENTID || '' }}
+          SigningClientSecret:  ${{ env.SignBuild == 'true' && secrets.WIX_SIGNING_SECRET || '' }}
+          SigningCertName:  ${{ env.SignBuild == 'true' && secrets.WIX_SIGNING_CERTNAME || '' }}
 
       - name: Validate test results
         shell: cmd
@@ -99,7 +101,7 @@ jobs:
 
       # Do NOT publish logs on `official builds` (version tagged builds) as they may contain secrets in them.
       - name: Save logs
-        if: ${{ env.WixOfficialBuild != 'true' && !cancelled() }}
+        if: ${{ env.SignBuild != 'true' && !cancelled() }}
         uses: actions/upload-artifact@v4
         with:
           name: logs_${{ github.run_id }}
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 4c5c0668..0ca36281 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -27,21 +27,29 @@
     <PlatformToolset Condition=" '$(ConfigurationType)' == 'StaticLibrary' ">$(WixNativeSdkLibraryToolset)</PlatformToolset>
     <PlatformToolset Condition=" '$(PlatformToolset)' == '' ">v143</PlatformToolset>
 
-    <Authors>WiX Toolset Team</Authors>
-    <Company>WiX Toolset</Company>
+    <NuGetAudit>true</NuGetAudit>
+    <NuGetAuditMode>all</NuGetAuditMode>
+    <NuGetAuditLevel>low</NuGetAuditLevel>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <Authors Condition=" '$(WixOfficialBuild)'!='true' ">Private WiX Build</Authors>
+    <Authors Condition=" '$(WixOfficialBuild)'=='true' ">WiX Toolset Team</Authors>
+    <Company Condition=" '$(WixOfficialBuild)'!='true' ">Private WiX Build</Company>
+    <Company Condition=" '$(WixOfficialBuild)'=='true' ">WiX Toolset</Company>
     <Copyright>Copyright (c) .NET Foundation and contributors. All rights reserved.</Copyright>
 
     <PackageEulaSource>$(RootFolder)OSMFEULA.txt</PackageEulaSource>
     <PackageLicenseFile>OSMFEULA.txt</PackageLicenseFile>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
 
-    <Product>WiX Toolset</Product>
+    <Product Condition=" '$(WixOfficialBuild)'!='true' ">Private WiX Build</Product>
+    <Product Condition=" '$(WixOfficialBuild)'=='true' ">WiX Toolset</Product>
     <ProjectUrl>https://wixtoolset.org/</ProjectUrl>
-    <PackageIcon>wix.png</PackageIcon>
-
-    <NuGetAudit>true</NuGetAudit>
-    <NuGetAuditMode>all</NuGetAuditMode>
-    <NuGetAuditLevel>low</NuGetAuditLevel>
+    <PackageIcon>icon.png</PackageIcon>
+    <PackageIconSource Condition=" '$(WixOfficialBuild)'!='true' ">$(MSBuildThisFileDirectory)internal\images\icon.png</PackageIconSource>
+    <PackageIconSource Condition=" '$(WixOfficialBuild)'=='true' ">$(MSBuildThisFileDirectory)internal\images\official\icon.png</PackageIconSource>
+    <PackageTags>WiX MSI install setup</PackageTags>
   </PropertyGroup>
 
   <Import Project="Directory$(MSBuildProjectExtension).props" Condition=" Exists('Directory$(MSBuildProjectExtension).props') " />
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index 91aadf5b..7083da38 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -32,7 +32,8 @@
   <PropertyGroup>
     <GenerateNuspecDependsOn>
       $(GenerateNuspecDependsOn);
-      __SetNuspecProperties
+      __SetNuspecProperties;
+      VerifyOfficialBuild
     </GenerateNuspecDependsOn>
   </PropertyGroup>
 
@@ -46,7 +47,8 @@
       <NuspecProperties>$(NuspecProperties);Id=$(PackageId);Version=$(PackageVersion);MajorVersion=$(SomeVerInfoMajor);NextMajorVersion=$(SomeVerInfoNextMajor);Authors=$(Authors);Configuration=$(Configuration)</NuspecProperties>
       <NuspecProperties>$(NuspecProperties);Copyright=$(Copyright);Description=$(Description);Title=$(Title)</NuspecProperties>
       <NuspecProperties>$(NuspecProperties);RepositoryType=$(RepositoryType);RepositoryCommit=$(RepositoryCommit);RepositoryUrl=$(RepositoryUrl)</NuspecProperties>
-      <NuspecProperties>$(NuspecProperties);ProjectUrl=$(ProjectUrl);ProjectFolder=$(MSBuildProjectDirectory);RootFolder=$(RootFolder);EulaTxt=$(PackageEulaSource)</NuspecProperties>
+      <NuspecProperties>$(NuspecProperties);PackageTags=$(PackageTags)</NuspecProperties>
+      <NuspecProperties>$(NuspecProperties);ProjectUrl=$(ProjectUrl);ProjectFolder=$(MSBuildProjectDirectory);RootFolder=$(RootFolder);EulaTxt=$(PackageEulaSource);IconPng=$(PackageIconSource)</NuspecProperties>
     </PropertyGroup>
   </Target>
 
@@ -97,6 +99,11 @@
           WorkingDirectory="$(MSBuildProjectDirectory)" EchoOff="true" />
   </Target>
 
+  <Target Name="VerifyOfficialBuild" Condition=" '$(WixOfficialBuild)'=='true' ">
+    <Error Text="Official builds are only supported in the WiX Toolset repo. You are welcome to create your own builds but please do not use the official WiX Toolset name or logo."
+           Condition=" '$(RepoOrg)'!='wixtoolset' " />
+  </Target>
+
   <Import Project="Directory$(MSBuildProjectExtension).targets" Condition=" Exists('Directory$(MSBuildProjectExtension).targets') " />
   <Import Project="Custom.Build.targets" Condition=" Exists('Custom.Build.targets') " />
 </Project>
diff --git a/src/Directory.csproj.props b/src/Directory.csproj.props
index 57111c40..c926f263 100644
--- a/src/Directory.csproj.props
+++ b/src/Directory.csproj.props
@@ -11,6 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(IsWixTestProject)'!='true' ">
-    <Content Include="$(MSBuildThisFileDirectory)internal\images\wix.png" PackagePath="/" />
+    <Content Include="$(PackageEulaSource)" Pack="true" PackagePath="/" />
+    <Content Include="$(PackageIconSource)" Pack="true" PackagePath="/" />
   </ItemGroup>
 </Project>
diff --git a/src/Directory.wixproj.targets b/src/Directory.wixproj.targets
index b36bca75..142342e9 100644
--- a/src/Directory.wixproj.targets
+++ b/src/Directory.wixproj.targets
@@ -14,7 +14,8 @@
         SetupMajorMinorVersion=$(SomeVerInfoMajor).$(SomeVerInfoMinor);
         SetupMajorMinorPatchVersion=$(SomeVerInfoMajor).$(SomeVerInfoMinor).$(SomeVerInfoPatch);
         SetupDashedMajorMinorVersion=$(SomeVerInfoMajor)-$(SomeVerInfoMinor);
-        SetupDashedPrerelease=$(PrereleaseSuffix)
+        SetupDashedPrerelease=$(PrereleaseSuffix);
+        Company=$(Company);
       </DefineConstants>
     </PropertyGroup>
   </Target>
diff --git a/src/api/burn/WixToolset.BootstrapperApplicationApi/WixToolset.BootstrapperApplicationApi.nuspec b/src/api/burn/WixToolset.BootstrapperApplicationApi/WixToolset.BootstrapperApplicationApi.nuspec
index 61c19117..63acc895 100644
--- a/src/api/burn/WixToolset.BootstrapperApplicationApi/WixToolset.BootstrapperApplicationApi.nuspec
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/WixToolset.BootstrapperApplicationApi.nuspec
@@ -6,9 +6,10 @@
     <title>$title$</title>
     <description>$description$</description>
     <authors>$authors$</authors>
-    <icon>wix.png</icon>
+    <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$" />
@@ -23,7 +24,7 @@
 
   <files>
     <file src="$eulaTxt$" />
-    <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
+    <file src="$iconPng$" />
 
     <file src="$projectFolder$\build\WixToolset.BootstrapperApplicationApi.props" target="build\" />
 
diff --git a/src/api/burn/bextutil/bextutil.nuspec b/src/api/burn/bextutil/bextutil.nuspec
index 5bb3875c..f790e0b8 100644
--- a/src/api/burn/bextutil/bextutil.nuspec
+++ b/src/api/burn/bextutil/bextutil.nuspec
@@ -6,9 +6,10 @@
     <title>$title$</title>
     <description>$description$</description>
     <authors>$authors$</authors>
-    <icon>wix.png</icon>
+    <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$" />
@@ -19,8 +20,8 @@
 
   <files>
     <file src="$eulaTxt$" />
+    <file src="$iconPng$" />
     <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="$projectFolder$\..\inc\BootstrapperExtensionTypes.h" target="build\native\include" />
     <file src="$projectFolder$\..\inc\BootstrapperExtensionEngineTypes.h" target="build\native\include" />
diff --git a/src/burn/stub/stub.nuspec b/src/burn/stub/stub.nuspec
index 7e868c67..e8506505 100644
--- a/src/burn/stub/stub.nuspec
+++ b/src/burn/stub/stub.nuspec
@@ -8,6 +8,7 @@
     <authors>$authors$</authors>
     <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$" />
diff --git a/src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.nuspec b/src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.nuspec
index 232a3c1d..8eb7110f 100644
--- a/src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.nuspec
+++ b/src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.nuspec
@@ -6,9 +6,10 @@
     <title>$title$</title>
     <description>$description$</description>
     <authors>$authors$</authors>
-    <icon>wix.png</icon>
+    <icon>icon.png</icon>
     <license type="file">OSMFEULA.txt</license>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <tags>$packageTags$ CustomActions</tags>
     <copyright>$copyright$</copyright>
     <projectUrl>$projectUrl$</projectUrl>
     <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
@@ -19,8 +20,8 @@
 
   <files>
     <file src="$eulaTxt$" />
+    <file src="$iconPng$" />
     <file src="$projectFolder$\$id$.targets" target="build" />
-    <file src="$projectFolder$\..\..\internal\images\wix.png" />
     <file src="net472\WixToolset.Dtf.MakeSfxCA.exe" target="tools" />
     <file src="net472\WixToolset.Dtf.MakeSfxCA.exe.config" target="tools" />
     <file src="net472\WixToolset.Dtf.Compression.dll" target="tools" />
diff --git a/src/ext/Bal/wixext-backward-compatible/WixToolset.Bal.wixext.nuspec b/src/ext/Bal/wixext-backward-compatible/WixToolset.Bal.wixext.nuspec
index 2327f0a2..2bebad30 100644
--- a/src/ext/Bal/wixext-backward-compatible/WixToolset.Bal.wixext.nuspec
+++ b/src/ext/Bal/wixext-backward-compatible/WixToolset.Bal.wixext.nuspec
@@ -6,9 +6,10 @@
     <title>$title$</title>
     <description>$description$</description>
     <authors>$authors$</authors>
-    <icon>wix.png</icon>
+    <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$" />
@@ -16,7 +17,7 @@
 
   <files>
     <file src="$eulaTxt$" />
-    <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
+    <file src="$iconPng$" />
     <file src="$projectFolder$\WixToolset.Bal.wixext.targets"  target="build" />
     <file src="WixToolset.BootstrapperApplications.wixext.dll" target="$wixExtensionPackageFolder$" />
   </files>
diff --git a/src/ext/Bal/wixstdfn/wixstdfn.nuspec b/src/ext/Bal/wixstdfn/wixstdfn.nuspec
index 4ca6eadb..86860b67 100644
--- a/src/ext/Bal/wixstdfn/wixstdfn.nuspec
+++ b/src/ext/Bal/wixstdfn/wixstdfn.nuspec
@@ -6,9 +6,10 @@
     <title>$title$</title>
     <description>$description$</description>
     <authors>$authors$</authors>
-    <icon>wix.png</icon>
+    <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$" />
@@ -23,9 +24,9 @@
 
   <files>
     <file src="$eulaTxt$" />
+    <file src="$iconPng$" />
     <file src="$projectFolder$\README.md" />
     <file src="$projectFolder$\build\$id$.props" target="build\" />
-    <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
     <file src="$projectFolder$\inc\*" target="lib\native\include" />
     <file src="..\..\v143\x86\wixstdfn.lib" target="lib\native\v14\x86" />
     <file src="..\..\v143\x64\wixstdfn.lib" target="lib\native\v14\x64" />
diff --git a/src/ext/WixExt.props b/src/ext/WixExt.props
index c6afb59f..538c6b97 100644
--- a/src/ext/WixExt.props
+++ b/src/ext/WixExt.props
@@ -7,6 +7,7 @@
     <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
     <NoWarn>NU5100</NoWarn>
     <WixExtensionPackageFolder>wixext6</WixExtensionPackageFolder>
+    <PackageTags>$(PackageTags) wixext CustomActions</PackageTags>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/internal/images/icon.png b/src/internal/images/icon.png
new file mode 100644
index 00000000..01944a48
--- /dev/null
+++ b/src/internal/images/icon.png
diff --git a/src/internal/images/wix.png b/src/internal/images/official/icon.png
index 9a92155e..9a92155e 100644
--- a/src/internal/images/wix.png
+++ b/src/internal/images/official/icon.png
diff --git a/src/libs/dutil/WixToolset.DUtil/dutil.nuspec b/src/libs/dutil/WixToolset.DUtil/dutil.nuspec
index cd95990a..5c4634e4 100644
--- a/src/libs/dutil/WixToolset.DUtil/dutil.nuspec
+++ b/src/libs/dutil/WixToolset.DUtil/dutil.nuspec
@@ -6,9 +6,10 @@
     <title>$title$</title>
     <description>$description$</description>
     <authors>$authors$</authors>
-    <icon>wix.png</icon>
+    <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$" />
@@ -16,8 +17,8 @@
 
   <files>
     <file src="$eulaTxt$" />
+    <file src="$iconPng$" />
     <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="..\..\v143\x64\dutil.lib" target="build\native\v14\x64" />
     <file src="..\..\v143\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 87c35b52..827a946d 100644
--- a/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec
+++ b/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec
@@ -6,9 +6,10 @@
     <title>$title$</title>
     <description>$description$</description>
     <authors>$authors$</authors>
-    <icon>wix.png</icon>
+    <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$" />
@@ -19,8 +20,8 @@
 
   <files>
     <file src="$eulaTxt$" />
+    <file src="$iconPng$" />
     <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="..\..\v143\x64\wcautil.lib" target="build\native\v14\x64" />
     <file src="..\..\v143\x86\wcautil.lib" target="build\native\v14\x86" />
diff --git a/src/setup/ThmViewerPackage/ThmViewerPackage.wxs b/src/setup/ThmViewerPackage/ThmViewerPackage.wxs
index 66bbe766..0851450e 100644
--- a/src/setup/ThmViewerPackage/ThmViewerPackage.wxs
+++ b/src/setup/ThmViewerPackage/ThmViewerPackage.wxs
@@ -1,6 +1,6 @@
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Id="WixToolset.ThemeViewer.Package" Name="WiX Toolset Theme Viewer" Manufacturer="WiX Toolset" Language="1033" Version="!(bind.fileVersion.ThmViewerFile)">
+  <Package Id="WixToolset.ThemeViewer.Package" Name="WiX Toolset Theme Viewer" Manufacturer="$(Company)" Language="1033" Version="!(bind.fileVersion.ThmViewerFile)">
     <Component>
       <File Id="ThmViewerFile" Source="thmviewer.exe" />
       <Shortcut Name="!(bind.property.ProductName)" Directory="ShortcutFolder" Advertise="yes" />
diff --git a/src/setup/WixAdditionalTools/WixAdditionalTools.wxs b/src/setup/WixAdditionalTools/WixAdditionalTools.wxs
index da8201ee..08dc90fe 100644
--- a/src/setup/WixAdditionalTools/WixAdditionalTools.wxs
+++ b/src/setup/WixAdditionalTools/WixAdditionalTools.wxs
@@ -2,7 +2,7 @@
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
      xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
-  <Bundle Id="WixToolset.WixAdditionalTools" Name="!(loc.Name)" Manufacturer="WiX Toolset" Version="$(SetupVersion)"
+  <Bundle Id="WixToolset.WixAdditionalTools" Name="!(loc.Name)" Manufacturer="$(Company)" Version="$(SetupVersion)"
           AboutUrl="!(loc.AboutUrl)" HelpUrl="!(loc.SupportUrl)" UpdateUrl="!(loc.UpdateUrl)">
     <BootstrapperApplication>
       <bal:WixStandardBootstrapperApplication
diff --git a/src/setup/wix-cli/Package.wxs b/src/setup/wix-cli/Package.wxs
index c3a66973..897a1e5a 100644
--- a/src/setup/wix-cli/Package.wxs
+++ b/src/setup/wix-cli/Package.wxs
@@ -1,7 +1,7 @@
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
      xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
-  <Package Id="WixToolset.CommandLineTools$(SetupMajorVersion).Package" Name="WiX Toolset Command-Line Tools" Manufacturer="WiX Toolset" Version="!(bind.fileVersion.WixExe)">
+  <Package Id="WixToolset.CommandLineTools$(SetupMajorVersion).Package" Name="WiX Toolset Command-Line Tools" Manufacturer="$(Company)" Version="!(bind.fileVersion.WixExe)">
     <MediaTemplate EmbedCab="yes" />
 
     <ComponentGroupRef Id="BinaryFiles" />
diff --git a/src/tools/WixToolset.Heat/WixToolset.Heat.nuspec b/src/tools/WixToolset.Heat/WixToolset.Heat.nuspec
index fea090c3..48e94797 100644
--- a/src/tools/WixToolset.Heat/WixToolset.Heat.nuspec
+++ b/src/tools/WixToolset.Heat/WixToolset.Heat.nuspec
@@ -6,9 +6,10 @@
     <title>$title$</title>
     <description>$description$</description>
     <authors>$authors$</authors>
-    <icon>wix.png</icon>
+    <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$" />
@@ -16,8 +17,8 @@
 
   <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/wix/WixToolset.Core.Native/WixToolset.Core.Native.nuspec b/src/wix/WixToolset.Core.Native/WixToolset.Core.Native.nuspec
index 32ba7614..b5421c1a 100644
--- a/src/wix/WixToolset.Core.Native/WixToolset.Core.Native.nuspec
+++ b/src/wix/WixToolset.Core.Native/WixToolset.Core.Native.nuspec
@@ -8,6 +8,7 @@
     <authors>$authors$</authors>
     <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$" />
diff --git a/src/wix/WixToolset.Sdk/WixToolset.Sdk.nuspec b/src/wix/WixToolset.Sdk/WixToolset.Sdk.nuspec
index 12c121ce..104e5cd8 100644
--- a/src/wix/WixToolset.Sdk/WixToolset.Sdk.nuspec
+++ b/src/wix/WixToolset.Sdk/WixToolset.Sdk.nuspec
@@ -6,9 +6,10 @@
     <title>$title$</title>
     <description>$description$</description>
     <authors>$authors$</authors>
-    <icon>wix.png</icon>
+    <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$" />
@@ -19,7 +20,7 @@
 
   <files>
     <file src="$eulaTxt$" />
-    <file src="$projectFolder$\..\..\internal\images\wix.png" />
+    <file src="$iconPng$" />
     <file src="build\**\*" target="build" />
     <file src="Sdk\**\*" target="Sdk" />
     <file src="tools\**\*" target="tools" exclude="**\*.xml;**\WixToolset.Core.Native.targets" />
diff --git a/src/wix/pack-wix/pack-wix.nuspec b/src/wix/pack-wix/pack-wix.nuspec
index eb065149..cee65f79 100644
--- a/src/wix/pack-wix/pack-wix.nuspec
+++ b/src/wix/pack-wix/pack-wix.nuspec
@@ -6,9 +6,10 @@
     <title>$title$</title>
     <description>$description$</description>
     <authors>$authors$</authors>
-    <icon>wix.png</icon>
+    <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$" />
@@ -19,8 +20,8 @@
 
   <files>
     <file src="$eulaTxt$" />
+    <file src="$iconPng$" />
     <file src="$projectFolder$\DotnetToolSettings.xml" target="tools\net6.0\any" />
-    <file src="$projectFolder$\..\..\internal\images\wix.png" />
     <file src="**" target="tools\net6.0\any" exclude="**\*.xml;**\WixToolset.Core.Native.targets" />
   </files>
 </package>