From 298eb526b78a0fc56b3b90ddf137fb6a3f34cec6 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 31 Mar 2022 16:30:09 +0200 Subject: [PATCH 1/2] Fix installer, init --- app/DD_PM_WINDREAM/ClassInit.vb | 6 + app/SetupVS19/Product.wxs | 566 ++++++++++++++++---------------- 2 files changed, 297 insertions(+), 275 deletions(-) diff --git a/app/DD_PM_WINDREAM/ClassInit.vb b/app/DD_PM_WINDREAM/ClassInit.vb index bc3b4df..65efef1 100644 --- a/app/DD_PM_WINDREAM/ClassInit.vb +++ b/app/DD_PM_WINDREAM/ClassInit.vb @@ -114,6 +114,8 @@ Public Class ClassInit LOGGER.Warn($"Could not initialize the AppServer: {ex.Message}") End Try + Else + LOGGER.Debug("EDMI Server Address not found. Skipping.") End If INDEX_DMS_ERSTELLT = CONFIG.Config.IndexDmsErstellt @@ -183,6 +185,8 @@ Public Class ClassInit End If If CONNECTION_STRING_IDB <> String.Empty Then + LOGGER.Debug("IDB Connection String exists, initializing IDB Database") + Database_IDB = New MSSQLServer(LOGCONFIG, CONNECTION_STRING_IDB) If Database_IDB.DBInitialized = True Then dbIDBInitialized = True @@ -190,6 +194,8 @@ Public Class ClassInit LOGGER.Info("IDB is active via Config") End If + Else + LOGGER.Debug("IDB Connection String does not exist!") End If ' We initialize the Class in anycase. diff --git a/app/SetupVS19/Product.wxs b/app/SetupVS19/Product.wxs index f9b689d..9e9578b 100644 --- a/app/SetupVS19/Product.wxs +++ b/app/SetupVS19/Product.wxs @@ -4,307 +4,323 @@ - + - - + - - - + + + - - + + - - - - - + + + + + + + + + - - - - + + + + + + - - - - - - + + + - - - + + - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - + + + + + + + + + + + + + + - - - + + DISABLE_DESKTOP_ICON + + - - - - - - - - - - - - - - - - - DISABLE_DESKTOP_ICON - - - - - DISABLE_STARTMENU_ICON - - + + DISABLE_STARTMENU_ICON + + - - - + + + - - - - - 1 - 1 - 1 - 1 - 1 - - + + + + + 1 + 1 + 1 + 1 + 1 + + \ No newline at end of file From 37e489594285cecd09b3e913687b90cbaeeaa656 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 31 Mar 2022 16:51:59 +0200 Subject: [PATCH 2/2] Version 2.3.5.2 --- app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb b/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb index 1df9f2d..3a902d5 100644 --- a/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb +++ b/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb @@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices - + @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - +