From 651c5bc2d66430cd2aef2aa9b4e2b61f4d46e380 Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@digitaldata.works>
Date: Thu, 17 Dec 2020 16:55:17 +0100
Subject: [PATCH 1/2] Add UserConfig Prefix and Config Migration

---
 app/DD_PM_WINDREAM/App.config                 |  3 ++
 app/DD_PM_WINDREAM/ClassConfig.vb             |  2 +-
 app/DD_PM_WINDREAM/ClassInit.vb               | 29 +++++++++++++++----
 .../My Project/Settings.Designer.vb           |  9 ++++++
 .../My Project/Settings.settings              |  3 ++
 5 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/app/DD_PM_WINDREAM/App.config b/app/DD_PM_WINDREAM/App.config
index 6d9b7d1..8c5ddaa 100644
--- a/app/DD_PM_WINDREAM/App.config
+++ b/app/DD_PM_WINDREAM/App.config
@@ -14,6 +14,9 @@
       <setting name="UseAppConfigConString" serializeAs="String">
         <value>True</value>
       </setting>
+      <setting name="UserConfig_Prefix" serializeAs="String">
+        <value>TEST</value>
+      </setting>
     </DD_ProcessManager.My.MySettings>
     <DevExpress.LookAndFeel.Design.AppSettings>
       <setting name="DefaultAppSkin" serializeAs="String">
diff --git a/app/DD_PM_WINDREAM/ClassConfig.vb b/app/DD_PM_WINDREAM/ClassConfig.vb
index 4a80d20..4ccd166 100644
--- a/app/DD_PM_WINDREAM/ClassConfig.vb
+++ b/app/DD_PM_WINDREAM/ClassConfig.vb
@@ -8,7 +8,7 @@ Public Class ClassConfig
     Public Property ConnectionStringTest As String = ""
     <ConnectionStringAppServer>
     Public Property ConnectionStringAppServer As String = ""
-    <AppServerConfig>
+    <ConnectionStringAppServer>
     Public Property AppServerConfig As String = ""
 
     Public Property TestMode As Boolean = False
diff --git a/app/DD_PM_WINDREAM/ClassInit.vb b/app/DD_PM_WINDREAM/ClassInit.vb
index 58fadb6..74dad69 100644
--- a/app/DD_PM_WINDREAM/ClassInit.vb
+++ b/app/DD_PM_WINDREAM/ClassInit.vb
@@ -42,15 +42,32 @@ Public Class ClassInit
     <STAThread()>
     Public Sub InitUserConfig()
         Try
-            Dim AppdataPath = Application.UserAppDataPath
-            Dim CommonAppDataPath = Application.CommonAppDataPath
-            Dim StartupPath = Application.StartupPath
+            Dim oUserAppDataPath As String = Application.UserAppDataPath
+            Dim oLegacyAppDataPath As String = Application.UserAppDataPath
+            Dim oCommonAppDataPath = Application.CommonAppDataPath
+            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 My.Settings.UseAppConfigConString = True Then
-                AppdataPath = StartupPath
-                CommonAppDataPath = StartupPath
+                ' UserAppDataPath = StartupPath
+                oCommonAppDataPath = oStartupPath
             End If
 
-            CONFIG = New ConfigManager(Of ClassConfig)(LOGCONFIG, AppdataPath, CommonAppDataPath, StartupPath)
+            CONFIG = New ConfigManager(Of ClassConfig)(LOGCONFIG, oUserAppDataPath, oCommonAppDataPath, oStartupPath)
             LOGGER.Info("Config loaded")
 
             If CONFIG.Config.ConnectionStringTest <> String.Empty And CONFIG.Config.TestMode = True Then
diff --git a/app/DD_PM_WINDREAM/My Project/Settings.Designer.vb b/app/DD_PM_WINDREAM/My Project/Settings.Designer.vb
index 73ccc60..4f03ca3 100644
--- a/app/DD_PM_WINDREAM/My Project/Settings.Designer.vb	
+++ b/app/DD_PM_WINDREAM/My Project/Settings.Designer.vb	
@@ -297,6 +297,15 @@ Namespace My
                 Return CType(Me("UseAppConfigConString"),Boolean)
             End Get
         End Property
+        
+        <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("TEST")>  _
+        Public ReadOnly Property UserConfig_Prefix() As String
+            Get
+                Return CType(Me("UserConfig_Prefix"),String)
+            End Get
+        End Property
     End Class
 End Namespace
 
diff --git a/app/DD_PM_WINDREAM/My Project/Settings.settings b/app/DD_PM_WINDREAM/My Project/Settings.settings
index 5137e6a..310cf2d 100644
--- a/app/DD_PM_WINDREAM/My Project/Settings.settings	
+++ b/app/DD_PM_WINDREAM/My Project/Settings.settings	
@@ -67,5 +67,8 @@
     <Setting Name="UseAppConfigConString" Type="System.Boolean" Scope="Application">
       <Value Profile="(Default)">True</Value>
     </Setting>
+    <Setting Name="UserConfig_Prefix" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">TEST</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file

From a53f16927d33245f5994ed92e20cfcb7fa95ff82 Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@digitaldata.works>
Date: Thu, 17 Dec 2020 16:55:55 +0100
Subject: [PATCH 2/2] Version 2.1.6.0

---
 app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb b/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb
index 7e0b2d7..e38ba03 100644
--- a/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb	
+++ b/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb	
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.1.5.9")>
+<Assembly: AssemblyVersion("2.1.6.0")>
 <Assembly: AssemblyFileVersion("1.0.0.0")>