From 425bc4682ca4251c0419dc11de61802aa57ab1fd Mon Sep 17 00:00:00 2001
From: Luc Vandenbroucke <lvandenb@sckcen.be>
Date: Mon, 26 Apr 2021 16:14:01 +0200
Subject: [PATCH] met setup msi

---
 SetupProject1/Product.wxs          |  87 ++++++++++++++++++++++++-----
 SetupProject1/eDosSetup.wixproj    |   6 ++
 eDosStation/EntryBadge.xaml.cs     |   1 -
 syncEdosLocal/App.Release.config   |   2 +
 syncEdosLocal/edossync.xml         | Bin 0 -> 3928 bytes
 syncEdosLocal/syncEdosLocal.csproj |   5 ++
 6 files changed, 85 insertions(+), 16 deletions(-)
 create mode 100644 syncEdosLocal/edossync.xml

diff --git a/SetupProject1/Product.wxs b/SetupProject1/Product.wxs
index d67e076..4694492 100644
--- a/SetupProject1/Product.wxs
+++ b/SetupProject1/Product.wxs
@@ -1,31 +1,59 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <?define eDosStation_TargetDir=$(var.eDosStation.TargetDir)?>
+
+  <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+
+    <?define eDosStation_TargetDir=$(var.eDosStation.TargetDir)?>
   <?define eDosSync_TargetDir=$(var.syncEdosLocal.TargetDir)?><?define syncEdosLocal_TargetDir=$(var.syncEdosLocal.TargetDir)?>
-	<Product Id="*" Name="eDosStation" Language="1033" Version="1.0.0.0" Manufacturer="LSW" UpgradeCode="24e037ca-edbb-49d5-85d4-3a93dd7d10d8">
-		<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
+	<Product Id="*" Name="eDosStation" Language="1033" Version="1.0.1.0" Manufacturer="SCK CEN Luc" UpgradeCode="24e037ca-edbb-49d5-85d4-3a93dd7d10d8" >
+		<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" Comments="EPD lees software en synchronisatie tussen local en remote database" InstallPrivileges="elevated" Platform="x86" />
     <Media Id="1" EmbedCab="yes" Cabinet="cab"  />
 		<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
-    
-    <Feature Id="ProductFeature" Title="eDosStation" Level="1">
+    <Feature Id="eDosStationFeature" Title="eDosStation" Level="1">
 			<ComponentGroupRef Id="eDosStation" />
+    </Feature>
+    <Feature Id="eDosSyncFeature" Title="eDosSync" Level="1">
       <ComponentGroupRef Id="eDosSync" />
-		</Feature>
-	</Product>
+      <ComponentGroupRef Id="SyncLog"/>
+    </Feature>
+  </Product>
 
+
+  <Fragment>
+    <CustomAction Id="CreateScheduledTask" Return="check" Directory="eDosSyncFolder"
+                  Execute="deferred" 
+                  Impersonate="no"
+                  ExeCommand="SCHTASKS.EXE /CREATE /TN &quot;EDos Sync&quot; /RP &quot;Infopla+8&quot; /XML &quot;[eDosSyncFolder]\edossync.xml&quot;" />
+  </Fragment>
+
+  <Fragment>
+    <InstallExecuteSequence>
+      <Custom Action='CreateScheduledTask' After='InstallFiles'/>
+    </InstallExecuteSequence>
+  </Fragment>
+  
+  
 	<Fragment>
 		<Directory Id="TARGETDIR" Name="SourceDir">
 			<Directory Id="ProgramFilesFolder">
-        
 					<Directory Id="INSTALLFOLDER" Name="eDos">
             <Directory Id="eDosStationFolder" Name="eDosStation" />
             <Directory Id="eDosSyncFolder" Name="eDosSync" />
 					</Directory>
-        
 			</Directory>
+      <Directory Id="ProgramMenuFolder">
+        <Directory Id="ApplicationProgramsFolder" Name="eDos"/>
+      </Directory>
+      <Directory Id="LogFolder" />
 		</Directory>
 	</Fragment>
 
+  <Fragment>
+    <SetDirectory Id="LogFolder" Value="[WindowsVolume]Logs" />
+   
+  </Fragment>
+    
+
 	<Fragment>
 		<ComponentGroup Id="eDosStation" Directory="eDosStationFolder">
 			<!-- TODO: Remove the comments around this Component element and the ComponentRef below in order to add resources to this installer. -->
@@ -33,9 +61,9 @@
 				<!-- TODO: Insert files, registry keys, and other resources here. -->
 			<!-- </Component> -->
 			<Component Id="IR_READER_MS_DLL.dll" Guid="7dc99dd1-1611-4397-84ba-ae56ed455f68">
-			  <File Id="IR_READER_MS_DLL.dll" Name="IR_READER_MS_DLL.dll" Source="$(var.eDosStation_TargetDir)IR_READER_MS_DLL.dll" />
+			  <File Id="IR_READER_MS_DLL.dll" Name="IR_READER_MS_DLL.dll" Source="$(var.eDosStation_TargetDir)IR_READER_MS_DLL.dll" ProcessorArchitecture="x86" Vital="yes"  />
 			</Component>
-			<Component Id="Reader2.dll" Guid="64258699-5bc6-49bf-a01c-2297206a37d4">
+			<Component Id="Reader2.dll" Guid="64258699-5bc6-49bf-a01c-2297206a37d4" >
 			  <File Id="Reader2.dll" Name="Reader2.dll" Source="$(var.eDosStation_TargetDir)Reader2.dll" />
 			</Component>
 			<Component Id="eDosStation.exe.config" Guid="f052d72c-32dd-4108-80b4-35773564b2cc">
@@ -62,7 +90,15 @@
 			<Component Id="EpdBaseClr.dll" Guid="ed22005b-b3ba-4821-a598-d076ac94ea72">
 			  <File Id="EpdBaseClr.dll" Name="EpdBaseClr.dll" Source="$(var.eDosStation_TargetDir)EpdBaseClr.dll" />
 			</Component>
-			
+      <Component Id="eDosStationShortcut" Guid="85AF80D8-11AC-4B82-89F8-5764A41EF3CE">
+        <Shortcut Id="eDosStationMenuShortcut"
+                  Name="eDos Station"
+                  Description="eDos Epd issuing"
+                  Target="[#eDosStation.exe]"
+                  WorkingDirectory="eDosStationFolder"/>
+        <RemoveFolder Id="CleanUpeDosStationShortcut" Directory="ApplicationProgramsFolder" On="uninstall"/>
+        <RegistryValue Root="HKLM" Key="Software\SCKCEN\eDosStation" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
+      </Component>
 		</ComponentGroup>
     <ComponentGroup Id="eDosSync" Directory="eDosSyncFolder">
       <Component Id="syncEdosLocal.exe.config" Guid="d1c4ba86-8a63-4b73-9179-a5eab405f8cb">
@@ -77,9 +113,30 @@
       <Component Id="LSWLib.dll" Guid="27679139-5900-4901-b148-751e49c9bc74">
         <File Id="LSWLib.dll" Name="LSWLib.dll" Source="$(var.syncEdosLocal_TargetDir)LSWLib.dll" />
       </Component>
-
+      <Component Id="eDosSync.xml" Guid="BC0FB8C2-26B1-47A5-A76F-C0ABE466770D">
+        <File Id="eDosSync.xml" Name="eDosSync.xml" Source="$(var.syncEdosLocal_TargetDir)eDosSync.xml" />
+      </Component>
+      <Component Id="eDosSyncShortcut" Guid="ED01D079-54BA-4D1E-ACCF-6A79565C9D32">
+        <Shortcut Id="eDosSyncMenuShortcut"
+                 Name="eDos sync"
+                 Description="eDos sync to/from local"
+                 Target="[#syncEdosLocal.exe]"
+                 WorkingDirectory="eDosSyncFolder"/>
+        <RemoveFolder Id="CleanUpeDosSyncShortCut" Directory="ApplicationProgramsFolder" On="uninstall"/>
+        <RegistryValue Root="HKLM" Key="Software\SCKCEN\eDosSync" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
+      </Component>
     </ComponentGroup>
+    <ComponentGroup Id="SyncLog">
+      <Component Id="CreateLogFolder" Directory="LogFolder" Guid="EF959CF0-DC34-42A1-9031-2FE454DBED24">
+        <CreateFolder>
+          <util:PermissionEx User="Users" GenericAll="yes" />
+        </CreateFolder>
+      </Component>
+    </ComponentGroup>
+ 
+   
 	</Fragment>
-    
+
+  
  
 </Wix>
diff --git a/SetupProject1/eDosSetup.wixproj b/SetupProject1/eDosSetup.wixproj
index 2d0105a..cb7e406 100644
--- a/SetupProject1/eDosSetup.wixproj
+++ b/SetupProject1/eDosSetup.wixproj
@@ -43,6 +43,12 @@
   <ItemGroup>
     <Content Include="SetupProject1.wax" />
   </ItemGroup>
+  <ItemGroup>
+    <WixExtension Include="WixUtilExtension">
+      <HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
+      <Name>WixUtilExtension</Name>
+    </WixExtension>
+  </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') " />
   <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
diff --git a/eDosStation/EntryBadge.xaml.cs b/eDosStation/EntryBadge.xaml.cs
index 69ea323..8f23f43 100644
--- a/eDosStation/EntryBadge.xaml.cs
+++ b/eDosStation/EntryBadge.xaml.cs
@@ -381,7 +381,6 @@ namespace eDosStation
 
         public void endPage()
         {
-            MessageBox.Show("TO");
             this.Close();
         }
       
diff --git a/syncEdosLocal/App.Release.config b/syncEdosLocal/App.Release.config
index 19301e5..809e5e1 100644
--- a/syncEdosLocal/App.Release.config
+++ b/syncEdosLocal/App.Release.config
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--For more information on using transformations see the web.config examples at http://go.microsoft.com/fwlink/?LinkId=214134. -->
 <configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
+  <appSettings>
   <add key="smtpServer" value="192.168.113.120" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
   <add key="smtpPort" value="25" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
   <add key="smtpFrom" value="lvandenb@sckcen.be" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
+  </appSettings>
 </configuration>
\ No newline at end of file
diff --git a/syncEdosLocal/edossync.xml b/syncEdosLocal/edossync.xml
new file mode 100644
index 0000000000000000000000000000000000000000..df2cb4b9c99e8158014ad2873e01f4989f6ae322
GIT binary patch
literal 3928
zcmb`KUr!rH6vgjzrG5v*Q~O}BO)&(yM1V;^B~29^@sbx8JAkka+BFcqeB0l-<H0+-
zwsE3rWp<gl_uPMH?#%rAPut$wHyhc|*6h&+mRW8$c4uSz-PWyP8&>DN#?06*8SgVY
zwkx0gY+ZY2HKba|ytRG%*?zJ%qdib=7a}$tF<2cVDNENj;kmax+vLfyb&buDBW>`$
zVI;$T&hIOd8}7{r*(dj?&-fFwo7TkRy8Xsio$pQ8o$#Jay;`68xrTpj`-GJ%5OU@-
zBqn?-`cr;i`3f;fHpq8eX27`YG>N_D)@ppWh`fR2J=?Z7{B7DUezt6fcgufUSlqN3
zhVnJTKClPuUt=``zhlRCZhwIJ(f-295l_d?z(24p`-0ycBy(gGS@c`@DNbtRGZCMH
zUetf~+DbFdMjef<o*`8}BY#&sfl1};9pUMaxiLKIA)Csl(jnine$P+w#Tct{K~^=J
zxaCK;vrpbsk!}0nd9TjLIAaY0PKP=axgeYd*$%ZU&&|hBRqpWofOi@1*yG=aU&=;~
z$3k93qiieI=k*M=r##8<=Mc{xUTW~Xkjr&4w+FlH&glA!m#W-6l&W`%v}b>N&HLEV
z8he<=Tb`?GpHI6$A04sg(4NU<kH3o;5N2~<y(tqK)9Oik-h9=%DiXTTYxY%zRhcc>
zl=XQbnl?<+3R17VfjxmAX|(fX){yRdA1$u^VyBA?Z?ne5xQraBBIn+}YgAetOx;ZD
zr9ro9Q1>04ZQeCHPRp6lqO)z&gSMEF#xDQA;qNZrl99d`)AW3&wyHTkgNaxC#^mJL
z*SXf3c8{EHu0GgzoOyCpv`^0JGosT@HY7TI3vDvZ>mzv*lhmKW+R-{FY7|i=QLV?U
z8uRDVdY)rRJDX~Hg(oxZ&}%+8w>5w7o~cL4-yZKvbaOnoV@CU*cz+7Y*fTS*Kbe2>
zIKCGpjj{uJ?pzy!{8Z=^r}U_g*gIraQHVD;?p3;$e+(h@BKAMoe2*U?W2;#IKF!qX
z0l5uPpAe(?*7YcL;!y8W%xSEvX{1)<Vd$C{ey$m_FKCYv8)JW*w;#N&liCR@Ksg)2
z7G+W#nM~Kx?Fv?Z1R?c7eMM_*Ir9ViW98&=)Qh`gaj#e=SF|2bb!Nz4GG4?k=XjZ9
z5mzfc`nNo;HaU)rnpIssbnr^&S)F|rF>0Ac>Q8z1EM}`bmujBCx<1bUPs;g7=Tf~Y
zGh#-{D9a>M%nR~yizi*yd(bLl&67wmj=8@K=#Dx&hqHT^_lU7Gf9u>BPJ%n^N+;eg
zSJO%Dgq=Wpk`UF4cO0ua9`(eU#cUB%E?<1kxd$APg>ZuX#<*@p%XafN_k$35x~GIS
zAgob=Z|k7%aq5@1+H-Zj9bxkw(P*{G{x9I^rt)jyc2K=1d_gwc7>;3)ZXnv7FTopf
z+Znh|>z<ji4>2$DFnD=^W(EU7uh%Y;c`bEz&OFEem)EMr>(+`MN~4-#jiz-A+1GfN
K9O&M=Z~p-e17}SD

literal 0
HcmV?d00001

diff --git a/syncEdosLocal/syncEdosLocal.csproj b/syncEdosLocal/syncEdosLocal.csproj
index cd975c6..8c5276e 100644
--- a/syncEdosLocal/syncEdosLocal.csproj
+++ b/syncEdosLocal/syncEdosLocal.csproj
@@ -92,6 +92,11 @@
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="edossync.xml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\packages\Microsoft.VisualStudio.SlowCheetah.3.2.26\build\Microsoft.VisualStudio.SlowCheetah.targets" Condition="Exists('..\packages\Microsoft.VisualStudio.SlowCheetah.3.2.26\build\Microsoft.VisualStudio.SlowCheetah.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">