From 221cbac13f42d5cb2d27d5f9a39b8433f20f6f15 Mon Sep 17 00:00:00 2001
From: Luc Vandenbroucke <lvandenb@sckcen.be>
Date: Mon, 14 Jun 2021 09:22:27 +0200
Subject: [PATCH] no admin necessary?

---
 SetupProject1/Product.wxs              |  2 +-
 eDosStation/Properties/AssemblyInfo.cs |  4 ++--
 eDosStation/app.manifest               | 13 ++-----------
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/SetupProject1/Product.wxs b/SetupProject1/Product.wxs
index f122300..8b284d7 100644
--- a/SetupProject1/Product.wxs
+++ b/SetupProject1/Product.wxs
@@ -3,7 +3,7 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
   <?define eDosStation_TargetDir=$(var.eDosStation.TargetDir)?>
   <?define syncEdosLocal_TargetDir=$(var.syncEdosLocal.TargetDir)?>
-  <Product Id="*" Name="eDosStation" Language="1033" Version="2.0.0.0" Manufacturer="SCK CEN Luc Vandenbroucke" UpgradeCode="24e037ca-edbb-49d5-85d4-3a93dd7d10d8">
+  <Product Id="*" Name="eDosStation" Language="1033" Version="2.1.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"  />
     <Media Id="1" EmbedCab="yes" Cabinet="cab" />
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
diff --git a/eDosStation/Properties/AssemblyInfo.cs b/eDosStation/Properties/AssemblyInfo.cs
index c35dc76..f823916 100644
--- a/eDosStation/Properties/AssemblyInfo.cs
+++ b/eDosStation/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.0.0")]
+[assembly: AssemblyVersion("2.1.0.0")]
+[assembly: AssemblyFileVersion("2.1.0.0")]
diff --git a/eDosStation/app.manifest b/eDosStation/app.manifest
index a6878b9..4cacae2 100644
--- a/eDosStation/app.manifest
+++ b/eDosStation/app.manifest
@@ -4,19 +4,10 @@
   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
     <security>
       <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <!-- UAC Manifest Options
-             If you want to change the Windows User Account Control level replace the 
-             requestedExecutionLevel node with one of the following.
-
         <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
-        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
+        <!--<requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
         <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
-
-            Specifying requestedExecutionLevel element will disable file and registry virtualization. 
-            Remove this element if your application requires this virtualization for backwards
-            compatibility.
-        -->
-        <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
+        <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />-->
       </requestedPrivileges>
     </security>
   </trustInfo>