From 382d20faf54382065ac871f4d5b9dbfbab51868a Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@digitaldata.works>
Date: Thu, 7 Nov 2019 15:13:53 +0100
Subject: [PATCH] fix installer, update copyright year, add new dummy configs

---
 SetupWiX/Product.wxs                        | 24 +++++++++++++++------
 ToolCollection/My Project/AssemblyInfo.vb   |  2 +-
 ToolCollection/ToolCollection.vbproj        |  2 ++
 ToolCollection/modDateiimportConfig.xml     |  2 ++
 ToolCollection/modNachindexierungConfig.xml |  2 ++
 5 files changed, 25 insertions(+), 7 deletions(-)
 create mode 100644 ToolCollection/modDateiimportConfig.xml
 create mode 100644 ToolCollection/modNachindexierungConfig.xml

diff --git a/SetupWiX/Product.wxs b/SetupWiX/Product.wxs
index 417af10..16f51ec 100644
--- a/SetupWiX/Product.wxs
+++ b/SetupWiX/Product.wxs
@@ -54,13 +54,21 @@
         <File Id="MainApplicationExe" Name="$(var.ProgramName).exe" KeyPath="yes" Checksum="yes">
           <Shortcut Id="DesktopShortcut" Directory="DesktopFolder" Name="$(var.ProductName)" WorkingDirectory="INSTALLDIR" Icon="AppIcon.exe" IconIndex="0" Advertise="yes" />
           <Shortcut Id="StartMenuShortcut" Directory="ProgramMenuDir" Name="$(var.ProductName)" WorkingDirectory="INSTALLDIR" Icon="AppIcon.exe" IconIndex="0" Advertise="yes" />
-        </File>
-        <File Id="MainApplicationExeConfig" Name="$(var.ProgramName).exe.config" KeyPath="no" Checksum="yes"></File>
+        </File>     
       </Component>
       
-      <Component Id="SQLiteDatabase" Guid="f01ed812-dd47-42ce-b174-15ca27b808a0">
+      <Component Id="MainApplicationExeConfig" Guid="e733ac75-e980-405f-869e-8a15301c6e1f" NeverOverwrite="yes" Permanent="yes">
+        <File Id="MainApplicationExeConfig" Name="$(var.ProgramName).exe.config" KeyPath="no" Checksum="yes"></File>
+      </Component>
+        
+      <Component Id="SQLiteDatabase" Guid="f01ed812-dd47-42ce-b174-15ca27b808a0" NeverOverwrite="yes" Permanent="yes">
          <File Id="ToolCollection_sqlite" Name="ToolCollection.sqlite" Source="ToolCollection.sqlite" />
       </Component>
+      
+      <Component Id="PreexistingFiles" Guid="40447dec-eb3b-4e2a-8924-ffd657c8617f" Permanent="yes" NeverOverwrite="yes">
+        <File Id="DIConfig" Name="modDateiimportConfig.xml" KeyPath="yes" />
+        <File Id="NIConfig" Name="modNachindexierungConfig.xml" KeyPath="no" />
+      </Component>
 
       <Component Id="WindreamLibs" Guid="3666d0d9-6406-4f95-8610-4ed36403378f">
         <File Id="WINDREAMLib" Name="Interop.WINDREAMLib.dll" Source="P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll" KeyPath="yes"  />
@@ -93,7 +101,7 @@
 
       <Component Id="OracleLibs" Guid="e309863a-dfd0-48e1-b342-4d3e64b413ee">
         <File Id="Oracle.ManagedDataAccess" Name="Oracle.ManagedDataAccess.dll" Source="P:\Visual Studio Projekte\Bibliotheken\Oracle.ManagedDataAccess.dll" KeyPath="yes" />
-      </Component>
+      </Component>    
 
       <Component Id="RegistryKeys" Guid="98007b10-5ad4-4755-80fa-387920e7005a">
         <RegistryKey Root="HKCU" Key="Software">
@@ -106,7 +114,9 @@
 
         </RegistryKey>
 
-        <util:RemoveFolderEx Id="RemoveApplicationFolder" On="uninstall" Property="APPLICATIONFOLDER" />
+      <!--  
+      <util:RemoveFolderEx Id="RemoveApplicationFolder" On="uninstall" Property="APPLICATIONFOLDER" />
+      -->
       </Component>
 
       <!-- Für weitere Dateien hier Component Elemente anlegen!! -->
@@ -128,7 +138,7 @@
       <Directory Id="DesktopFolder" Name="Desktop" />
     </DirectoryRef>
 
-    <Feature Id="MainApplication" Title="Main Application" Level="1">
+    <Feature Id="MainApplication" Title="Main Application" Level="1" >
       <ComponentRef Id="MainApplicationExe" />
       <ComponentRef Id="DigitalDataLibs" />
       <ComponentRef Id="MiscLibs" />
@@ -138,6 +148,8 @@
       <ComponentRef Id="SQLiteDatabase" />
       <ComponentRef Id="ProgramMenuDir" />
       <ComponentRef Id="RegistryKeys" />
+      <ComponentRef Id="MainApplicationExeConfig" />
+      <ComponentRef Id="PreexistingFiles" />
     </Feature>
 
     <!-- Legt das Standard-Installationsverzeichnis fest-->
diff --git a/ToolCollection/My Project/AssemblyInfo.vb b/ToolCollection/My Project/AssemblyInfo.vb
index 85cc683..d25d05c 100644
--- a/ToolCollection/My Project/AssemblyInfo.vb	
+++ b/ToolCollection/My Project/AssemblyInfo.vb	
@@ -12,7 +12,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyDescription("")> 
 <Assembly: AssemblyCompany("Digital Data")> 
 <Assembly: AssemblyProduct("ToolCollection")>
-<Assembly: AssemblyCopyright("Copyright © Digital Data 2017")>
+<Assembly: AssemblyCopyright("Copyright © Digital Data 2019")>
 <Assembly: AssemblyTrademark("")> 
 
 <Assembly: ComVisible(False)>
diff --git a/ToolCollection/ToolCollection.vbproj b/ToolCollection/ToolCollection.vbproj
index c5a9ad5..decec8d 100644
--- a/ToolCollection/ToolCollection.vbproj
+++ b/ToolCollection/ToolCollection.vbproj
@@ -845,6 +845,8 @@
     <None Include="Resources\folder_Closed_16xMD.png" />
     <None Include="Resources\lines_Text_code_16xLG.png" />
     <None Include="Resources\CheckConstraints_5634.png" />
+    <Content Include="modDateiimportConfig.xml" />
+    <Content Include="modNachindexierungConfig.xml" />
     <Content Include="x64\SQLite.Interop.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
diff --git a/ToolCollection/modDateiimportConfig.xml b/ToolCollection/modDateiimportConfig.xml
new file mode 100644
index 0000000..40ed59a
--- /dev/null
+++ b/ToolCollection/modDateiimportConfig.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Dummy></Dummy> 
diff --git a/ToolCollection/modNachindexierungConfig.xml b/ToolCollection/modNachindexierungConfig.xml
new file mode 100644
index 0000000..968bef4
--- /dev/null
+++ b/ToolCollection/modNachindexierungConfig.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Dummy></Dummy>
\ No newline at end of file