Merge pull request #937 from dorssel/swidtag

Add SWID Tag
dorssel · May 25, 2024 · 4f450db · 4f450db
2 parents 4198b01 + d6c5714
commit 4f450db
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/Installer/Installer.wixproj b/Installer/Installer.wixproj
@@ -12,7 +12,7 @@ SPDX-License-Identifier: GPL-3.0-only
     <OutputName>usbipd-win</OutputName>
     <PublishDir>..\Usbipd\bin\publish</PublishDir>
     <PowerShellDir>..\Usbipd.PowerShell\bin\$(Configuration)\netstandard2.0</PowerShellDir>
-    <DefineConstants>PublishDir=$(PublishDir);PowerShellDir=$(PowerShellDir);DriversDir=..\Drivers;Year=$([System.DateTime]::UtcNow.ToString("yyyy"))</DefineConstants>
+    <DefineConstants>PublishDir=$(PublishDir);PowerShellDir=$(PowerShellDir);DriversDir=..\Drivers;Copyright=$(Copyright)</DefineConstants>
     <Pedantic>true</Pedantic>
   </PropertyGroup>
   <ItemGroup>

diff --git a/Installer/Product.wxs b/Installer/Product.wxs
@@ -9,14 +9,18 @@ SPDX-License-Identifier: GPL-3.0-only
         ProductCode="$(var.ProductCode)"
         Name="usbipd-win"
         Language="1033"
+        Codepage="0"
         Version="$(var.GitVersion_MajorMinorPatch)"
         Manufacturer="Frans van Dorsselaer"
         UpgradeCode="{EA1D5623-E6A7-4E4A-9259-E3972226646F}"
+        UpgradeStrategy="majorUpgrade"
         InstallerVersion="500"
         Compressed="yes"
         Scope="perMachine"
         >
 
+        <SoftwareTag xml:lang="en-us" InstallDirectory="APPLICATIONFOLDER" Regid="github.com/dorssel" />
+
         <?ifdef Debug ?>
         <MediaTemplate EmbedCab="yes" CompressionLevel="none" />
         <?else?>

diff --git a/Installer/UserInterface.wxs b/Installer/UserInterface.wxs
@@ -280,8 +280,7 @@ SPDX-License-Identifier: GPL-3.0-only
                 <Control
                     Id="License" Type="Hyperlink" X="30" Y="202" Width="310" Height="24"
                     ToolTip ="Open the license in your browser"
-                    Text="{\Caption}Copyright © $(var.Year)
-Published under the terms of the &lt;a href=&quot;https://www.gnu.org/licenses/gpl-3.0.html&quot;&gt;GNU General Public License, version 3&lt;/a&gt;."
+                    Text="{\Caption}$(var.Copyright)&#10;Published under the terms of the &lt;a href=&quot;https://www.gnu.org/licenses/gpl-3.0.html&quot;&gt;GNU General Public License, version 3&lt;/a&gt;."
                     />
             </Dialog>