Merge pull request #35 from dorssel/installer_ui

Improve installer UI

Author: dorssel

.gitattributes

@@ -9,10 +9,10 @@
 .gitignore       text
 .editorconfig    text
 .json            text
+.license         text
 
 *.md    text
 *.txt   text
-*.rtf   text
 
 *.yml   text
 
@@ -25,6 +25,8 @@
 *.wixproj   text
 *.wxs       text
 *.xslt      text
+*.png       binary
+*.xcf       binary
 
 # VBoxUsb drivers
 *.cat   binary

GitVersion.yml

@@ -3,3 +3,4 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
 assembly-file-versioning-format: '{Major}.{Minor}.{Patch}.{env:GITHUB_RUN_NUMBER ?? 0}'
+next-version: 1.0.0

Installer/COPYING.rtf

@@ -28,14 +28,14 @@ SPDX-License-Identifier: GPL-2.0-only
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     <OutputPath>bin\$(Configuration)\</OutputPath>
-    <DefineConstants>Debug;PublishDir=$(PublishDir);DriversDir=$(ProjectDir)..\Drivers</DefineConstants>
+    <DefineConstants>Debug;PublishDir=$(PublishDir);DriversDir=$(ProjectDir)..\Drivers;Year=$([System.DateTime]::UtcNow.ToString("yyyy"))</DefineConstants>
     <Cultures>en-US</Cultures>
     <SuppressAllWarnings>False</SuppressAllWarnings>
     <Pedantic>True</Pedantic>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
     <OutputPath>bin\$(Configuration)\</OutputPath>
-    <DefineConstants>PublishDir=$(PublishDir);DriversDir=$(ProjectDir)..\Drivers</DefineConstants>
+    <DefineConstants>PublishDir=$(PublishDir);DriversDir=$(ProjectDir)..\Drivers;Year=$([System.DateTime]::UtcNow.ToString("yyyy"))</DefineConstants>
     <Cultures>en-US</Cultures>
     <SuppressAllWarnings>False</SuppressAllWarnings>
     <Pedantic>True</Pedantic>
@@ -45,7 +45,6 @@ SPDX-License-Identifier: GPL-2.0-only
     <Compile Include="Server.wxs" />
     <Compile Include="Product.wxs" />
     <Compile Include="UserInterface.wxs" />
-    <Content Include="COPYING.rtf" />
     <Content Include="HarvestTransform.xslt" />
     <HarvestDirectory Include="$(PublishDir)" Visible="false">
       <DirectoryRefId>APPLICATIONFOLDER</DirectoryRefId>

Installer/Installer.wixproj

@@ -37,6 +37,8 @@ SPDX-License-Identifier: GPL-2.0-only
         <Property Id="ARPURLUPDATEINFO">https://github.com/dorssel/usbipd-win/releases</Property>
         <Property Id="ARPHELPLINK">https://github.com/dorssel/usbipd-win/issues</Property>
 
+        <Property Id="MSIDEPLOYMENTCOMPLIANT" Value="1" />
+
         <Feature
             Id="Server"
             Level="1"

Installer/Product.wxs

@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2021 Frans van Dorsselaer
+
+SPDX-License-Identifier: GPL-2.0-only

Installer/UserInterface.wxs

@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2021 Frans van Dorsselaer
+
+SPDX-License-Identifier: GPL-2.0-only