AppStd/ToolCollection
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix installer, update copyright year, add new dummy configs

Browse Source
This commit is contained in:
Jonathan Jenne 2019-11-07 15:13:53 +01:00
parent c1add99eaf
commit 382d20faf5
5 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
SetupWiX/Product.wxs
View File

@ -54,13 +54,21 @@
<File Id="MainApplicationExe" Name="$(var.ProgramName).exe" KeyPath="yes" Checksum="yes"> <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="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" /> <Shortcut Id="StartMenuShortcut" Directory="ProgramMenuDir" Name="$(var.ProductName)" WorkingDirectory="INSTALLDIR" Icon="AppIcon.exe" IconIndex="0" Advertise="yes" />
</File> </File>
<File Id="MainApplicationExeConfig" Name="$(var.ProgramName).exe.config" KeyPath="no" Checksum="yes"></File>
</Component> </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" /> <File Id="ToolCollection_sqlite" Name="ToolCollection.sqlite" Source="ToolCollection.sqlite" />
</Component> </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"> <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" /> <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"> <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" /> <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"> <Component Id="RegistryKeys" Guid="98007b10-5ad4-4755-80fa-387920e7005a">
<RegistryKey Root="HKCU" Key="Software"> <RegistryKey Root="HKCU" Key="Software">
@ -106,7 +114,9 @@
</RegistryKey> </RegistryKey>
<util:RemoveFolderEx Id="RemoveApplicationFolder" On="uninstall" Property="APPLICATIONFOLDER" /> <!--
<util:RemoveFolderEx Id="RemoveApplicationFolder" On="uninstall" Property="APPLICATIONFOLDER" />
-->
</Component> </Component>
<!-- Für weitere Dateien hier Component Elemente anlegen!! --> <!-- Für weitere Dateien hier Component Elemente anlegen!! -->
@ -128,7 +138,7 @@
<Directory Id="DesktopFolder" Name="Desktop" /> <Directory Id="DesktopFolder" Name="Desktop" />
</DirectoryRef> </DirectoryRef>
<Feature Id="MainApplication" Title="Main Application" Level="1"> <Feature Id="MainApplication" Title="Main Application" Level="1" >
<ComponentRef Id="MainApplicationExe" /> <ComponentRef Id="MainApplicationExe" />
<ComponentRef Id="DigitalDataLibs" /> <ComponentRef Id="DigitalDataLibs" />
<ComponentRef Id="MiscLibs" /> <ComponentRef Id="MiscLibs" />
@ -138,6 +148,8 @@
<ComponentRef Id="SQLiteDatabase" /> <ComponentRef Id="SQLiteDatabase" />
<ComponentRef Id="ProgramMenuDir" /> <ComponentRef Id="ProgramMenuDir" />
<ComponentRef Id="RegistryKeys" /> <ComponentRef Id="RegistryKeys" />
<ComponentRef Id="MainApplicationExeConfig" />
<ComponentRef Id="PreexistingFiles" />
</Feature> </Feature>
<!-- Legt das Standard-Installationsverzeichnis fest--> <!-- Legt das Standard-Installationsverzeichnis fest-->

2
ToolCollection/My Project/AssemblyInfo.vb
View File

@ -12,7 +12,7 @@ Imports System.Runtime.InteropServices
<Assembly: AssemblyDescription("")> <Assembly: AssemblyDescription("")>
<Assembly: AssemblyCompany("Digital Data")> <Assembly: AssemblyCompany("Digital Data")>
<Assembly: AssemblyProduct("ToolCollection")> <Assembly: AssemblyProduct("ToolCollection")>
<Assembly: AssemblyCopyright("Copyright © Digital Data 2017")> <Assembly: AssemblyCopyright("Copyright © Digital Data 2019")>
<Assembly: AssemblyTrademark("")> <Assembly: AssemblyTrademark("")>
<Assembly: ComVisible(False)> <Assembly: ComVisible(False)>

2
ToolCollection/ToolCollection.vbproj
View File

@ -845,6 +845,8 @@
<None Include="Resources\folder_Closed_16xMD.png" /> <None Include="Resources\folder_Closed_16xMD.png" />
<None Include="Resources\lines_Text_code_16xLG.png" /> <None Include="Resources\lines_Text_code_16xLG.png" />
<None Include="Resources\CheckConstraints_5634.png" /> <None Include="Resources\CheckConstraints_5634.png" />
<Content Include="modDateiimportConfig.xml" />
<Content Include="modNachindexierungConfig.xml" />
<Content Include="x64\SQLite.Interop.dll"> <Content Include="x64\SQLite.Interop.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content> </Content>

2
ToolCollection/modDateiimportConfig.xml Normal file
View File

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
<Dummy></Dummy>

2
ToolCollection/modNachindexierungConfig.xml Normal file
View File

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
<Dummy></Dummy>