update installer

add logging
Update exe icon
2023-08-03 09:03:39 +02:00 · 2023-08-03 09:03:32 +02:00 · 2023-08-02 14:42:18 +02:00
5 changed files with 329 additions and 326 deletions
--- a/app/DD-Record-Organizer/Classes/ClassInit.vb
+++ b/app/DD-Record-Organizer/Classes/ClassInit.vb
@@ -16,23 +16,7 @@ Public Class ClassInit
                                        My.Application.Info.CompanyName,
                                        "OrgFlow")
            LOGGER = LOGCONFIG.GetLogger()
-
-            LOGGER.Info("## OrgFlow started - {0}", Now)
-            Try
-                Dim directory As New IO.DirectoryInfo(Application.LocalUserAppDataPath & "\Log")
-
-                For Each file As IO.FileInfo In directory.GetFiles
-                    If (Now - file.CreationTime).Days > 29 Then
-                        file.Delete()
-                    Else
-                        Exit For
-                    End If
-
-
-                Next
-            Catch ex As Exception
-
-            End Try
+            LOGGER.Info("OrgFlow started")

            Dim oUserAppDataPath As String = Application.UserAppDataPath
            Dim oLegacyAppDataPath As String = Application.UserAppDataPath
@@ -58,9 +42,8 @@ Public Class ClassInit


        Catch ex As Exception
-
+            LOGGER.Error(ex)
        End Try
-
    End Sub
    Private Shared Function DecryptConnectionString(EncryptedConnectionString As String) As String
        Dim oBuilder As New SqlClient.SqlConnectionStringBuilder With {
@@ -131,6 +114,7 @@ Public Class ClassInit

            Return True
        Catch ex As Exception
+            LOGGER.Error(ex)
            MsgBox("Unexpected Error in Init Database:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
            Return False
        End Try
@@ -173,6 +157,7 @@ Public Class ClassInit
            MY_ADDON_PATH = AddonPath
            SaveMySettingsValue("PATH_ADDON", MY_ADDON_PATH, "ConfigMain")
        Catch ex As Exception
+            LOGGER.Error(ex)
            MsgBox("Unexpected Error in InitAddons:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
        End Try
    End Sub
@@ -232,6 +217,7 @@ Public Class ClassInit
            Next

        Catch ex As Exception
+            LOGGER.Error(ex)
            MsgBox("Unexpected Error in InitBasics2:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
        End Try

@@ -244,6 +230,7 @@ Public Class ClassInit
                                    "And T.ACTIVE = 1 And T1.USER_ID = {0}", USER_GUID)
            CURRENT_TBPMO_CONN_SWITCH = MYDB_ECM.GetDatatable(sql)
        Catch ex As Exception
+            LOGGER.Error(ex)
            LOGGER.Warn("Unexpected Error in Init_CONN_SWITCH: " & ex.Message)
        End Try
    End Sub
@@ -432,6 +419,7 @@ WHERE (USERNAME = '{0}') AND T2.SHORT_NAME = 'ADDI'", USER_USERNAME)
                End If
            End If
        Catch ex As Exception
+            LOGGER.Error(ex)
            LOGGER.Warn("Unexpected Error in InitUserLogin: " & ex.Message)
            MsgBox("Unexpected Error in InitUserLogin: " & ex.Message, MsgBoxStyle.Critical)
            Return False
--- a/app/DD-Record-Organizer/ModuleMySettings.vb
+++ b/app/DD-Record-Organizer/ModuleMySettings.vb
@@ -297,6 +297,7 @@ Module ModuleMySettings

        Catch ex As Exception
            MsgBox("Error in LoadMyConfig" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+            LOGGER.Error(ex)
            LOGGER.Warn("Error in LoadMyConfig: " & ex.Message, True)
            Return False
        End Try
@@ -326,7 +327,7 @@ Module ModuleMySettings
            table.TableName = "MyConfig"

            ' Create two columns, ID and Name.
-            Dim idColumn As DataColumn = table.Columns.Add("ID", _
+            Dim idColumn As DataColumn = table.Columns.Add("ID",
                GetType(System.Int32))

            idColumn.AutoIncrement = True
@@ -399,6 +400,7 @@ Module ModuleMySettings
            LOGGER.Info("CreateConfigTable su...")
            Return table
        Catch ex As Exception
+            LOGGER.Error(ex)
            MsgBox("Error in CreateConfigTable" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
            Return Nothing
        End Try
@@ -426,6 +428,7 @@ Module ModuleMySettings
            End If

        Catch ex As Exception
+            LOGGER.Error(ex)
            MsgBox("Error in SaveConfigValue" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
            Return False
        End Try
@@ -450,6 +453,7 @@ Module ModuleMySettings
                Return False
            End If
        Catch ex As Exception
+            LOGGER.Error(ex)
            MsgBox("Error in Settings_LoadBasicConfig" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
            Return False
        End Try
--- a/app/DD-Record-Organizer/OrgFlow.vbproj
+++ b/app/DD-Record-Organizer/OrgFlow.vbproj
@@ -66,7 +66,7 @@
    <ApplicationManifest>My Project\app.manifest</ApplicationManifest>
  </PropertyGroup>
  <PropertyGroup>
-    <ApplicationIcon>DD_Icons_ICO_ADDI_1.ico</ApplicationIcon>
+    <ApplicationIcon>ORGFLOW_Icon_256x256.ico</ApplicationIcon>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="CommandLine">
@@ -1602,6 +1602,8 @@
    <None Include="Resources\base_globe_32.png" />
    <None Include="Resources\1480524473_1.png" />
    <None Include="Resources\arrow_open_16xLG.png" />
+    <Content Include="ORGFLOW_Icon_16x16.ico" />
+    <Content Include="ORGFLOW_Icon_256x256.ico" />
    <Content Include="Resources\cube.ico" />
    <Content Include="Resources\138_PushPin_32x42_72.png" />
    <None Include="Resources\PropertyGridEditorPart_6041.png" />
--- a/app/Setup_NoUpdaterVS19/Config.wxi
+++ b/app/Setup_NoUpdaterVS19/Config.wxi
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include>
  <?define ProgramName="DD-Record-Organizer"?>
-  <?define ProductName="Record Organizer"?>
+  <?define ProductName="OrgFlow"?>
  <?define Manufacturer="Digital Data"?>
-  <?define Description="Record Organizer"?>
-  <?define Comments="Record Organizer"?>
+  <?define Description="OrgFlow"?>
+  <?define Comments="OrgFlow"?>
  <?define UpgradeCode="{6387325E-F6D7-46BE-BBA8-D0E37BEEF800}"?>

  <?define SourceDir="..\$(var.ProgramName)\bin\$(var.Configuration)\"?>
--- a/app/Setup_NoUpdaterVS19/Product.wxs
+++ b/app/Setup_NoUpdaterVS19/Product.wxs
@@ -85,7 +85,8 @@
 		<DirectoryRef Id="INSTALLDIR">
 			<!-- Die DD-Record-Organizer.exe und Shortcuts für Desktop und Startmenü -->
 			<Component Id="MainExecutable" Guid="9CC5D446-F056-4A09-995D-9DF53A7F0E38">
-        <File Id="PMOEXE" Name="DD-Record-Organizer.exe" Source="OrgFlow.exe" KeyPath="yes" />
+				<File Id="PMOEXE" Name="OrgFlow.exe" Source="OrgFlow.exe" KeyPath="yes" />
+				<File Id="PMOEXECONFIG" Name="OrgFlow.exe.config" Source="OrgFlow.exe.config" KeyPath="no" />
 				<!-- Programmordner bei Deinstallation entfernen-->
 				<util:RemoveFolderEx Id="RemoveApplicationFolder" On="uninstall" Property="APPLICATIONFOLDER" />
 			</Component>
@@ -101,8 +102,8 @@
 					<RegistryKey Key="Classes">
 						<RegistryKey Key="pmo" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes" Id="REGKEYCUSTOMURLHANDLER">
 							<RegistryValue Type="string" Name="URL Protocol" Value="" />
-              <RegistryValue Key="DefaultIcon" Type="string" Value="&quot;[INSTALLDIR]DD-Record-Organizer.exe,0&quot;" />
-              <RegistryValue Key="shell\open\command" Type="string" Value="&quot;[INSTALLDIR]DD-Record-Organizer.exe&quot; --data %1" />
+							<RegistryValue Key="DefaultIcon" Type="string" Value="&quot;[INSTALLDIR]OrgFlow.exe,0&quot;" />
+							<RegistryValue Key="shell\open\command" Type="string" Value="&quot;[INSTALLDIR]OrgFlow.exe&quot; --data %1" />
 						</RegistryKey>
 					</RegistryKey>
 				</RegistryKey>
@@ -135,7 +136,15 @@
 				<File Id="DD_Rights" Name="DD_Rights.dll"  KeyPath="no" />
 				<File Id="DD_LIB_Standards" Name="DD_LIB_Standards.dll"  KeyPath="no" />
 				<File Id="DDLogging" Name="DigitalData.Modules.Logging.dll"  KeyPath="no" Checksum="yes"/>
+				<File Id="DDDatabase" Name="DigitalData.Modules.Database.dll"  KeyPath="no" Checksum="yes"/>
+				<File Id="DDWindream" Name="DigitalData.Modules.Windream.dll"  KeyPath="no" Checksum="yes"/>
+				<File Id="DDConfig" Name="DigitalData.Modules.Config.dll"  KeyPath="no" Checksum="yes"/>
+				<File Id="DDBase" Name="DigitalData.Modules.Base.dll"  KeyPath="no" Checksum="yes"/>
+				<File Id="DDFilesystem" Name="DigitalData.Modules.Filesystem.dll"  KeyPath="no" Checksum="yes"/>
+				<File Id="DDLanguage" Name="DigitalData.Modules.Language.dll"  KeyPath="no" Checksum="yes"/>
+				<File Id="DDEncryption" Name="DigitalData.Modules.Encryption.dll"  KeyPath="no" Checksum="yes"/>
 			</Component>
+
 			<!-- DD Bibliotheken -->
 			<Component Id="BasicLibs" Guid="37238CB0-6DC3-4B1B-9438-52FA7D478897">
 				<File Id="OfficeLib" Name="Office.dll" Source="C:\Windows\assembly\GAC_MSIL\Office\15.0.0.0__71e9bce111e9429c\Office.dll" KeyPath="yes" />
@@ -256,7 +265,7 @@
 			<Component Id="ApplicationShortcut_StartMenu" Guid="508a08d6-73fc-43d4-8861-b432ba92e44e">
 				<Shortcut Id="ApplicationStartMenuShortcut_StartMenu"
 					 Name="$(var.ProductName)"
-             Target="[INSTALLDIR]$(var.ProgramName).exe"
+					 Target="[INSTALLDIR]OrgFlow.exe"
 					 WorkingDirectory="INSTALLDIR"/>
 				<RemoveFolder Id="ApplicationProgramsFolder_StartMenu" On="uninstall"/>
 				<RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
@@ -267,7 +276,7 @@
 			<Component Id="ApplicationShortcut_Desktop" Guid="89ff1c33-08f7-4270-a858-2d6c7cbf9ba1">
 				<Shortcut Id="ApplicationStartMenuShortcut_Desktop"
 					 Name="$(var.ProductName)"
-             Target="[INSTALLDIR]$(var.ProgramName).exe"
+					 Target="[INSTALLDIR]OrgFlow.exe"
 					 WorkingDirectory="INSTALLDIR"/>
 				<RemoveFolder Id="ApplicationProgramsFolder_Desktop" On="uninstall"/>
 				<RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
Author	SHA1	Message	Date
Jonathan Jenne	d1abc2bb1b	update installer	2023-08-03 09:03:39 +02:00
Jonathan Jenne	c347ee7d55	add logging	2023-08-03 09:03:32 +02:00
Jonathan Jenne	7f997f6802	Update exe icon	2023-08-02 14:42:18 +02:00