AppStd/TaskFlow
8
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of http://dd-vmp07-com04:3000/AppStd/TaskFlow

Browse Source
This commit is contained in:
SchreiberM 2023-10-19 11:13:58 +02:00
commit ab46724e79
2 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/TaskFlow/ClassInit.vb
View File

@ -13,11 +13,7 @@ Public Class ClassInit
<STAThread()> <STAThread()>
Public Sub InitLogger() Public Sub InitLogger()
Dim oConfigPrefix As String = My.Settings.UserConfig_Prefix
Dim oLocalUserAppDataPath As String = Application.LocalUserAppDataPath Dim oLocalUserAppDataPath As String = Application.LocalUserAppDataPath
If oConfigPrefix.Length > 0 Then
oLocalUserAppDataPath = IO.Path.Combine(oLocalUserAppDataPath, oConfigPrefix)
End If
LOGCONFIG = New LogConfig(LogConfig.PathType.CustomPath, LOGCONFIG = New LogConfig(LogConfig.PathType.CustomPath,
oLocalUserAppDataPath & "\Log", oLocalUserAppDataPath & "\Log",
Nothing, Nothing,
@ -47,23 +43,8 @@ Public Class ClassInit
Public Sub InitUserConfig() Public Sub InitUserConfig()
Try Try
Dim oUserAppDataPath As String = Application.UserAppDataPath Dim oUserAppDataPath As String = Application.UserAppDataPath
Dim oLegacyAppDataPath As String = Application.UserAppDataPath
Dim oCommonAppDataPath = Application.CommonAppDataPath Dim oCommonAppDataPath = Application.CommonAppDataPath
Dim oStartupPath = Application.StartupPath Dim oStartupPath = Application.StartupPath
Dim oConfigPrefix As String = My.Settings.UserConfig_Prefix
' If prefix is configured, use it to create a subfolder in app data and migrate existing data
If oConfigPrefix.Length > 0 Then
oUserAppDataPath = IO.Path.Combine(Application.UserAppDataPath, oConfigPrefix)
Dim oConfigUtils As New ConfigUtils(LOGCONFIG)
If oConfigUtils.TestMigrationNeeded(oUserAppDataPath) Then
LOGCONFIG.Debug = True
oConfigUtils.MigrateConfig(oLegacyAppDataPath, oUserAppDataPath)
LOGCONFIG.Debug = False
End If
End If
' If AppConfig from Startup Path should be forced, rewrite the common app data path ' If AppConfig from Startup Path should be forced, rewrite the common app data path
If My.Settings.UseAppConfigConString = True Then If My.Settings.UseAppConfigConString = True Then

2
app/TaskFlow/My Project/AssemblyInfo.vb
View File

@ -14,7 +14,7 @@ Imports System.Runtime.InteropServices
<Assembly: AssemblyCompany("Digital Data")> <Assembly: AssemblyCompany("Digital Data")>
<Assembly: AssemblyProduct("TaskFlow")> <Assembly: AssemblyProduct("TaskFlow")>
<Assembly: AssemblyCopyright("Copyright © Digital Data 2023")> <Assembly: AssemblyCopyright("Copyright © Digital Data 2023")>
<Assembly: AssemblyTrademark("2.4.6.3")> <Assembly: AssemblyTrademark("2.4.6.4")>
<Assembly: ComVisible(False)> <Assembly: ComVisible(False)>