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

version nbr

Browse source
This commit is contained in:
Luc 2021-05-11 08:28:50 +02:00
commit 222e49eac6
4 changed files with 14 additions and 3 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.4.2.0" Manufacturer="SCK CEN Luc Vandenbroucke" UpgradeCode="24e037ca-edbb-49d5-85d4-3a93dd7d10d8"> <Product Id="*" Name="eDosStation" Language="1033" Version="1.5.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" /> <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" /> <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." />

10
eDosStation/About.xaml
View file

@ -48,6 +48,16 @@
</Paragraph> </Paragraph>
</TableCell> </TableCell>
</TableRow> </TableRow>
<TableRow>
<TableCell >
<Paragraph TextAlignment="Right" Margin="0,0,20,0" >Check users quiz</Paragraph>
</TableCell>
<TableCell>
<Paragraph>
<Run BaselineAlignment="Bottom" x:Name="checkUser" Text=""/>
</Paragraph>
</TableCell>
</TableRow>
</TableRowGroup> </TableRowGroup>
</Table> </Table>

1
eDosStation/About.xaml.cs
View file

@ -26,6 +26,7 @@ namespace eDosStation
aVersion.Text = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString(); aVersion.Text = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString();
stationID.Text = station.ID_Station.ToString(); stationID.Text = station.ID_Station.ToString();
ReadAlias(); ReadAlias();
if (station.checkUser) checkUser.Text = "Yes"; else checkUser.Text = "No";
} }
private void RadButton_Click(object sender, RoutedEventArgs e) private void RadButton_Click(object sender, RoutedEventArgs e)

4
eDosStation/Properties/AssemblyInfo.cs
View file

@ -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.4.2.0")] [assembly: AssemblyVersion("1.5.0.0")]
[assembly: AssemblyFileVersion("1.4.2.0")] [assembly: AssemblyFileVersion("1.5.0.0")]