From 81b3236f8ad2b2c0510830fc4c4717c02906825c Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Fri, 1 May 2020 02:22:18 +0300 Subject: FSE Installer constructed. Added installer cache to git ignore. Added encryption for disk cache. --- .gitignore | 1 + .../Advanced Installer Projects/FSE Installer.aip | 1146 ++++++++++++++++++++ .../PPC Installer.back.aip | 598 ---------- .../FSE/Tango.FSE.BL/DiskCacheManager.cs | 6 +- .../FSE/Tango.FSE.UI/Tango.FSE.UI.csproj | 7 + .../FSE/Tango.FSE.UI/machine_full_0UZ_icon.ico | Bin 0 -> 321345 bytes 6 files changed, 1157 insertions(+), 601 deletions(-) create mode 100644 Software/Visual_Studio/Advanced Installer Projects/FSE Installer.aip delete mode 100644 Software/Visual_Studio/Advanced Installer Projects/PPC Installer.back.aip create mode 100644 Software/Visual_Studio/FSE/Tango.FSE.UI/machine_full_0UZ_icon.ico diff --git a/.gitignore b/.gitignore index d1eb3008e..139060822 100644 --- a/.gitignore +++ b/.gitignore @@ -305,6 +305,7 @@ __pycache__/ /Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer-cache /Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache /Software/Visual_Studio/Advanced Installer Projects/Stubs UI-cache +/Software/Visual_Studio/Advanced Installer Projects/FSE Installer-cache /Software/Visual_Studio/Build # ZBar binaries diff --git a/Software/Visual_Studio/Advanced Installer Projects/FSE Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/FSE Installer.aip new file mode 100644 index 000000000..802aacf04 --- /dev/null +++ b/Software/Visual_Studio/Advanced Installer Projects/FSE Installer.aip @@ -0,0 +1,1146 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.back.aip b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.back.aip deleted file mode 100644 index 6000cea68..000000000 --- a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.back.aip +++ /dev/null @@ -1,598 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Software/Visual_Studio/FSE/Tango.FSE.BL/DiskCacheManager.cs b/Software/Visual_Studio/FSE/Tango.FSE.BL/DiskCacheManager.cs index 08f825730..ab9f2178e 100644 --- a/Software/Visual_Studio/FSE/Tango.FSE.BL/DiskCacheManager.cs +++ b/Software/Visual_Studio/FSE/Tango.FSE.BL/DiskCacheManager.cs @@ -21,7 +21,7 @@ namespace Tango.FSE.BL protected override void Dispose(bool disposing) { - + } public new void Dispose() @@ -47,7 +47,7 @@ namespace Tango.FSE.BL { if (_default == null) { - _default = new DiskCacheManager(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Twine", "Tango", "Cache", Path.GetFileNameWithoutExtension(AppDomain.CurrentDomain.FriendlyName) + ".cache")); + _default = new DiskCacheManager(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Twine", "Tango", "Cache", "Tango FSE", Path.GetFileNameWithoutExtension(AppDomain.CurrentDomain.FriendlyName) + ".cache")); } return _default; @@ -72,7 +72,7 @@ namespace Tango.FSE.BL if (_context == null) { Directory.CreateDirectory(Path.GetDirectoryName(DatabasePath)); - _context = new DiskCacheContext(DatabasePath); + _context = new DiskCacheContext($"Filename={DatabasePath};Password=Twine13579"); } return _context; diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Tango.FSE.UI.csproj b/Software/Visual_Studio/FSE/Tango.FSE.UI/Tango.FSE.UI.csproj index b83a90c25..5e2ecb443 100644 --- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Tango.FSE.UI.csproj +++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Tango.FSE.UI.csproj @@ -37,6 +37,9 @@ prompt 4 + + machine_full_0UZ_icon.ico + ..\..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll @@ -661,6 +664,9 @@ + + + call "$(DevEnvDir)..\..\vc\vcvarsall.bat" x86 @@ -711,6 +717,7 @@ RD /S /Q "$(TargetDir)bg\" RD /S /Q "$(TargetDir)bn-BD\" RD /S /Q "$(TargetDir)nb-NO\" RD /S /Q "$(TargetDir)pt-BR\" +RD /S /Q "$(TargetDir)SQLExaminer\Configurations\" copy /Y "$(SolutionDir)Referenced Assemblies\mscoree.dll" "$(TargetDir)" copy /Y "$(SolutionDir)Referenced Assemblies\msvcp140d.dll" "$(TargetDir)" diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/machine_full_0UZ_icon.ico b/Software/Visual_Studio/FSE/Tango.FSE.UI/machine_full_0UZ_icon.ico new file mode 100644 index 000000000..6454f962c Binary files /dev/null and b/Software/Visual_Studio/FSE/Tango.FSE.UI/machine_full_0UZ_icon.ico differ -- cgit v1.3.1