集中安装器品牌资源

XP.Installer/README.md

@@ -1,5 +1,18 @@
 # XP.Installer
 
+## Branding resources
+
+Product branding is centralized in `Branding`. Update these files for a new product identity:
+
+- `MsiProductIcon.ico` — MSI product icon
+- `BundleIcon.ico` — Burn bundle and WPF icon
+- `ProductIcon.png` — WPF installer product image
+- `CompanyLogo.jpg`, `ProductLogo.jpg`, `ProductLogoHeader.jpg` — MSI logos
+- `Splash.bmp` — bundle splash screen
+- `License\\` — localized license files
+
+The MSI, Burn bundle, and WPF installer projects reference these files directly. The old resource folders retain only generic installer resources.
+
 独立的 WiX 安装包解决方案，采用“两层式安装包”结构：
 
 ```text

XP.Installer/Setup/BundleInstaller/Setup.wxs

@@ -49,7 +49,7 @@
     </Condition>
 
   <!--Add App Tools icons for Start Menu shortcuts-->
-    <Icon Id="product.ico" SourceFile="UIRESOURCE\product.ico" />
+    <Icon Id="product.ico" SourceFile="..\..\Branding\MsiProductIcon.ico" />
 
   <!--App Tools Icon for Add/Remove-->
     <Property Id="ARPPRODUCTICON" Value="product.ico" />
@@ -137,9 +137,9 @@
     <Binary Id="info" SourceFile="UIresource\Info.ico" />
     <Binary Id="bannrbmp" SourceFile="UIresource\Banner.jpg" />
     <Binary Id="dlgbmp" SourceFile="UIresource\DialogWAI.jpg" />
-    <Binary Id="companylogo" SourceFile="UIresource\companylogo.jpg" />
-    <Binary Id="productlogo" SourceFile="UIresource\productlogo.jpg" />
-    <Binary Id="productlogoheader" SourceFile="UIresource\productlogoheader.jpg" />
+    <Binary Id="companylogo" SourceFile="..\..\Branding\CompanyLogo.jpg" />
+    <Binary Id="productlogo" SourceFile="..\..\Branding\ProductLogo.jpg" />
+    <Binary Id="productlogoheader" SourceFile="..\..\Branding\ProductLogoHeader.jpg" />
     <Binary Id="whitebg" SourceFile="UIresource\WhiteBG.bmp" />
 
   <!--Setting License Properties with RegistrySearch-->

XP.Installer/Setup/BundleInstaller/WPFInstaller.Ui/Bootstrapper.Ui.csproj

@@ -294,7 +294,9 @@
     <Resource Include="Resources\Hexagon_Color.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
-    <Resource Include="Resources\ProductIcon.png" />
+    <Resource Include="..\..\..\Branding\ProductIcon.png">
+      <Link>Resources\ProductIcon.png</Link>
+    </Resource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
@@ -315,7 +317,9 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="Resources\icon.ico" />
+    <Resource Include="..\..\..\Branding\BundleIcon.ico">
+      <Link>Resources\icon.ico</Link>
+    </Resource>
   </ItemGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>

XP.Installer/Setup/BundleInstaller/WPFInstaller.Ui/Resources/TODO.txt

@@ -1,2 +1,2 @@
-Replace BundleInstaller\WPFInstaller.Ui\Resources\ProductIcon.png file with the image for your product. 256x256 is good.
-Replace BundleInstaller\WPFInstaller.Ui\Resources\icon.ico file with the icon for your product. 
+Product branding is centralized in ..\..\..\Branding.
+Replace Branding\ProductIcon.png and Branding\BundleIcon.ico there if needed. 256x256 is good for ProductIcon.png.

XP.Installer/Setup/BundleInstaller/WPFInstaller/Bootstrapper.wixproj

@@ -83,58 +83,58 @@
     </WixExtension>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Resources\icon.ico" />
-    <Content Include="Resources\splash.bmp" />
-    <Content Include="Resources\license.rtf" />
-    <None Include="Resources\VisualInstaller\Localization\license_cs-CZ.RTF">
+    <Content Include="..\..\..\Branding\BundleIcon.ico" />
+    <Content Include="..\..\..\Branding\Splash.bmp" />
+    <Content Include="..\..\..\Branding\License\license.rtf" />
+    <None Include="..\..\..\Branding\License\license_cs-CZ.RTF">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="Resources\VisualInstaller\Localization\license_de-DE.RTF">
+    <None Include="..\..\..\Branding\License\license_de-DE.RTF">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="Resources\VisualInstaller\Localization\license_en-US.RTF">
+    <None Include="..\..\..\Branding\License\license_en-US.RTF">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="Resources\VisualInstaller\Localization\license_es-ES.RTF">
+    <None Include="..\..\..\Branding\License\license_es-ES.RTF">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="Resources\VisualInstaller\Localization\license_fr-FR.RTF">
+    <None Include="..\..\..\Branding\License\license_fr-FR.RTF">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="Resources\VisualInstaller\Localization\license_hu-HU.RTF">
+    <None Include="..\..\..\Branding\License\license_hu-HU.RTF">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="Resources\VisualInstaller\Localization\license_it-IT.RTF">
+    <None Include="..\..\..\Branding\License\license_it-IT.RTF">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="Resources\VisualInstaller\Localization\license_ja-JP.RTF">
+    <None Include="..\..\..\Branding\License\license_ja-JP.RTF">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="Resources\VisualInstaller\Localization\license_ko-KR.RTF">
+    <None Include="..\..\..\Branding\License\license_ko-KR.RTF">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="Resources\VisualInstaller\Localization\license_pl-PL.RTF">
+    <None Include="..\..\..\Branding\License\license_pl-PL.RTF">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="Resources\VisualInstaller\Localization\license_pt-PT.RTF">
+    <None Include="..\..\..\Branding\License\license_pt-PT.RTF">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="Resources\VisualInstaller\Localization\license_nl-NL.RTF">
+    <None Include="..\..\..\Branding\License\license_nl-NL.RTF">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="Resources\VisualInstaller\Localization\license_ru-RU.RTF">
+    <None Include="..\..\..\Branding\License\license_ru-RU.RTF">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="Resources\VisualInstaller\Localization\license_sv-SE.RTF">
+    <None Include="..\..\..\Branding\License\license_sv-SE.RTF">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="Resources\VisualInstaller\Localization\license_tr-TR.RTF">
+    <None Include="..\..\..\Branding\License\license_tr-TR.RTF">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="Resources\VisualInstaller\Localization\license_zh-CN.RTF">
+    <None Include="..\..\..\Branding\License\license_zh-CN.RTF">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="Resources\VisualInstaller\Localization\license_zh-TW.RTF">
+    <None Include="..\..\..\Branding\License\license_zh-TW.RTF">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
   </ItemGroup>
@@ -201,4 +201,4 @@
       <RefTargetDir>INSTALLFOLDER</RefTargetDir>
     </ProjectReference>
   </ItemGroup>
-</Project>
+</Project>

XP.Installer/Setup/BundleInstaller/WPFInstaller/Bundle.wxs

@@ -29,8 +29,8 @@
     Copyright="$(var.PRODUCT_COPYRIGHT)"
     UpgradeCode="$(var.BUNDLE_UPGRADECODE_GUID)"
     HelpUrl="$(var.INSTALLED_PRODUCT_URL)"
-    SplashScreenSourceFile="Resources\splash.bmp"
-    IconSourceFile="Resources\icon.ico"
+    SplashScreenSourceFile="..\..\..\Branding\Splash.bmp"
+    IconSourceFile="..\..\..\Branding\BundleIcon.ico"
     Compressed="yes"
     DisableModify="yes">
 
@@ -1237,4 +1237,4 @@
       Condition='INSTALLNOTIFICATIONCENTEREXISTS AND NOT(HNC_INSTALLED = 1)'
       After='RegistrySearchNotificationCenterExists'/>
   </Fragment>
-</Wix>
+</Wix>

XP.Installer/Setup/BundleInstaller/WPFInstaller/Resources/TODO.txt

@@ -1,3 +1,2 @@
-Replace BundleInstaller\WPFInstaller\Resources\icon.ico for the Product icon of your project
-This is compiled into bundle installer.
-Replace BundleInstaller\WPFInstaller\Resources\Splash.bmp if needed
+Product branding is centralized in ..\..\..\Branding.
+Replace Branding\BundleIcon.ico and Branding\Splash.bmp there if needed.

XP.Installer/Setup/BundleInstaller/WPFInstaller/Resources/VisualInstaller/VisualInstallerPayload.wxs

@@ -25,29 +25,29 @@
       <Payload SourceFile="..\WPFInstaller.Ui\bin\Release\Microsoft.Expression.Drawing.dll" />
       <Payload SourceFile="..\WPFInstaller.Ui\bin\Release\Cannoli.Icon.dll" />
       <!-- resource payload files -->
-      <Payload SourceFile="Resources\license.rtf" />
-      <Payload SourceFile="Resources\VisualInstaller\Localization\license_cs-CZ.rtf" />
-      <Payload SourceFile="Resources\VisualInstaller\Localization\license_de-DE.rtf" />
-      <Payload SourceFile="Resources\VisualInstaller\Localization\license_en-US.rtf" />
-      <Payload SourceFile="Resources\VisualInstaller\Localization\license_es-ES.rtf" />
-      <Payload SourceFile="Resources\VisualInstaller\Localization\license_fr-FR.rtf" />
-      <Payload SourceFile="Resources\VisualInstaller\Localization\license_hu-HU.rtf" />
-      <Payload SourceFile="Resources\VisualInstaller\Localization\license_it-IT.rtf" />
-      <Payload SourceFile="Resources\VisualInstaller\Localization\license_ja-JP.rtf" />
-      <Payload SourceFile="Resources\VisualInstaller\Localization\license_ko-KR.rtf" />
-      <Payload SourceFile="Resources\VisualInstaller\Localization\license_pl-PL.rtf" />
-      <Payload SourceFile="Resources\VisualInstaller\Localization\license_pt-PT.rtf" />
-      <Payload SourceFile="Resources\VisualInstaller\Localization\license_nl-NL.rtf" />
-      <Payload SourceFile="Resources\VisualInstaller\Localization\license_ru-RU.rtf" />
-      <Payload SourceFile="Resources\VisualInstaller\Localization\license_sv-SE.rtf" />
-      <Payload SourceFile="Resources\VisualInstaller\Localization\license_tr-TR.rtf" />
-      <Payload SourceFile="Resources\VisualInstaller\Localization\license_zh-CN.rtf" />
-      <Payload SourceFile="Resources\VisualInstaller\Localization\license_zh-TW.rtf" />
+      <Payload SourceFile="..\..\..\..\..\Branding\License\license.rtf" />
+      <Payload SourceFile="..\..\..\..\..\Branding\License\license_cs-CZ.RTF" />
+      <Payload SourceFile="..\..\..\..\..\Branding\License\license_de-DE.RTF" />
+      <Payload SourceFile="..\..\..\..\..\Branding\License\license_en-US.RTF" />
+      <Payload SourceFile="..\..\..\..\..\Branding\License\license_es-ES.RTF" />
+      <Payload SourceFile="..\..\..\..\..\Branding\License\license_fr-FR.RTF" />
+      <Payload SourceFile="..\..\..\..\..\Branding\License\license_hu-HU.RTF" />
+      <Payload SourceFile="..\..\..\..\..\Branding\License\license_it-IT.RTF" />
+      <Payload SourceFile="..\..\..\..\..\Branding\License\license_ja-JP.RTF" />
+      <Payload SourceFile="..\..\..\..\..\Branding\License\license_ko-KR.RTF" />
+      <Payload SourceFile="..\..\..\..\..\Branding\License\license_pl-PL.RTF" />
+      <Payload SourceFile="..\..\..\..\..\Branding\License\license_pt-PT.RTF" />
+      <Payload SourceFile="..\..\..\..\..\Branding\License\license_nl-NL.RTF" />
+      <Payload SourceFile="..\..\..\..\..\Branding\License\license_ru-RU.RTF" />
+      <Payload SourceFile="..\..\..\..\..\Branding\License\license_sv-SE.RTF" />
+      <Payload SourceFile="..\..\..\..\..\Branding\License\license_tr-TR.RTF" />
+      <Payload SourceFile="..\..\..\..\..\Branding\License\license_zh-CN.RTF" />
+      <Payload SourceFile="..\..\..\..\..\Branding\License\license_zh-TW.RTF" />
       <Payload SourceFile="$(var.VisualInstallerUiOutDir)Resources\ok.png" />
       <Payload SourceFile="$(var.VisualInstallerUiOutDir)Resources\notok.png" />
       <Payload SourceFile="$(var.VisualInstallerUiOutDir)Resources\warning.png" />
 
-      <Payload SourceFile="Resources\icon.ico" />
+      <Payload SourceFile="..\..\..\..\..\Branding\BundleIcon.ico" />
       <Payload SourceFile="Resources\Hexagon_White.png" />
       <!-- Localization resource payload files -->
       <Payload SourceFile="Resources\VisualInstaller\Localization\cs-CZ.wxl" />
@@ -86,4 +86,4 @@
       <Payload SourceFile="Resources\VisualInstaller\Localization\systemvalidation_zh-TW.wxl" />
     </PayloadGroup>
   </Fragment>
-</Wix>
+</Wix>