From b42f34d684ff9d0839a692b8e032a7c068cea150 Mon Sep 17 00:00:00 2001
From: dbuechel <damian.buechel@let.ethz.ch>
Date: Fri, 26 Jul 2019 09:47:14 +0200
Subject: [PATCH] SEBWIN-300: Added license and installer icon.

---
 Setup/Product.wxs                         |   5 ++++-
 Setup/Resources/License.rtf               | Bin 0 -> 2594 bytes
 Setup/{ => Resources}/SafeExamBrowser.ico | Bin
 Setup/Setup.wixproj                       |  17 ++++++++++++++++-
 4 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 Setup/Resources/License.rtf
 rename Setup/{ => Resources}/SafeExamBrowser.ico (100%)

diff --git a/Setup/Product.wxs b/Setup/Product.wxs
index 5e595db4..75fa99cd 100644
--- a/Setup/Product.wxs
+++ b/Setup/Product.wxs
@@ -5,8 +5,11 @@
         <MediaTemplate EmbedCab="yes" />
         <UIRef Id="WixUI_Minimal" />
         <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." AllowSameVersionUpgrades="yes" />
-        <Icon Id="ApplicationIcon" SourceFile="SafeExamBrowser.ico" />
+        <Icon Id="ApplicationIcon" SourceFile="Resources\SafeExamBrowser.ico" />
         <Property Id="ARPPRODUCTICON" Value="ApplicationIcon" />
+        <WixVariable Id="WixUILicenseRtf" Value="Resources\License.rtf" />
+        <!-- <WixVariable Id="WixUIDialogBmp" Value="Resources\Dialog.bmp" /> 493 × 312 -->
+        <!-- <WixVariable Id="WixUIBannerBmp" Value="Resources\Banner.bmp" /> 493 × 58 -->
         <Feature Id="ProductFeature" Title="Safe Exam Browser" Level="1">
             <ComponentGroupRef Id="ApplicationComponents" />
             <ComponentGroupRef Id="Shortcuts" />
diff --git a/Setup/Resources/License.rtf b/Setup/Resources/License.rtf
new file mode 100644
index 0000000000000000000000000000000000000000..4c7f4444ba7108c23d8e19f6435232f02b76ae58
GIT binary patch
literal 2594
zcmb_eUvC;Y5WnY2{SNbVNu$7em!w>pr!*x>RZ^jX6t(h;cXt+i@!Bif3*ivo{l*KV
zv>{P)2SUs4dS*QS{jpha>x-BR?PPPws&Sm0COpTYU|gG8W~Qu!4=<F^<Ct|i3tkxQ
zeX8h&@j^?*i)<pSL(kyCN}<k|G!*|jl)!LariR9rZ{I9<W|Xm11J1d{obj<m)QqR9
z#^m($yoovDW7KGcHx|ChY=U{hAZBgWj=OQ^WXY!zXLnNPC%n#Lc>9J|!sgtGgfZ?^
z(tS_YvQ|FkDKA`d!ow1}Fcbws?_QMf(VCe<3kA(^ONHnu1hP<w%B2i0O*OZ2Jn_&Z
zpYa261__H<i!Nu-8(qT>eo$nV`a6bRUT4BfqlJP`I7MZu614}Ra~NSZ(X{IE91i=v
z(Yy9~l2uQmiF6>UO376Lphs7ye`Dss8}JhZkG6DRiss?Q{3DeTFsM^XfxgU8J3NLd
zT1WFkLMXxK0t95Vf`_a@A7;XVHXd^6yp?I~F^8G-6Ds>_3&$`wHDp4ANxhKtqY;FM
z1(7RJ<qLkq3zbXl{Nnoip!co+`Rf;$cwc>pqH@(=+t_h*Gw4UuPXx=L3zb`^{NkB7
zUMt44f-ULONQ@YPHC#i)7c}6ggE6hCPTQp4C=ed_-q8JfAJ2#HY^RY-X)J=&q@J>2
z9Ykts|5#res@JM&v<O#LlsGf?&cUBR^xM2O5Z2FOXbL|Q7D;|vVtgc!+M#QtP#C4m
zOzJTdKT8J15usF+CZ(cErdC*q?!!uUYqKnPr9IyJVAq3>UG7Cn939bH`l_i)m8TmT
ztTfq!q|BO(d!L5zK#y#7-ZQRbmt3>cdC>ma8~t1@h3c@hZD*}K#gdh$Ze(VSBM{nf
zp%gUkb6}B-I>o#VFPA`Wyhh(H9|{IBJW^p`e`n;&iEq;e(~!Fh&r2+Zv^`dE*dUP-
zkVKYi6cl`YIkBdcbqT#P#XKiFK1k!;(`apWpi!u>nc<@L6Jy=~25!qc85S;dA8l@S
z;`dy_zF_QK!Qp?yiv6`xR)f{kXv4nXOQlci?2e=tw!dsWBd+NUNJcYxC!=dq;!ZeU
zQ{Xl5KB-Zj!WA9rt&15tYN~ZRxC+}(@akiu#wRN{!=Z2GUd7f_jDBxrw`aFC_e9>l
yuo=p-Qg|y1`3x$ZfXXR+l4BVTn|<Q4sTsMZkr_3zQ#V_X>_~Yv8uTyhkADGWhnRo>

literal 0
HcmV?d00001

diff --git a/Setup/SafeExamBrowser.ico b/Setup/Resources/SafeExamBrowser.ico
similarity index 100%
rename from Setup/SafeExamBrowser.ico
rename to Setup/Resources/SafeExamBrowser.ico
diff --git a/Setup/Setup.wixproj b/Setup/Setup.wixproj
index 840314df..3dc273bb 100644
--- a/Setup/Setup.wixproj
+++ b/Setup/Setup.wixproj
@@ -18,6 +18,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <SuppressIces>ICE61</SuppressIces>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Components\Application.wxs" />
@@ -39,8 +40,17 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Components" />
+    <Folder Include="Resources" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\SafeExamBrowser.Client\SafeExamBrowser.Client.csproj">
+      <Name>SafeExamBrowser.Client</Name>
+      <Project>{7cc5a895-e0d3-4e43-9b39-ccec05a5a6a7}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
     <ProjectReference Include="..\SafeExamBrowser.Runtime\SafeExamBrowser.Runtime.csproj">
       <Name>SafeExamBrowser.Runtime</Name>
       <Project>{e3aed2f8-b5df-45d1-ac19-48066923d6d8}</Project>
@@ -51,7 +61,8 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="SafeExamBrowser.ico" />
+    <Content Include="Resources\License.rtf" />
+    <Content Include="Resources\SafeExamBrowser.ico" />
   </ItemGroup>
   <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
@@ -61,6 +72,10 @@
   <PropertyGroup>
     <PreBuildEvent>"$(WIX)bin\heat.exe" dir "$(SolutionDir)SafeExamBrowser.Runtime\bin\$(PlatformName)\$(ConfigurationName)" -nologo -gg -g1 -srd -cg ApplicationComponents -dr ApplicationDirectory -sfrag -var var.SafeExamBrowser.Runtime.TargetDir -out $(ProjectDir)Components\Application.wxs</PreBuildEvent>
   </PropertyGroup>
+  <PropertyGroup>
+    <PostBuildEvent>cd $(SolutionDir)
+git checkout -- Setup/Components/Application.wxs</PostBuildEvent>
+  </PropertyGroup>
   <!--
 	To modify your build process, add your task inside one of the targets below and uncomment it.
 	Other similar extension points exist, see Wix.targets.