luc/eDosStation
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

2.0

Browse source
This commit is contained in:
Luc 2021-06-03 08:49:27 +02:00
parent 04efa1be62
commit 48335319c0
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SetupProject1/Product.wxs
View file

@ -3,7 +3,7 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"> <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
<?define eDosStation_TargetDir=$(var.eDosStation.TargetDir)?> <?define eDosStation_TargetDir=$(var.eDosStation.TargetDir)?>
<?define syncEdosLocal_TargetDir=$(var.syncEdosLocal.TargetDir)?> <?define syncEdosLocal_TargetDir=$(var.syncEdosLocal.TargetDir)?>
<Product Id="*" Name="eDosStation" Language="1033" Version="1.7.0.0" Manufacturer="SCK CEN Luc Vandenbroucke" UpgradeCode="24e037ca-edbb-49d5-85d4-3a93dd7d10d8"> <Product Id="*" Name="eDosStation" Language="1033" Version="2.0.0.0" Manufacturer="SCK CEN Luc Vandenbroucke" 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" Description="eDosStation 1.6.1" /> <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" Comments="EPD lees software en synchronisatie tussen local en remote database" InstallPrivileges="elevated" Platform="x86" Description="eDosStation 1.6.1" />
<Media Id="1" EmbedCab="yes" Cabinet="cab" /> <Media Id="1" EmbedCab="yes" Cabinet="cab" />
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />

1
eDosStation/EpdExit.xaml.cs
View file

@ -84,7 +84,6 @@ namespace eDosStation
ep.WearerName = simulData.WearerName; ep.WearerName = simulData.WearerName;
ep.Hp07 = 1; ep.Hp07 = 1;
ep.Hp10 = 2; ep.Hp10 = 2;
#endif #endif
int rv = 0; int rv = 0;
if (!ep.EPDIssued) if (!ep.EPDIssued)

6
eDosStation/Properties/AssemblyInfo.cs
View file

@ -8,7 +8,7 @@ using System.Windows;
// set of attributes. Change these attribute values to modify the information // set of attributes. Change these attribute values to modify the information
// associated with an assembly. // associated with an assembly.
[assembly: AssemblyTitle("eDosStation")] [assembly: AssemblyTitle("eDosStation")]
[assembly: AssemblyDescription("2021 Isabelle Majkowski, Luc Praet, Luc Vandenbroucke")] [assembly: AssemblyDescription("MK2/MK3 epd station 2021 Isabelle Majkowski, Luc Praet, Luc Vandenbroucke")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("SCK CEN")] [assembly: AssemblyCompany("SCK CEN")]
[assembly: AssemblyProduct("eDosStation")] [assembly: AssemblyProduct("eDosStation")]
@ -51,5 +51,5 @@ using System.Windows;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.7.0.0")] [assembly: AssemblyVersion("2.0.0.0")]
[assembly: AssemblyFileVersion("1.7.0.0")] [assembly: AssemblyFileVersion("2.0.0.0")]