diff --git a/.gitignore b/.gitignore index 60055c1..7ad3bc0 100644 --- a/.gitignore +++ b/.gitignore @@ -155,3 +155,4 @@ $RECYCLE.BIN/ # Mac desktop service store files .DS_Store /app/.vs/DD-Record-Organizer/v15/Server/sqlite3 +/app/.vs diff --git a/app/.vs/DD-Record-Organizer/DesignTimeBuild/.dtbcache b/app/.vs/DD-Record-Organizer/DesignTimeBuild/.dtbcache deleted file mode 100644 index 9040339..0000000 Binary files a/app/.vs/DD-Record-Organizer/DesignTimeBuild/.dtbcache and /dev/null differ diff --git a/app/.vs/config/applicationhost.config b/app/.vs/config/applicationhost.config deleted file mode 100644 index de613a4..0000000 --- a/app/.vs/config/applicationhost.config +++ /dev/null @@ -1,1020 +0,0 @@ - - - - - - - -
-
-
-
-
-
-
-
- - - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
- -
-
-
-
-
-
- -
-
-
-
-
- -
-
-
- -
-
- -
-
- -
-
-
- - -
-
-
-
-
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/DD-Record-Organizer.sln b/app/DD-Record-Organizer.sln index 160805a..a6eb097 100644 --- a/app/DD-Record-Organizer.sln +++ b/app/DD-Record-Organizer.sln @@ -1,18 +1,20 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26228.9 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29728.190 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DD-Record-Organizer", "DD-Record-Organizer\DD-Record-Organizer.vbproj", "{BDCC148B-4C84-4A48-80CF-4C56057294E0}" EndProject -Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SetupWiX", "SetupWiX\SetupWiX.wixproj", "{BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}" -EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "RecordOrganizer_RightManager", "RecordOrganizer_RightManager\RecordOrganizer_RightManager.vbproj", "{F1C8A9DF-2452-4E3B-9C32-0C792F6ED2E6}" EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VERSION_CHECKER", "VERSION_CHECKER\VERSION_CHECKER.vbproj", "{BD9ADB52-06CA-401C-84C7-1D94BC3E07E7}" EndProject Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SetupWiX_NoUpdater", "SetupWiX_NoUpdater\SetupWiX_NoUpdater.wixproj", "{9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}" EndProject +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SetupVS19", "SetupVS19\SetupVS19.wixproj", "{7727A1A0-451F-4166-84B2-F1CD53B66692}" +EndProject +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Setup_NoUpdaterVS19", "Setup_NoUpdaterVS19\Setup_NoUpdaterVS19.wixproj", "{A7F7585A-C46A-4436-9F6E-17629325CE58}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution CD_ROM|Any CPU = CD_ROM|Any CPU @@ -57,31 +59,6 @@ Global {BDCC148B-4C84-4A48-80CF-4C56057294E0}.SingleImage|Mixed Platforms.ActiveCfg = Debug|Any CPU {BDCC148B-4C84-4A48-80CF-4C56057294E0}.SingleImage|Mixed Platforms.Build.0 = Debug|Any CPU {BDCC148B-4C84-4A48-80CF-4C56057294E0}.SingleImage|x86.ActiveCfg = Debug|Any CPU - {BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}.CD_ROM|Any CPU.ActiveCfg = Release|x86 - {BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}.CD_ROM|Mixed Platforms.ActiveCfg = Release|x86 - {BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}.CD_ROM|Mixed Platforms.Build.0 = Release|x86 - {BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}.CD_ROM|x86.ActiveCfg = Release|x86 - {BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}.CD_ROM|x86.Build.0 = Release|x86 - {BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}.Debug|Any CPU.ActiveCfg = Debug|x86 - {BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 - {BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}.Debug|Mixed Platforms.Build.0 = Debug|x86 - {BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}.Debug|x86.ActiveCfg = Debug|x86 - {BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}.Debug|x86.Build.0 = Debug|x86 - {BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}.DVD-5|Any CPU.ActiveCfg = Debug|x86 - {BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}.DVD-5|Mixed Platforms.ActiveCfg = Debug|x86 - {BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}.DVD-5|Mixed Platforms.Build.0 = Debug|x86 - {BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}.DVD-5|x86.ActiveCfg = Debug|x86 - {BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}.DVD-5|x86.Build.0 = Debug|x86 - {BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}.Release|Any CPU.ActiveCfg = Release|x86 - {BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}.Release|Mixed Platforms.ActiveCfg = Release|x86 - {BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}.Release|Mixed Platforms.Build.0 = Release|x86 - {BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}.Release|x86.ActiveCfg = Release|x86 - {BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}.Release|x86.Build.0 = Release|x86 - {BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}.SingleImage|Any CPU.ActiveCfg = Release|x86 - {BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}.SingleImage|Mixed Platforms.ActiveCfg = Release|x86 - {BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}.SingleImage|Mixed Platforms.Build.0 = Release|x86 - {BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}.SingleImage|x86.ActiveCfg = Release|x86 - {BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}.SingleImage|x86.Build.0 = Release|x86 {F1C8A9DF-2452-4E3B-9C32-0C792F6ED2E6}.CD_ROM|Any CPU.ActiveCfg = Release|Any CPU {F1C8A9DF-2452-4E3B-9C32-0C792F6ED2E6}.CD_ROM|Any CPU.Build.0 = Release|Any CPU {F1C8A9DF-2452-4E3B-9C32-0C792F6ED2E6}.CD_ROM|Mixed Platforms.ActiveCfg = Release|Any CPU @@ -160,8 +137,67 @@ Global {9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.SingleImage|Mixed Platforms.Build.0 = Release|x86 {9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.SingleImage|x86.ActiveCfg = Release|x86 {9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.SingleImage|x86.Build.0 = Release|x86 + {7727A1A0-451F-4166-84B2-F1CD53B66692}.CD_ROM|Any CPU.ActiveCfg = Release|x86 + {7727A1A0-451F-4166-84B2-F1CD53B66692}.CD_ROM|Any CPU.Build.0 = Release|x86 + {7727A1A0-451F-4166-84B2-F1CD53B66692}.CD_ROM|Mixed Platforms.ActiveCfg = Release|x86 + {7727A1A0-451F-4166-84B2-F1CD53B66692}.CD_ROM|Mixed Platforms.Build.0 = Release|x86 + {7727A1A0-451F-4166-84B2-F1CD53B66692}.CD_ROM|x86.ActiveCfg = Release|x86 + {7727A1A0-451F-4166-84B2-F1CD53B66692}.CD_ROM|x86.Build.0 = Release|x86 + {7727A1A0-451F-4166-84B2-F1CD53B66692}.Debug|Any CPU.ActiveCfg = Debug|x86 + {7727A1A0-451F-4166-84B2-F1CD53B66692}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 + {7727A1A0-451F-4166-84B2-F1CD53B66692}.Debug|Mixed Platforms.Build.0 = Debug|x86 + {7727A1A0-451F-4166-84B2-F1CD53B66692}.Debug|x86.ActiveCfg = Debug|x86 + {7727A1A0-451F-4166-84B2-F1CD53B66692}.Debug|x86.Build.0 = Debug|x86 + {7727A1A0-451F-4166-84B2-F1CD53B66692}.DVD-5|Any CPU.ActiveCfg = Release|x86 + {7727A1A0-451F-4166-84B2-F1CD53B66692}.DVD-5|Any CPU.Build.0 = Release|x86 + {7727A1A0-451F-4166-84B2-F1CD53B66692}.DVD-5|Mixed Platforms.ActiveCfg = Debug|x86 + {7727A1A0-451F-4166-84B2-F1CD53B66692}.DVD-5|Mixed Platforms.Build.0 = Debug|x86 + {7727A1A0-451F-4166-84B2-F1CD53B66692}.DVD-5|x86.ActiveCfg = Debug|x86 + {7727A1A0-451F-4166-84B2-F1CD53B66692}.DVD-5|x86.Build.0 = Debug|x86 + {7727A1A0-451F-4166-84B2-F1CD53B66692}.Release|Any CPU.ActiveCfg = Release|x86 + {7727A1A0-451F-4166-84B2-F1CD53B66692}.Release|Mixed Platforms.ActiveCfg = Release|x86 + {7727A1A0-451F-4166-84B2-F1CD53B66692}.Release|Mixed Platforms.Build.0 = Release|x86 + {7727A1A0-451F-4166-84B2-F1CD53B66692}.Release|x86.ActiveCfg = Release|x86 + {7727A1A0-451F-4166-84B2-F1CD53B66692}.Release|x86.Build.0 = Release|x86 + {7727A1A0-451F-4166-84B2-F1CD53B66692}.SingleImage|Any CPU.ActiveCfg = Release|x86 + {7727A1A0-451F-4166-84B2-F1CD53B66692}.SingleImage|Any CPU.Build.0 = Release|x86 + {7727A1A0-451F-4166-84B2-F1CD53B66692}.SingleImage|Mixed Platforms.ActiveCfg = Release|x86 + {7727A1A0-451F-4166-84B2-F1CD53B66692}.SingleImage|Mixed Platforms.Build.0 = Release|x86 + {7727A1A0-451F-4166-84B2-F1CD53B66692}.SingleImage|x86.ActiveCfg = Release|x86 + {7727A1A0-451F-4166-84B2-F1CD53B66692}.SingleImage|x86.Build.0 = Release|x86 + {A7F7585A-C46A-4436-9F6E-17629325CE58}.CD_ROM|Any CPU.ActiveCfg = Release|x86 + {A7F7585A-C46A-4436-9F6E-17629325CE58}.CD_ROM|Any CPU.Build.0 = Release|x86 + {A7F7585A-C46A-4436-9F6E-17629325CE58}.CD_ROM|Mixed Platforms.ActiveCfg = Release|x86 + {A7F7585A-C46A-4436-9F6E-17629325CE58}.CD_ROM|Mixed Platforms.Build.0 = Release|x86 + {A7F7585A-C46A-4436-9F6E-17629325CE58}.CD_ROM|x86.ActiveCfg = Release|x86 + {A7F7585A-C46A-4436-9F6E-17629325CE58}.CD_ROM|x86.Build.0 = Release|x86 + {A7F7585A-C46A-4436-9F6E-17629325CE58}.Debug|Any CPU.ActiveCfg = Debug|x86 + {A7F7585A-C46A-4436-9F6E-17629325CE58}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 + {A7F7585A-C46A-4436-9F6E-17629325CE58}.Debug|Mixed Platforms.Build.0 = Debug|x86 + {A7F7585A-C46A-4436-9F6E-17629325CE58}.Debug|x86.ActiveCfg = Debug|x86 + {A7F7585A-C46A-4436-9F6E-17629325CE58}.Debug|x86.Build.0 = Debug|x86 + {A7F7585A-C46A-4436-9F6E-17629325CE58}.DVD-5|Any CPU.ActiveCfg = Release|x86 + {A7F7585A-C46A-4436-9F6E-17629325CE58}.DVD-5|Any CPU.Build.0 = Release|x86 + {A7F7585A-C46A-4436-9F6E-17629325CE58}.DVD-5|Mixed Platforms.ActiveCfg = Debug|x86 + {A7F7585A-C46A-4436-9F6E-17629325CE58}.DVD-5|Mixed Platforms.Build.0 = Debug|x86 + {A7F7585A-C46A-4436-9F6E-17629325CE58}.DVD-5|x86.ActiveCfg = Debug|x86 + {A7F7585A-C46A-4436-9F6E-17629325CE58}.DVD-5|x86.Build.0 = Debug|x86 + {A7F7585A-C46A-4436-9F6E-17629325CE58}.Release|Any CPU.ActiveCfg = Release|x86 + {A7F7585A-C46A-4436-9F6E-17629325CE58}.Release|Mixed Platforms.ActiveCfg = Release|x86 + {A7F7585A-C46A-4436-9F6E-17629325CE58}.Release|Mixed Platforms.Build.0 = Release|x86 + {A7F7585A-C46A-4436-9F6E-17629325CE58}.Release|x86.ActiveCfg = Release|x86 + {A7F7585A-C46A-4436-9F6E-17629325CE58}.Release|x86.Build.0 = Release|x86 + {A7F7585A-C46A-4436-9F6E-17629325CE58}.SingleImage|Any CPU.ActiveCfg = Release|x86 + {A7F7585A-C46A-4436-9F6E-17629325CE58}.SingleImage|Any CPU.Build.0 = Release|x86 + {A7F7585A-C46A-4436-9F6E-17629325CE58}.SingleImage|Mixed Platforms.ActiveCfg = Release|x86 + {A7F7585A-C46A-4436-9F6E-17629325CE58}.SingleImage|Mixed Platforms.Build.0 = Release|x86 + {A7F7585A-C46A-4436-9F6E-17629325CE58}.SingleImage|x86.ActiveCfg = Release|x86 + {A7F7585A-C46A-4436-9F6E-17629325CE58}.SingleImage|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {BFB9D2B3-CAD7-427D-8A0D-503795CD9608} + EndGlobalSection EndGlobal diff --git a/app/SetupWiX/Product.wxs b/app/SetupVS19/Product.wxs similarity index 96% rename from app/SetupWiX/Product.wxs rename to app/SetupVS19/Product.wxs index 4573737..1615021 100644 --- a/app/SetupWiX/Product.wxs +++ b/app/SetupVS19/Product.wxs @@ -2,22 +2,22 @@ - - + @@ -36,7 +36,7 @@ AllowSameVersionUpgrades="no" DowngradeErrorMessage="A newer version of [ProductName] is already installed. The setup will terminate." /> - + - + @@ -60,14 +60,14 @@ - - + + - + @@ -83,13 +83,13 @@ - + - + - + - + @@ -97,10 +97,10 @@ - + - + + + - + - + - + @@ -148,7 +148,7 @@ - + @@ -157,7 +157,7 @@ - + @@ -182,7 +182,7 @@ - + @@ -198,7 +198,7 @@ - + @@ -217,7 +217,7 @@ - + @@ -243,15 +243,15 @@ - + - + - + @@ -259,13 +259,13 @@ - + - + - + @@ -292,10 +292,10 @@ - + - + diff --git a/app/SetupWiX/SetupWiX.wixproj b/app/SetupVS19/SetupVS19.wixproj similarity index 60% rename from app/SetupWiX/SetupWiX.wixproj rename to app/SetupVS19/SetupVS19.wixproj index 969e9b6..7e297fd 100644 --- a/app/SetupWiX/SetupWiX.wixproj +++ b/app/SetupVS19/SetupVS19.wixproj @@ -1,28 +1,24 @@ - - + + Debug x86 - 3.8 - bdd0ee4f-7063-47ca-b8b8-b94f23ab8890 + 3.10 + 7727a1a0-451f-4166-84b2-f1cd53b66692 2.0 - RecordOrganizerSetup + SetupVS19 Package - $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets - $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets - - bin\$(Configuration)\ obj\$(Configuration)\ Debug - -b "$(SolutionDir)DD-Record-Organizer\bin\$(Configuration)" --b "$(SolutionDir)RecordOrganizer_RightManager\bin\$(Configuration)" --b "$(SolutionDir)VERSION_CHECKER\bin\$(Configuration)" --cultures:de-DE,en-US - - + + -b "$(SolutionDir)DD-Record-Organizer\bin\$(Configuration)" + -b "$(SolutionDir)RecordOrganizer_RightManager\bin\$(Configuration)" + -b "$(SolutionDir)VERSION_CHECKER\bin\$(Configuration)" + -cultures:de-DE,en-US + bin\$(Configuration)\ @@ -41,20 +37,10 @@ WixUIExtension - - - - - - - - - - - + + + + @@ -75,6 +61,10 @@ diff --git a/app/SetupWiX_NoUpdater/Product.wxs b/app/Setup_NoUpdaterVS19/Product.wxs similarity index 95% rename from app/SetupWiX_NoUpdater/Product.wxs rename to app/Setup_NoUpdaterVS19/Product.wxs index 5ac9915..e56a02f 100644 --- a/app/SetupWiX_NoUpdater/Product.wxs +++ b/app/Setup_NoUpdaterVS19/Product.wxs @@ -2,22 +2,22 @@ - - + @@ -36,7 +36,7 @@ AllowSameVersionUpgrades="no" DowngradeErrorMessage="A newer version of [ProductName] is already installed. The setup will terminate." /> - + - + @@ -60,14 +60,14 @@ - - + + - + @@ -83,18 +83,20 @@ - + - + - + + + - + @@ -125,23 +127,23 @@ - - + + - + - + - + @@ -149,7 +151,7 @@ - + @@ -158,7 +160,7 @@ - + @@ -183,7 +185,7 @@ - + @@ -199,7 +201,7 @@ - + @@ -218,7 +220,7 @@ - + @@ -244,15 +246,15 @@ - + - + - + @@ -260,13 +262,13 @@ - + - + - + @@ -293,10 +295,10 @@ - + - + diff --git a/app/SetupWiX_NoUpdater/SetupWiX_NoUpdater.wixproj b/app/Setup_NoUpdaterVS19/Setup_NoUpdaterVS19.wixproj similarity index 60% rename from app/SetupWiX_NoUpdater/SetupWiX_NoUpdater.wixproj rename to app/Setup_NoUpdaterVS19/Setup_NoUpdaterVS19.wixproj index 3ba991e..e555dd3 100644 --- a/app/SetupWiX_NoUpdater/SetupWiX_NoUpdater.wixproj +++ b/app/Setup_NoUpdaterVS19/Setup_NoUpdaterVS19.wixproj @@ -1,28 +1,24 @@ - - + + Debug x86 - 3.8 - {9e8b6445-8ca8-4b8a-8a04-4437a9970b7b} + 3.10 + a7f7585a-c46a-4436-9f6e-17629325ce58 2.0 - RecordOrganizerSetup + Setup_NoUpdaterVS19 Package - $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets - $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets - - bin\$(Configuration)\ obj\$(Configuration)\ Debug - -b "$(SolutionDir)DD-Record-Organizer\bin\$(Configuration)" --b "$(SolutionDir)RecordOrganizer_RightManager\bin\$(Configuration)" --b "$(SolutionDir)VERSION_CHECKER\bin\$(Configuration)" --cultures:de-DE,en-US - - + + -b "$(SolutionDir)DD-Record-Organizer\bin\$(Configuration)" + -b "$(SolutionDir)RecordOrganizer_RightManager\bin\$(Configuration)" + -b "$(SolutionDir)VERSION_CHECKER\bin\$(Configuration)" + -cultures:de-DE,en-US + bin\$(Configuration)\ @@ -41,20 +37,10 @@ WixUIExtension - - - - - - - - - - - + + + + @@ -75,6 +61,10 @@