diff --git a/.vs/WIDigConsoleApp/v15/.suo b/.vs/WIDigConsoleApp/v15/.suo index 338a7e6..f3acb78 100644 Binary files a/.vs/WIDigConsoleApp/v15/.suo and b/.vs/WIDigConsoleApp/v15/.suo differ diff --git a/WIDigConsoleApp/Module1.vb b/WIDigConsoleApp/Module1.vb index 69e9610..1e6b1eb 100644 --- a/WIDigConsoleApp/Module1.vb +++ b/WIDigConsoleApp/Module1.vb @@ -131,6 +131,8 @@ Module Module1 ElseIf oArg.StartsWith("-Target@") Then oTargetPath = oArg.Replace("-Target@", "") Dim oWMFolder = System.IO.Path.GetDirectoryName(oTargetPath) + Dim oWindowsPath = oTargetPath + oExtension = Path.GetExtension(oWindowsPath) Dim oNormalizePath = WINDREAM.GetNormalizedPath(oTargetPath) If WINDREAM.TestFileExists(oTargetPath) = False Then LOGGER.Info($"WMFile [{oTargetPath}] not existing!") @@ -143,7 +145,7 @@ Module Module1 End If End If 'Checks and creates the path if necessary - WINDREAM.NewFolder(oTargetPath) + WINDREAM.NewFolder(oTargetPath, oExtension) ElseIf oArg.StartsWith("-WMOT@") Then oWMObjecttype = oArg.Replace("-WMOT@", "") diff --git a/WIDigConsoleApp/Runtime.vb b/WIDigConsoleApp/Runtime.vb index 04ad780..263bed8 100644 --- a/WIDigConsoleApp/Runtime.vb +++ b/WIDigConsoleApp/Runtime.vb @@ -15,4 +15,5 @@ Module Runtime Public oWMObjecttype As String Public oIndexArr As String() Public WMIndices As List(Of String) + Public oExtension As String End Module \ No newline at end of file diff --git a/WIDigConsoleApp/WIDigConsoleApp.vbproj.user b/WIDigConsoleApp/WIDigConsoleApp.vbproj.user index 9692cfb..822495c 100644 --- a/WIDigConsoleApp/WIDigConsoleApp.vbproj.user +++ b/WIDigConsoleApp/WIDigConsoleApp.vbproj.user @@ -1,6 +1,6 @@  - -Mode%40IMPO -Source%40E:\TEMP\TEST.pdf -Target%40"W:\ImportWIDIG\Testfile.pdf" -WMOT%40"DIGITAL DATA - Entwicklung" -index%40{"Integer 23"=4711%3b"String 38"=WeDigNoWIDig%3b"Boolean 04"=false} + -Mode%40IMPV -Source%40E:\TEMP\TEST.pdf -Target%40"W:\ImportWIDIG\Testfile.pdf" -WMOT%40"DIGITAL DATA - Entwicklung" -index%40{"Integer 23"=4711%3b"String 38"=WeDigNoWIDig%3b"Boolean 04"=false} \ No newline at end of file diff --git a/WIDigConsoleApp/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/WIDigConsoleApp/obj/Debug/DesignTimeResolveAssemblyReferences.cache new file mode 100644 index 0000000..c4b5b2c Binary files /dev/null and b/WIDigConsoleApp/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/WIDigConsoleApp/obj/Debug/TempPE/My Project.Resources.Designer.vb.dll b/WIDigConsoleApp/obj/Debug/TempPE/My Project.Resources.Designer.vb.dll new file mode 100644 index 0000000..21f3184 Binary files /dev/null and b/WIDigConsoleApp/obj/Debug/TempPE/My Project.Resources.Designer.vb.dll differ diff --git a/WIDigConsoleApp/obj/Debug/WIDigConsoleApp.exe b/WIDigConsoleApp/obj/Debug/WIDigConsoleApp.exe index fdb3add..bbd3252 100644 Binary files a/WIDigConsoleApp/obj/Debug/WIDigConsoleApp.exe and b/WIDigConsoleApp/obj/Debug/WIDigConsoleApp.exe differ diff --git a/WIDigConsoleApp/obj/Debug/WIDigConsoleApp.pdb b/WIDigConsoleApp/obj/Debug/WIDigConsoleApp.pdb index 6f9d610..c33b91d 100644 Binary files a/WIDigConsoleApp/obj/Debug/WIDigConsoleApp.pdb and b/WIDigConsoleApp/obj/Debug/WIDigConsoleApp.pdb differ diff --git a/WIDigConsoleApp/obj/Debug/WIDigConsoleApp.vbproj.FileListAbsolute.txt b/WIDigConsoleApp/obj/Debug/WIDigConsoleApp.vbproj.FileListAbsolute.txt index 4481c7f..1d6df52 100644 --- a/WIDigConsoleApp/obj/Debug/WIDigConsoleApp.vbproj.FileListAbsolute.txt +++ b/WIDigConsoleApp/obj/Debug/WIDigConsoleApp.vbproj.FileListAbsolute.txt @@ -53,7 +53,6 @@ E:\SchreiberM\Visual Studio\GIT\WIDIG\WIDigConsoleApp\bin\Debug\DigitalData.Modu E:\SchreiberM\Visual Studio\GIT\WIDIG\WIDigConsoleApp\bin\Debug\DigitalData.Modules.Language.pdb E:\SchreiberM\Visual Studio\GIT\WIDIG\WIDigConsoleApp\bin\Debug\DigitalData.Modules.Language.xml E:\SchreiberM\Visual Studio\GIT\WIDIG\WIDigConsoleApp\bin\Debug\protobuf-net.xml -E:\SchreiberM\Visual Studio\GIT\WIDIG\WIDigConsoleApp\obj\Debug\WIDigConsoleApp.vbprojAssemblyReference.cache E:\SchreiberM\Visual Studio\GIT\WIDIG\WIDigConsoleApp\obj\Debug\WIDigConsoleApp.Resources.resources E:\SchreiberM\Visual Studio\GIT\WIDIG\WIDigConsoleApp\obj\Debug\WIDigConsoleApp.vbproj.GenerateResource.cache E:\SchreiberM\Visual Studio\GIT\WIDIG\WIDigConsoleApp\obj\Debug\WIDigConsoleApp.vbproj.CoreCompileInputs.cache diff --git a/WIDigConsoleApp/obj/Debug/WIDigConsoleApp.vbprojAssemblyReference.cache b/WIDigConsoleApp/obj/Debug/WIDigConsoleApp.vbprojAssemblyReference.cache deleted file mode 100644 index b13503a..0000000 Binary files a/WIDigConsoleApp/obj/Debug/WIDigConsoleApp.vbprojAssemblyReference.cache and /dev/null differ diff --git a/WIDigForm/.vs/WIDIG/v15/.suo b/WIDigForm/.vs/WIDIG/v15/.suo new file mode 100644 index 0000000..9b9c806 Binary files /dev/null and b/WIDigForm/.vs/WIDIG/v15/.suo differ diff --git a/WIDigForm/Runtime.vb b/WIDigForm/Runtime.vb index 5713a68..3a20440 100644 --- a/WIDigForm/Runtime.vb +++ b/WIDigForm/Runtime.vb @@ -15,4 +15,5 @@ Module Runtime Public oWMObjecttype As String Public oIndexArr As String() Public WMIndices As List(Of String) + Public OExtension As String End Module diff --git a/WIDigForm/bin/Debug/DigitalData.Modules.Config.dll b/WIDigForm/bin/Debug/DigitalData.Modules.Config.dll index 347e627..e9adf52 100644 Binary files a/WIDigForm/bin/Debug/DigitalData.Modules.Config.dll and b/WIDigForm/bin/Debug/DigitalData.Modules.Config.dll differ diff --git a/WIDigForm/bin/Debug/DigitalData.Modules.Config.pdb b/WIDigForm/bin/Debug/DigitalData.Modules.Config.pdb index b7f4c50..31932a1 100644 Binary files a/WIDigForm/bin/Debug/DigitalData.Modules.Config.pdb and b/WIDigForm/bin/Debug/DigitalData.Modules.Config.pdb differ diff --git a/WIDigForm/bin/Debug/DigitalData.Modules.Config.xml b/WIDigForm/bin/Debug/DigitalData.Modules.Config.xml index b1f670f..03189ef 100644 --- a/WIDigForm/bin/Debug/DigitalData.Modules.Config.xml +++ b/WIDigForm/bin/Debug/DigitalData.Modules.Config.xml @@ -63,9 +63,10 @@ DigitalData.Modules.Config LogConfig instance The path to check for a user config file, eg. AppData (Usually Application.UserAppDataPath or Application.LocalUserAppDataPath) The path to check for a computer config file, eg. ProgramData (Usually Application.CommonAppDataPath) + The path to check for a third config file. This is useful when running the Application in an environment where AppData/ProgramData directories are not available Override values from ComputerConfig with UserConfig - + Creates a new ConfigManager with a single (user)config path diff --git a/WIDigForm/bin/Debug/DigitalData.Modules.Filesystem.dll b/WIDigForm/bin/Debug/DigitalData.Modules.Filesystem.dll index 3069050..123ebbd 100644 Binary files a/WIDigForm/bin/Debug/DigitalData.Modules.Filesystem.dll and b/WIDigForm/bin/Debug/DigitalData.Modules.Filesystem.dll differ diff --git a/WIDigForm/bin/Debug/DigitalData.Modules.Filesystem.pdb b/WIDigForm/bin/Debug/DigitalData.Modules.Filesystem.pdb index 8cf682d..e9de467 100644 Binary files a/WIDigForm/bin/Debug/DigitalData.Modules.Filesystem.pdb and b/WIDigForm/bin/Debug/DigitalData.Modules.Filesystem.pdb differ diff --git a/WIDigForm/bin/Debug/DigitalData.Modules.Language.dll b/WIDigForm/bin/Debug/DigitalData.Modules.Language.dll index 1e3980e..90710a3 100644 Binary files a/WIDigForm/bin/Debug/DigitalData.Modules.Language.dll and b/WIDigForm/bin/Debug/DigitalData.Modules.Language.dll differ diff --git a/WIDigForm/bin/Debug/DigitalData.Modules.Language.pdb b/WIDigForm/bin/Debug/DigitalData.Modules.Language.pdb index 7370aa8..2d1659d 100644 Binary files a/WIDigForm/bin/Debug/DigitalData.Modules.Language.pdb and b/WIDigForm/bin/Debug/DigitalData.Modules.Language.pdb differ diff --git a/WIDigForm/bin/Debug/DigitalData.Modules.Logging.dll b/WIDigForm/bin/Debug/DigitalData.Modules.Logging.dll index 41897e2..945fd5a 100644 Binary files a/WIDigForm/bin/Debug/DigitalData.Modules.Logging.dll and b/WIDigForm/bin/Debug/DigitalData.Modules.Logging.dll differ diff --git a/WIDigForm/bin/Debug/DigitalData.Modules.Logging.pdb b/WIDigForm/bin/Debug/DigitalData.Modules.Logging.pdb index ae1e73f..a4a21ec 100644 Binary files a/WIDigForm/bin/Debug/DigitalData.Modules.Logging.pdb and b/WIDigForm/bin/Debug/DigitalData.Modules.Logging.pdb differ diff --git a/WIDigForm/bin/Debug/DigitalData.Modules.Windream.dll b/WIDigForm/bin/Debug/DigitalData.Modules.Windream.dll index a7bee84..c5699ca 100644 Binary files a/WIDigForm/bin/Debug/DigitalData.Modules.Windream.dll and b/WIDigForm/bin/Debug/DigitalData.Modules.Windream.dll differ diff --git a/WIDigForm/bin/Debug/DigitalData.Modules.Windream.pdb b/WIDigForm/bin/Debug/DigitalData.Modules.Windream.pdb index 2c912bb..b9f3f79 100644 Binary files a/WIDigForm/bin/Debug/DigitalData.Modules.Windream.pdb and b/WIDigForm/bin/Debug/DigitalData.Modules.Windream.pdb differ diff --git a/WIDigForm/bin/Debug/WIDIG.exe b/WIDigForm/bin/Debug/WIDIG.exe index 192b739..7365936 100644 Binary files a/WIDigForm/bin/Debug/WIDIG.exe and b/WIDigForm/bin/Debug/WIDIG.exe differ diff --git a/WIDigForm/bin/Debug/WIDIG.pdb b/WIDigForm/bin/Debug/WIDIG.pdb index 60168cc..130221b 100644 Binary files a/WIDigForm/bin/Debug/WIDIG.pdb and b/WIDigForm/bin/Debug/WIDIG.pdb differ diff --git a/WIDigForm/frmMain.vb b/WIDigForm/frmMain.vb index ba17671..70ba354 100644 --- a/WIDigForm/frmMain.vb +++ b/WIDigForm/frmMain.vb @@ -122,6 +122,8 @@ Public Class frmMain ElseIf oArg.StartsWith("-Target@") Then oTargetPath = oArg.Replace("-Target@", "") Dim oWMFolder = System.IO.Path.GetDirectoryName(oTargetPath) + Dim oWindowsPath = oTargetPath + OExtension = IO.Path.GetExtension(oWindowsPath) Dim oNormalizePath = WINDREAM.GetNormalizedPath(oTargetPath) If WINDREAM.TestFileExists(oTargetPath) = False Then LOGGER.Info($"WMFile [{oTargetPath}] not existing!") @@ -266,7 +268,7 @@ Public Class frmMain Public Function StreamIndexFile() Try 'Checks and creates the path if necessary - WINDREAM.NewFolder(oTargetPath) + WINDREAM.NewFolder(oTargetPath, oExtension) Dim oResult As Boolean = False If oMode = "IMPV" Then oResult = WINDREAM.NewFileStream(oSourceFile, oTargetPath) diff --git a/WIDigForm/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/WIDigForm/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index f574734..7765134 100644 Binary files a/WIDigForm/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/WIDigForm/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/WIDigForm/obj/Debug/WIDIG.exe b/WIDigForm/obj/Debug/WIDIG.exe index 192b739..7365936 100644 Binary files a/WIDigForm/obj/Debug/WIDIG.exe and b/WIDigForm/obj/Debug/WIDIG.exe differ diff --git a/WIDigForm/obj/Debug/WIDIG.pdb b/WIDigForm/obj/Debug/WIDIG.pdb index 60168cc..130221b 100644 Binary files a/WIDigForm/obj/Debug/WIDIG.pdb and b/WIDigForm/obj/Debug/WIDIG.pdb differ diff --git a/WIDigForm/obj/Debug/WIDigForm.vbprojAssemblyReference.cache b/WIDigForm/obj/Debug/WIDigForm.vbprojAssemblyReference.cache index 4e0df17..3e5e766 100644 Binary files a/WIDigForm/obj/Debug/WIDigForm.vbprojAssemblyReference.cache and b/WIDigForm/obj/Debug/WIDigForm.vbprojAssemblyReference.cache differ diff --git a/WIDigForm/obj/Debug/build.force b/WIDigForm/obj/Debug/build.force new file mode 100644 index 0000000..e69de29