From b4a1c833f0e67835e89961e77329efe5bf2a7797 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Tue, 21 Aug 2018 10:50:41 +0300 Subject: Refactored ObservablesContext to use DataSource object! Upgraded to .NET 4.7.2 !!! --- .../VS Extensions/TargetFrameworkMigrator.vsix | Bin 0 -> 54448 bytes .../Tango.MachineStudio.ColorLab.csproj | 2 +- .../Tango.MachineStudio.DB.csproj | 2 +- .../Tango.MachineStudio.DataCapture.csproj | 2 +- .../Tango.MachineStudio.DataCapture/app.config | 4 + .../Tango.MachineStudio.Developer.csproj | 2 +- .../Tango.MachineStudio.Developer/app.config | 4 + .../Tango.MachineStudio.HardwareDesigner.csproj | 2 +- .../Modules/Tango.MachineStudio.Logging/App.config | 4 + .../Tango.MachineStudio.Logging.csproj | 2 +- .../Tango.MachineStudio.MachineDesigner.csproj | 2 +- .../Tango.MachineStudio.MachineDesigner/app.config | 4 + .../Tango.MachineStudio.Stubs.csproj | 2 +- .../Tango.MachineStudio.Synchronization.csproj | 2 +- .../Tango.MachineStudio.Technician.csproj | 2 +- .../Tango.MachineStudio.UsersAndRoles.csproj | 2 +- .../Tango.MachineStudio.Common.csproj | 2 +- .../Tango.MachineStudio.Common/app.config | 4 + .../Tango.MachineStudio.Publisher/App.config | 8 ++ .../Tango.MachineStudio.Publisher.csproj | 2 +- .../Tango.MachineStudio.UI/App.xaml.cs | 15 ++- .../Tango.MachineStudio.UI.csproj | 2 +- .../Tango.MachineStudio.UpdateService.csproj | 2 +- .../Tango.MachineStudio.UpdateService/Web.config | 9 +- .../Tango.MachineStudio.Updater.csproj | 2 +- .../Notes/Tango.Notes/Tango.Notes.csproj | 2 +- .../Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj | 2 +- .../PPC/Modules/Tango.PPC.Jobs/app.config | 4 + .../Tango.PPC.MachineSettings.csproj | 2 +- .../Modules/Tango.PPC.MachineSettings/app.config | 4 + .../Tango.PPC.Synchronization.csproj | 2 +- .../Modules/Tango.PPC.Synchronization/app.config | 4 + .../MachineSetup/MachineSetupManager.cs | 2 +- .../PPC/Tango.PPC.Common/Tango.PPC.Common.csproj | 2 +- .../Visual_Studio/PPC/Tango.PPC.Common/app.config | 4 + .../PPC/Tango.PPC.Publisher/App.config | 4 + .../Tango.PPC.Publisher/Tango.PPC.Publisher.csproj | 2 +- Software/Visual_Studio/PPC/Tango.PPC.UI/App.config | 4 + .../Visual_Studio/PPC/Tango.PPC.UI/App.xaml.cs | 7 +- .../PPC/Tango.PPC.UI/Tango.PPC.UI.csproj | 2 +- .../Tango.PPC.UpdateService.csproj | 2 +- .../PPC/Tango.PPC.UpdateService/Web.config | 7 +- .../PPC/Tango.PPC.Updater/Tango.PPC.Updater.csproj | 2 +- .../ICSharpCode.AvalonEdit.csproj | 2 +- .../MaterialDesignColors.Wpf.csproj | 2 +- .../MaterialDesignThemes.Wpf.csproj | 2 +- .../Tango.AutoComplete/Tango.AutoComplete.csproj | 2 +- .../Tango.AnimatedGif/Tango.AnimatedGif.csproj | 2 +- .../Tango.BL/ObservablesContextExtension.cs | 62 ++++------ Software/Visual_Studio/Tango.BL/Tango.BL.csproj | 2 +- .../Tango.BrushPicker/Tango.BrushPicker.csproj | 2 +- Software/Visual_Studio/Tango.CSV/Tango.CSV.csproj | 2 +- .../Tango.CircularGauge/Tango.CircularGauge.csproj | 2 +- .../Tango.ColorPicker/Tango.ColorPicker.csproj | 2 +- Software/Visual_Studio/Tango.Core/App.config | 20 ++++ Software/Visual_Studio/Tango.Core/CoreSettings.cs | 12 +- Software/Visual_Studio/Tango.Core/DataSource.cs | 131 +++++++++++++++++++++ .../Visual_Studio/Tango.Core/DataSourceType.cs | 31 +++++ .../Tango.Core/Properties/Resources.Designer.cs | 2 +- .../Visual_Studio/Tango.Core/Tango.Core.csproj | 34 +++++- Software/Visual_Studio/Tango.Core/packages.config | 5 + .../Tango.DAL.Local/Tango.DAL.Local.csproj | 2 +- .../Tango.DAL.Remote/Partials/RemoteDB.cs | 29 +---- .../Tango.DAL.Remote/Tango.DAL.Remote.csproj | 2 +- .../Tango.Documents/Tango.Documents.csproj | 2 +- .../Tango.DragAndDrop/Tango.DragAndDrop.csproj | 2 +- .../Tango.Editors/Tango.Editors.csproj | 2 +- .../Tango.EmbroideryUI/Tango.EmbroideryUI.csproj | 2 +- .../Visual_Studio/Tango.EmbroideryUI/app.config | 8 ++ .../Tango.Emulations/Tango.Emulations.csproj | 2 +- .../Visual_Studio/Tango.Hive/Tango.Hive.csproj | 2 +- .../Tango.Integration/Tango.Integration.csproj | 2 +- .../Tango.Logging/Tango.Logging.csproj | 2 +- Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj | 2 +- .../Tango.Protobuf/Tango.Protobuf.csproj | 2 +- .../Tango.SQLExaminer/Tango.SQLExaminer.csproj | 2 +- .../Tango.Scripting/Tango.Scripting.csproj | 2 +- Software/Visual_Studio/Tango.Scripting/app.config | 4 + .../Tango.Serialization/Tango.Serialization.csproj | 2 +- .../Tango.Settings/Tango.Settings.csproj | 2 +- .../Tango.SharedUI/Tango.SharedUI.csproj | 2 +- Software/Visual_Studio/Tango.SharedUI/app.config | 4 + .../Visual_Studio/Tango.Stubs/Tango.Stubs.csproj | 2 +- Software/Visual_Studio/Tango.Stubs/app.config | 4 + .../Remote/RemoteDBSynchronizer.cs | 2 +- .../Tango.Synchronization.csproj | 2 +- Software/Visual_Studio/Tango.TFS/Tango.TFS.csproj | 2 +- .../Visual_Studio/Tango.Touch/Tango.Touch.csproj | 2 +- Software/Visual_Studio/Tango.Touch/app.config | 8 ++ .../Tango.Transport/Tango.Transport.csproj | 2 +- .../Visual_Studio/Tango.UnitTesting/DAL_TST.cs | 6 +- .../Tango.UnitTesting/SQLExaminer_TST.cs | 7 +- .../Tango.UnitTesting/Synchronization_TST.cs | 4 +- .../Tango.UnitTesting/Tango.UnitTesting.csproj | 2 +- .../Visual_Studio/Tango.Video/Tango.Video.csproj | 2 +- .../Tango.Visuals/Tango.Visuals.csproj | 2 +- .../Visual_Studio/Tango.WiFi/Tango.WiFi.csproj | 2 +- .../Tango.BugReporter/Tango.BugReporter.csproj | 2 +- .../Tango.CatalogGenerator.csproj | 2 +- .../Tango.DBObservablesGenerator.CLI/App.config | 8 ++ .../ObservablesGenerator.cs | 6 +- .../Tango.DBObservablesGenerator.CLI.csproj | 2 +- .../Utilities/Tango.EmbroideryViewer/App.config | 8 ++ .../Tango.EmbroideryViewer.csproj | 2 +- .../Tango.EventsTypesGenerator.csproj | 2 +- .../Tango.HashGenerator/Tango.HashGenerator.csproj | 2 +- .../Utilities/Tango.ILMerge.UI/App.config | 8 ++ .../Tango.ILMerge.UI/Tango.ILMerge.UI.csproj | 2 +- .../Utilities/Tango.MachineEM.UI/App.config | 8 ++ .../Tango.MachineEM.UI/Tango.MachineEM.UI.csproj | 2 +- .../Tango.PMRGenerator.CLI.csproj | 2 +- .../Tango.PortsListGenerator.csproj | 2 +- .../Tango.Protobuf.CLI/Tango.Protobuf.CLI.csproj | 2 +- .../Utilities/Tango.Protobuf.UI/App.config | 8 ++ .../Tango.Protobuf.UI/Tango.Protobuf.UI.csproj | 2 +- .../Utilities/Tango.RemoteRunner.UI/App.config | 54 +++++++++ .../Tango.RemoteRunner.UI.csproj | 2 +- .../Utilities/Tango.SQLiteGenerator.CLI/App.config | 8 ++ .../Utilities/Tango.SQLiteGenerator.CLI/Program.cs | 4 +- .../Tango.SQLiteGenerator.CLI.csproj | 2 +- .../Tango.ShortcutGenerator.CLI.csproj | 2 +- .../Tango.Stubs.CLI/Tango.Stubs.CLI.csproj | 2 +- .../Utilities/Tango.Stubs.UI/App.config | 8 ++ .../Utilities/Tango.Stubs.UI/Tango.Stubs.UI.csproj | 2 +- .../Utilities/Tango.TransportRouter.UI/App.config | 8 ++ .../Tango.TransportRouter.UI.csproj | 2 +- .../Utilities/Tango.UITests/App.config | 4 + .../Utilities/Tango.UITests/Tango.UITests.csproj | 2 +- .../Tango.BuildExtensions.csproj | 2 +- .../Tango.MachineService.csproj | 2 +- 130 files changed, 578 insertions(+), 183 deletions(-) create mode 100644 Software/Visual_Studio/Installers/VS Extensions/TargetFrameworkMigrator.vsix create mode 100644 Software/Visual_Studio/Tango.Core/App.config create mode 100644 Software/Visual_Studio/Tango.Core/DataSource.cs create mode 100644 Software/Visual_Studio/Tango.Core/DataSourceType.cs (limited to 'Software/Visual_Studio') diff --git a/Software/Visual_Studio/Installers/VS Extensions/TargetFrameworkMigrator.vsix b/Software/Visual_Studio/Installers/VS Extensions/TargetFrameworkMigrator.vsix new file mode 100644 index 000000000..24e59b10f Binary files /dev/null and b/Software/Visual_Studio/Installers/VS Extensions/TargetFrameworkMigrator.vsix differ diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Tango.MachineStudio.ColorLab.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Tango.MachineStudio.ColorLab.csproj index a0d471522..7e8a9e126 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Tango.MachineStudio.ColorLab.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Tango.MachineStudio.ColorLab.csproj @@ -8,7 +8,7 @@ library Tango.MachineStudio.ColorLab Tango.MachineStudio.ColorLab - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj index 393c4e491..259f2f652 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj @@ -8,7 +8,7 @@ library Tango.MachineStudio.DB Tango.MachineStudio.DB - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Tango.MachineStudio.DataCapture.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Tango.MachineStudio.DataCapture.csproj index a8cd6b1cd..bc6e0b2d2 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Tango.MachineStudio.DataCapture.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Tango.MachineStudio.DataCapture.csproj @@ -8,7 +8,7 @@ library Tango.MachineStudio.DataCapture Tango.MachineStudio.DataCapture - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/app.config b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/app.config index 5d794b958..8924e52e3 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/app.config +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/app.config @@ -46,6 +46,10 @@ + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj index 86549a695..cc9831ad9 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj @@ -8,7 +8,7 @@ library Tango.MachineStudio.Developer Tango.MachineStudio.Developer - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/app.config b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/app.config index 77b7003e2..0e58ccf54 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/app.config +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/app.config @@ -50,6 +50,10 @@ + + + + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Tango.MachineStudio.HardwareDesigner.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Tango.MachineStudio.HardwareDesigner.csproj index 89942c6d6..efa7a669c 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Tango.MachineStudio.HardwareDesigner.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Tango.MachineStudio.HardwareDesigner.csproj @@ -8,7 +8,7 @@ library Tango.MachineStudio.HardwareDesigner Tango.MachineStudio.HardwareDesigner - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/App.config b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/App.config index 2031d1be1..2031d386f 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/App.config +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/App.config @@ -56,6 +56,10 @@ + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Tango.MachineStudio.Logging.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Tango.MachineStudio.Logging.csproj index f3318f275..f14bfade4 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Tango.MachineStudio.Logging.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Tango.MachineStudio.Logging.csproj @@ -8,7 +8,7 @@ library Tango.MachineStudio.Logging Tango.MachineStudio.Logging - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Tango.MachineStudio.MachineDesigner.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Tango.MachineStudio.MachineDesigner.csproj index 0d6708246..990d03c62 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Tango.MachineStudio.MachineDesigner.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Tango.MachineStudio.MachineDesigner.csproj @@ -8,7 +8,7 @@ library Tango.MachineStudio.MachineDesigner Tango.MachineStudio.MachineDesigner - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/app.config b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/app.config index 5d794b958..8924e52e3 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/app.config +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/app.config @@ -46,6 +46,10 @@ + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Tango.MachineStudio.Stubs.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Tango.MachineStudio.Stubs.csproj index 1c9ae5147..6bcad1d58 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Tango.MachineStudio.Stubs.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Tango.MachineStudio.Stubs.csproj @@ -8,7 +8,7 @@ library Tango.MachineStudio.Stubs Tango.MachineStudio.Stubs - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Tango.MachineStudio.Synchronization.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Tango.MachineStudio.Synchronization.csproj index e8df35ba8..e4b1edce4 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Tango.MachineStudio.Synchronization.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Tango.MachineStudio.Synchronization.csproj @@ -8,7 +8,7 @@ library Tango.MachineStudio.Synchronization Tango.MachineStudio.Synchronization - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Tango.MachineStudio.Technician.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Tango.MachineStudio.Technician.csproj index 8490800ad..d5e2f3dcd 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Tango.MachineStudio.Technician.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Tango.MachineStudio.Technician.csproj @@ -8,7 +8,7 @@ library Tango.MachineStudio.Technician Tango.MachineStudio.Technician - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Tango.MachineStudio.UsersAndRoles.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Tango.MachineStudio.UsersAndRoles.csproj index 48fe2b34c..539f10574 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Tango.MachineStudio.UsersAndRoles.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Tango.MachineStudio.UsersAndRoles.csproj @@ -8,7 +8,7 @@ library Tango.MachineStudio.UsersAndRoles Tango.MachineStudio.UsersAndRoles - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj index fedbaf8a9..8b251074d 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj @@ -8,7 +8,7 @@ library Tango.MachineStudio.Common Tango.MachineStudio.Common - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/app.config b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/app.config index 77b7003e2..0e58ccf54 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/app.config +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/app.config @@ -50,6 +50,10 @@ + + + + diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/App.config b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/App.config index 209c9be3f..156c5f7e1 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/App.config +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/App.config @@ -49,6 +49,14 @@ + + + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/Tango.MachineStudio.Publisher.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/Tango.MachineStudio.Publisher.csproj index e86b3ddf0..f9f337b70 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/Tango.MachineStudio.Publisher.csproj +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/Tango.MachineStudio.Publisher.csproj @@ -8,7 +8,7 @@ WinExe Tango.MachineStudio.Publisher Tango.MachineStudio.Publisher - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs index ed2cbdbd7..4e1c36593 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs @@ -37,9 +37,20 @@ namespace Tango.MachineStudio.UI { #if DEBUG - CoreSettings.DefaultDataBaseSource = "localhost\\SQLEXPRESS"; + CoreSettings.DefaultDataSource = new DataSource() + { + Address = "localhost\\SQLEXPRESS", + Catalog = "Tango", + IntegratedSecurity = true, + }; #else - CoreSettings.DefaultDataBaseSource = "twine01\\SQLTWINE"; + + CoreSettings.DefaultDataSource = new DataSource() + { + Address = "twine01\\SQLTWINE", + Catalog = "Tango", + IntegratedSecurity = true, + }; #endif diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj index 1a5de40e1..e720abec6 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj @@ -8,7 +8,7 @@ WinExe Tango.MachineStudio.UI Tango.MachineStudio.UI - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Tango.MachineStudio.UpdateService.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Tango.MachineStudio.UpdateService.csproj index 8e9d60541..b2200895c 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Tango.MachineStudio.UpdateService.csproj +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Tango.MachineStudio.UpdateService.csproj @@ -12,7 +12,7 @@ Properties Tango.MachineStudio.UpdateService Tango.MachineStudio.UpdateService - v4.6 + v4.7.2 True true true diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Web.config b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Web.config index 6fd5e637f..32a2460df 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Web.config +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Web.config @@ -1,4 +1,4 @@ - + @@ -27,8 +27,7 @@ - + @@ -106,6 +105,10 @@ + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater/Tango.MachineStudio.Updater.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater/Tango.MachineStudio.Updater.csproj index db6fcb52f..241085122 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater/Tango.MachineStudio.Updater.csproj +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater/Tango.MachineStudio.Updater.csproj @@ -8,7 +8,7 @@ WinExe Tango.MachineStudio.Updater Tango.MachineStudio.Updater - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/Notes/Tango.Notes/Tango.Notes.csproj b/Software/Visual_Studio/Notes/Tango.Notes/Tango.Notes.csproj index d16f5212b..9aa600c36 100644 --- a/Software/Visual_Studio/Notes/Tango.Notes/Tango.Notes.csproj +++ b/Software/Visual_Studio/Notes/Tango.Notes/Tango.Notes.csproj @@ -9,7 +9,7 @@ Properties Tango.Notes Tango.Notes - v4.6 + v4.7.2 512 diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj index 4ab67fa31..a620ecb8c 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj @@ -8,7 +8,7 @@ library Tango.PPC.Jobs Tango.PPC.Jobs - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/app.config b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/app.config index 77b7003e2..0e58ccf54 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/app.config +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/app.config @@ -50,6 +50,10 @@ + + + + diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Tango.PPC.MachineSettings.csproj b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Tango.PPC.MachineSettings.csproj index 8a81a8add..19b79fe52 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Tango.PPC.MachineSettings.csproj +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Tango.PPC.MachineSettings.csproj @@ -8,7 +8,7 @@ library Tango.PPC.MachineSettings Tango.PPC.MachineSettings - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/app.config b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/app.config index 77b7003e2..0e58ccf54 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/app.config +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/app.config @@ -50,6 +50,10 @@ + + + + diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/Tango.PPC.Synchronization.csproj b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/Tango.PPC.Synchronization.csproj index a5e3d9da0..6f5fff695 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/Tango.PPC.Synchronization.csproj +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/Tango.PPC.Synchronization.csproj @@ -8,7 +8,7 @@ library Tango.PPC.Synchronization Tango.PPC.Synchronization - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/app.config b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/app.config index 77b7003e2..0e58ccf54 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/app.config +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/app.config @@ -50,6 +50,10 @@ + + + + diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs index 8d1c0e147..8d4d5fa0a 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs @@ -173,7 +173,7 @@ namespace Tango.PPC.Common.MachineSetup CurrentStep = MachineSetupSteps.SynchronizingSchema; String db_name = "Tango"; - String localAddress = SettingsManager.Default.GetOrCreate().DataBaseSource; + String localAddress = SettingsManager.Default.GetOrCreate().DataSource.Address; String remote_address = setup_response.DbAddress; LogManager.Log($"Synchronizing database '{remote_address}\\{db_name}' => '{localAddress}\\{db_name}'..."); diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj b/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj index 5de2fbf81..0fbfb635e 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj @@ -8,7 +8,7 @@ library Tango.PPC.Common Tango.PPC.Common - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/app.config b/Software/Visual_Studio/PPC/Tango.PPC.Common/app.config index d7c68e008..adc229d39 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/app.config +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/app.config @@ -50,6 +50,10 @@ + + + + diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Publisher/App.config b/Software/Visual_Studio/PPC/Tango.PPC.Publisher/App.config index a0a64c824..b9930d796 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Publisher/App.config +++ b/Software/Visual_Studio/PPC/Tango.PPC.Publisher/App.config @@ -59,6 +59,10 @@ + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Publisher/Tango.PPC.Publisher.csproj b/Software/Visual_Studio/PPC/Tango.PPC.Publisher/Tango.PPC.Publisher.csproj index be73513b4..7fc30a77b 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Publisher/Tango.PPC.Publisher.csproj +++ b/Software/Visual_Studio/PPC/Tango.PPC.Publisher/Tango.PPC.Publisher.csproj @@ -8,7 +8,7 @@ WinExe Tango.PPC.Publisher Tango.PPC.Publisher - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/App.config b/Software/Visual_Studio/PPC/Tango.PPC.UI/App.config index 10e543617..ae2732d7a 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/App.config +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/App.config @@ -57,6 +57,10 @@ + + + + diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/App.xaml.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/App.xaml.cs index 2efd0ad18..4cffce960 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/App.xaml.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/App.xaml.cs @@ -47,7 +47,12 @@ namespace Tango.PPC.UI LogManager.Categories.Clear(); - CoreSettings.DefaultDataBaseSource = "localhost\\SQLEXPRESS"; + CoreSettings.DefaultDataSource = new DataSource() + { + Address = "localhost\\SQLEXPRESS", + Catalog = "Tango", + IntegratedSecurity = true, + }; var settings = SettingsManager.Default.GetOrCreate(); diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj index d91bee884..fdaf37c09 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj @@ -8,7 +8,7 @@ WinExe Tango.PPC.UI Tango.PPC.UI - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UpdateService/Tango.PPC.UpdateService.csproj b/Software/Visual_Studio/PPC/Tango.PPC.UpdateService/Tango.PPC.UpdateService.csproj index 8f3f6bc0a..7d48e06d1 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UpdateService/Tango.PPC.UpdateService.csproj +++ b/Software/Visual_Studio/PPC/Tango.PPC.UpdateService/Tango.PPC.UpdateService.csproj @@ -12,7 +12,7 @@ Properties Tango.PPC.UpdateService Tango.PPC.UpdateService - v4.6 + v4.7.2 True true true diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UpdateService/Web.config b/Software/Visual_Studio/PPC/Tango.PPC.UpdateService/Web.config index eca7f404e..d73fd1425 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UpdateService/Web.config +++ b/Software/Visual_Studio/PPC/Tango.PPC.UpdateService/Web.config @@ -27,8 +27,7 @@ - + @@ -106,6 +105,10 @@ + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Updater/Tango.PPC.Updater.csproj b/Software/Visual_Studio/PPC/Tango.PPC.Updater/Tango.PPC.Updater.csproj index 8ae94ebf8..4b05b79c6 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Updater/Tango.PPC.Updater.csproj +++ b/Software/Visual_Studio/PPC/Tango.PPC.Updater/Tango.PPC.Updater.csproj @@ -8,7 +8,7 @@ WinExe Tango.PPC.Updater Tango.PPC.Updater - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/SideChains/ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj b/Software/Visual_Studio/SideChains/ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj index 587f1e74d..1fa07caa6 100644 --- a/Software/Visual_Studio/SideChains/ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj +++ b/Software/Visual_Studio/SideChains/ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj @@ -7,7 +7,7 @@ Library ICSharpCode.AvalonEdit ICSharpCode.AvalonEdit - v4.6 + v4.7.2 Properties "C:\Program Files\SharpDevelop\3.0\bin\..\AddIns\AddIns\Misc\SourceAnalysis\Settings.SourceAnalysis" False diff --git a/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignColors.Wpf/MaterialDesignColors.Wpf.csproj b/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignColors.Wpf/MaterialDesignColors.Wpf.csproj index 4fe17cdc8..017cd7548 100644 --- a/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignColors.Wpf/MaterialDesignColors.Wpf.csproj +++ b/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignColors.Wpf/MaterialDesignColors.Wpf.csproj @@ -9,7 +9,7 @@ Properties MaterialDesignColors MaterialDesignColors - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj b/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj index 4c86442a0..ad6c0efe0 100644 --- a/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj +++ b/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj @@ -9,7 +9,7 @@ Properties MaterialDesignThemes.Wpf MaterialDesignThemes.Wpf - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/SideChains/Tango.AutoComplete/Tango.AutoComplete.csproj b/Software/Visual_Studio/SideChains/Tango.AutoComplete/Tango.AutoComplete.csproj index 44aba5b8e..d4139426b 100644 --- a/Software/Visual_Studio/SideChains/Tango.AutoComplete/Tango.AutoComplete.csproj +++ b/Software/Visual_Studio/SideChains/Tango.AutoComplete/Tango.AutoComplete.csproj @@ -9,7 +9,7 @@ Properties Tango.AutoComplete Tango.AutoComplete - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/Tango.AnimatedGif/Tango.AnimatedGif.csproj b/Software/Visual_Studio/Tango.AnimatedGif/Tango.AnimatedGif.csproj index 7ef6a0182..60da741dc 100644 --- a/Software/Visual_Studio/Tango.AnimatedGif/Tango.AnimatedGif.csproj +++ b/Software/Visual_Studio/Tango.AnimatedGif/Tango.AnimatedGif.csproj @@ -10,7 +10,7 @@ Properties Tango.AnimatedGif Tango.AnimatedGif - v4.6 + v4.7.2 512 diff --git a/Software/Visual_Studio/Tango.BL/ObservablesContextExtension.cs b/Software/Visual_Studio/Tango.BL/ObservablesContextExtension.cs index f38968e00..d4b8cb340 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesContextExtension.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesContextExtension.cs @@ -22,78 +22,60 @@ namespace Tango.BL /// /// The server file path. /// if set to true will try to connect to an .mdf file. - public ObservablesContext(String path, String dbName) : base(ComposeConnectionString(path, dbName)) + public ObservablesContext(DataSource dataSource) : base(dataSource.ToConnection(), true) { Database.SetInitializer(null); } /// - /// Initializes a new instance of the class. + /// Creates a default remote database context by the address specified in . /// - /// The SQLite connection. - public ObservablesContext(SQLiteConnection sqliteConnection) : base(sqliteConnection, true) + /// + public static ObservablesContext CreateDefault() { - Database.SetInitializer(null); + return new ObservablesContext(SettingsManager.Default.GetOrCreate().DataSource); } /// - /// Composes the connection string. - /// - /// The source. - /// if set to true [is file]. + /// Creates a default remote database context. + /// /// - private static String ComposeConnectionString(String source, String dbName) + public static ObservablesContext CreateDefault(DataSource dataSource) { - if (!File.Exists(source)) - { - return "Server=tcp:twine.database.windows.net,1433;Initial Catalog=Tango;Persist Security Info=False;User ID=roy@twine-s.com;Password=Maya039590898;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=False;Authentication=\"Active Directory Password\";"; - } - else - { - return String.Format("Data Source=(LocalDB)\\MSSQLLocalDB;AttachDbFileName={0};Initial Catalog={1};Integrated Security=True;MultipleActiveResultSets=True;App=EntityFramework", Path.GetFullPath(source), dbName); - } + return new ObservablesContext(dataSource); } /// - /// Creates a default remote database context by the address specified in . + /// Creates a default remote database context. /// /// - public static ObservablesContext CreateDefault() + public static ObservablesContext CreateDefault(String address, String catalog, DataSourceType type) { - var context = CreateDefault(SettingsManager.Default.GetOrCreate().DataBaseSource); - return context; + return new ObservablesContext(new DataSource() + { + Address = address, + Catalog = catalog, + IntegratedSecurity = true, + Type = type + }); } /// /// Creates a default remote database context. /// /// - public static ObservablesContext CreateDefault(String dataSource) + public static ObservablesContext CreateDefault(String address, DataSourceType type) { - var source = dataSource; - - if (File.Exists(source) && Path.GetExtension(source).ToLower() == ".db") - { - var connection = new SQLiteConnection() - { - ConnectionString = new SQLiteConnectionStringBuilder() { DataSource = Path.GetFullPath(source), ForeignKeys = true }.ConnectionString - }; - - return new ObservablesContext(connection); - } - else - { - return new ObservablesContext(source, "Tango"); - } + return CreateDefault(address, "Tango", type); } /// /// Creates a default remote database context. /// /// - public static ObservablesContext CreateDefault(String address, String database) + public static ObservablesContext CreateDefault(String address) { - return new ObservablesContext(address, database); + return CreateDefault(address, "Tango", DataSourceType.SQLServer); } /// diff --git a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj index 650ce4b58..e35a128e0 100644 --- a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj +++ b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj @@ -8,7 +8,7 @@ library Tango.BL Tango.BL - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/Tango.BrushPicker/Tango.BrushPicker.csproj b/Software/Visual_Studio/Tango.BrushPicker/Tango.BrushPicker.csproj index 6cde62c7b..13655c3ce 100644 --- a/Software/Visual_Studio/Tango.BrushPicker/Tango.BrushPicker.csproj +++ b/Software/Visual_Studio/Tango.BrushPicker/Tango.BrushPicker.csproj @@ -9,7 +9,7 @@ Properties Tango.BrushPicker Tango.BrushPicker - v4.6 + v4.7.2 512 SAK SAK diff --git a/Software/Visual_Studio/Tango.CSV/Tango.CSV.csproj b/Software/Visual_Studio/Tango.CSV/Tango.CSV.csproj index 7a2417457..f6bd6e949 100644 --- a/Software/Visual_Studio/Tango.CSV/Tango.CSV.csproj +++ b/Software/Visual_Studio/Tango.CSV/Tango.CSV.csproj @@ -9,7 +9,7 @@ Properties Tango.CSV Tango.CSV - v4.6 + v4.7.2 512 diff --git a/Software/Visual_Studio/Tango.CircularGauge/Tango.CircularGauge.csproj b/Software/Visual_Studio/Tango.CircularGauge/Tango.CircularGauge.csproj index 09042eca0..658b0a0b0 100644 --- a/Software/Visual_Studio/Tango.CircularGauge/Tango.CircularGauge.csproj +++ b/Software/Visual_Studio/Tango.CircularGauge/Tango.CircularGauge.csproj @@ -10,7 +10,7 @@ Properties Tango.CircularGauge Tango.CircularGauge - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/Tango.ColorPicker/Tango.ColorPicker.csproj b/Software/Visual_Studio/Tango.ColorPicker/Tango.ColorPicker.csproj index 7ba9d27fc..071f8b5a6 100644 --- a/Software/Visual_Studio/Tango.ColorPicker/Tango.ColorPicker.csproj +++ b/Software/Visual_Studio/Tango.ColorPicker/Tango.ColorPicker.csproj @@ -9,7 +9,7 @@ Properties Tango.ColorPicker Tango.ColorPicker - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/Tango.Core/App.config b/Software/Visual_Studio/Tango.Core/App.config new file mode 100644 index 000000000..a8da70bc0 --- /dev/null +++ b/Software/Visual_Studio/Tango.Core/App.config @@ -0,0 +1,20 @@ + + + + +
+ + + + + + + + + + + + + + + diff --git a/Software/Visual_Studio/Tango.Core/CoreSettings.cs b/Software/Visual_Studio/Tango.Core/CoreSettings.cs index 2f40d0ef0..b9ce9412b 100644 --- a/Software/Visual_Studio/Tango.Core/CoreSettings.cs +++ b/Software/Visual_Studio/Tango.Core/CoreSettings.cs @@ -10,21 +10,21 @@ namespace Tango.Core public class CoreSettings : SettingsBase { /// - /// Gets or sets the default data base source. + /// Gets or sets the default SQL data base source. /// - public static String DefaultDataBaseSource { get; set; } + public static DataSource DefaultDataSource { get; set; } /// - /// Gets or sets the SQL server address. + /// Gets or sets the SQL data source. /// - public String DataBaseSource { get; set; } + public DataSource DataSource { get; set; } /// /// Initializes the class. /// static CoreSettings() { - DefaultDataBaseSource = "localhost\\SQLEXPRESS"; + DefaultDataSource = new DataSource(); } /// @@ -32,7 +32,7 @@ namespace Tango.Core /// public CoreSettings() { - DataBaseSource = DefaultDataBaseSource; + DataSource = DefaultDataSource; } } } diff --git a/Software/Visual_Studio/Tango.Core/DataSource.cs b/Software/Visual_Studio/Tango.Core/DataSource.cs new file mode 100644 index 000000000..fb46faa2e --- /dev/null +++ b/Software/Visual_Studio/Tango.Core/DataSource.cs @@ -0,0 +1,131 @@ +using System; +using System.Collections.Generic; +using System.Data.Common; +using System.Data.SqlClient; +using System.Data.SQLite; +using System.IO; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.Core +{ + /// + /// Represents an SQL data source. + /// + public class DataSource + { + /// + /// Gets or sets the type of source. + /// + public DataSourceType Type { get; set; } + + /// + /// Gets or sets the address. + /// + public String Address { get; set; } + + /// + /// Gets or sets the catalog name. + /// + public String Catalog { get; set; } + + /// + /// Gets or sets a value indicating whether to use integrated security. + /// + public bool IntegratedSecurity { get; set; } + + /// + /// Gets or sets the user name to use if is false. + /// + public String UserName { get; set; } + + /// + /// Gets or sets the password to use if is false. + /// + public String Password { get; set; } + + /// + /// Initializes a new instance of the class. + /// + public DataSource() + { + Type = DataSourceType.SQLServer; + Address = "localhost\\SQLEXPRESS"; + Catalog = "Tango"; + IntegratedSecurity = true; + UserName = String.Empty; + Password = String.Empty; + } + + /// + /// Creates a DBConnection instance which represents this data source. + /// + /// + public DbConnection ToConnection() + { + switch (Type) + { + case DataSourceType.SQLite: + + var connection = new SQLiteConnection() + { + ConnectionString = new SQLiteConnectionStringBuilder() { DataSource = Path.GetFullPath(Address), ForeignKeys = true }.ConnectionString + }; + return connection; + + case DataSourceType.MDF: + + if (IntegratedSecurity) + { + return new SqlConnection(String.Format("Data Source=(LocalDB)\\MSSQLLocalDB;AttachDbFileName={0};Initial Catalog={1};Integrated Security=True;MultipleActiveResultSets=True;App=EntityFramework", Path.GetFullPath(Address), Catalog)); + } + else + { + return new SqlConnection(String.Format("Data Source=(LocalDB)\\MSSQLLocalDB;AttachDbFileName={0};Initial Catalog={1};Integrated Security=False;User Id={2};Password={3};MultipleActiveResultSets=True;App=EntityFramework", Path.GetFullPath(Address), Catalog, UserName, Password)); + } + + case DataSourceType.SQLServer: + + if (IntegratedSecurity) + { + return new SqlConnection(String.Format("Data Source={0};Initial Catalog={1};Integrated Security=True;", Address, Catalog)); + } + else + { + return new SqlConnection(String.Format("Data Source={0};Initial Catalog={1};Integrated Security=False;User Id={2};Password={3};", Address, Catalog, UserName, Password)); + } + + case DataSourceType.Azure: + + if (IntegratedSecurity) + { + //var provider = new Microsoft.IdentityModel.Clients(); + + SqlConnectionStringBuilder builder = new SqlConnectionStringBuilder(); + + builder.DataSource = Address; + builder.InitialCatalog = Catalog; + builder.UserID = UserName; + builder.TrustServerCertificate = true; + builder.ConnectTimeout = 15; + builder.Pooling = false; + + builder.Authentication = SqlAuthenticationMethod.ActiveDirectoryInteractive; + + SqlConnection sqlConnection = new SqlConnection(builder.ConnectionString); + + return sqlConnection; + } + else + { + return new SqlConnection(String.Format("Server=tcp:{0},1433;Initial Catalog={1};Persist Security Info=False;User ID={2};Password={3};MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=False;Authentication=\"Active Directory Password\";", Address, Catalog, UserName, Password)); + } + + default: + + return null; + } + } + } +} diff --git a/Software/Visual_Studio/Tango.Core/DataSourceType.cs b/Software/Visual_Studio/Tango.Core/DataSourceType.cs new file mode 100644 index 000000000..c447dd5eb --- /dev/null +++ b/Software/Visual_Studio/Tango.Core/DataSourceType.cs @@ -0,0 +1,31 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.Core +{ + /// + /// Represents an SQL data source type. + /// + public enum DataSourceType + { + /// + /// Microsoft SQL Server. + /// + SQLServer, + /// + /// Microsoft SQL .mdf file. + /// + MDF, + /// + /// Azure SQL Database. + /// + Azure, + /// + /// SQLite database file. + /// + SQLite + } +} diff --git a/Software/Visual_Studio/Tango.Core/Properties/Resources.Designer.cs b/Software/Visual_Studio/Tango.Core/Properties/Resources.Designer.cs index 4f47c533a..29ed0e72b 100644 --- a/Software/Visual_Studio/Tango.Core/Properties/Resources.Designer.cs +++ b/Software/Visual_Studio/Tango.Core/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace Tango.Core.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/Software/Visual_Studio/Tango.Core/Tango.Core.csproj b/Software/Visual_Studio/Tango.Core/Tango.Core.csproj index 14058bd3b..7b44cb540 100644 --- a/Software/Visual_Studio/Tango.Core/Tango.Core.csproj +++ b/Software/Visual_Studio/Tango.Core/Tango.Core.csproj @@ -9,9 +9,11 @@ Properties Tango.Core Tango.Core - v4.6 + v4.7.2 512 + + true @@ -31,6 +33,12 @@ 4 + + ..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll + + + ..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll + ..\packages\Google.Protobuf.3.4.1\lib\net45\Google.Protobuf.dll @@ -43,17 +51,27 @@ ..\packages\SimpleValidator.0.6.1.0\lib\net40\SimpleValidator.dll + + + ..\packages\System.Data.SQLite.Core.1.0.108.0\lib\net46\System.Data.SQLite.dll + + + ..\packages\System.Data.SQLite.EF6.1.0.108.0\lib\net46\System.Data.SQLite.EF6.dll + + + ..\packages\System.Data.SQLite.Linq.1.0.108.0\lib\net46\System.Data.SQLite.Linq.dll + + - @@ -73,6 +91,8 @@ + + @@ -99,6 +119,7 @@ + @@ -154,7 +175,14 @@ - + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Core/packages.config b/Software/Visual_Studio/Tango.Core/packages.config index a9ac483b5..1da7b8d76 100644 --- a/Software/Visual_Studio/Tango.Core/packages.config +++ b/Software/Visual_Studio/Tango.Core/packages.config @@ -1,7 +1,12 @@  + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj b/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj index b8051c108..9bcc7f849 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj +++ b/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj @@ -9,7 +9,7 @@ Properties Tango.DAL.Local Tango.DAL.Local - v4.6 + v4.7.2 512 diff --git a/Software/Visual_Studio/Tango.DAL.Remote/Partials/RemoteDB.cs b/Software/Visual_Studio/Tango.DAL.Remote/Partials/RemoteDB.cs index a492df462..5905a0f7e 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/Partials/RemoteDB.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/Partials/RemoteDB.cs @@ -20,36 +20,9 @@ namespace Tango.DAL.Remote.DB ///
/// The server file path. /// if set to true will try to connect to an .mdf file. - public RemoteDB(String path, bool isFile) : base(ComposeConnectionString(path, isFile)) + public RemoteDB(DataSource dataSource) : base(dataSource.ToConnection(), true) { } - - /// - /// Composes the connection string. - /// - /// The source. - /// if set to true [is file]. - /// - private static String ComposeConnectionString(String source, bool isFile) - { - if (!isFile) - { - return String.Format("metadata=res://*/DB.RemoteADO.csdl|res://*/DB.RemoteADO.ssdl|res://*/DB.RemoteADO.msl;provider=System.Data.SqlClient;provider connection string=\"data source={0};initial catalog=Tango;integrated security=True;MultipleActiveResultSets=True;App=EntityFramework\"", source); - } - else - { - return null; - } - } - - /// - /// Creates a default remote database context by the address specified in . - /// - /// - public static RemoteDB CreateDefault() - { - return new RemoteDB(SettingsManager.Default.GetOrCreate().DataBaseSource, false); - } } } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj index 3ab4194f9..c242d3837 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj +++ b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj @@ -9,7 +9,7 @@ Properties Tango.DAL.Remote Tango.DAL.Remote - v4.6 + v4.7.2 512 diff --git a/Software/Visual_Studio/Tango.Documents/Tango.Documents.csproj b/Software/Visual_Studio/Tango.Documents/Tango.Documents.csproj index f688f005b..cbfd9c79b 100644 --- a/Software/Visual_Studio/Tango.Documents/Tango.Documents.csproj +++ b/Software/Visual_Studio/Tango.Documents/Tango.Documents.csproj @@ -8,7 +8,7 @@ library Tango.Documents Tango.Documents - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/Tango.DragAndDrop/Tango.DragAndDrop.csproj b/Software/Visual_Studio/Tango.DragAndDrop/Tango.DragAndDrop.csproj index 41c31954a..7f72ffcc0 100644 --- a/Software/Visual_Studio/Tango.DragAndDrop/Tango.DragAndDrop.csproj +++ b/Software/Visual_Studio/Tango.DragAndDrop/Tango.DragAndDrop.csproj @@ -9,7 +9,7 @@ Properties Tango.DragAndDrop Tango.DragAndDrop - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/Tango.Editors/Tango.Editors.csproj b/Software/Visual_Studio/Tango.Editors/Tango.Editors.csproj index b0f6184ae..613e6df7e 100644 --- a/Software/Visual_Studio/Tango.Editors/Tango.Editors.csproj +++ b/Software/Visual_Studio/Tango.Editors/Tango.Editors.csproj @@ -8,7 +8,7 @@ library Tango.Editors Tango.Editors - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/Tango.EmbroideryUI/Tango.EmbroideryUI.csproj b/Software/Visual_Studio/Tango.EmbroideryUI/Tango.EmbroideryUI.csproj index c68b620a1..4054ab567 100644 --- a/Software/Visual_Studio/Tango.EmbroideryUI/Tango.EmbroideryUI.csproj +++ b/Software/Visual_Studio/Tango.EmbroideryUI/Tango.EmbroideryUI.csproj @@ -8,7 +8,7 @@ library Tango.EmbroideryUI Tango.EmbroideryUI - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/Tango.EmbroideryUI/app.config b/Software/Visual_Studio/Tango.EmbroideryUI/app.config index 462d17b27..72700d700 100644 --- a/Software/Visual_Studio/Tango.EmbroideryUI/app.config +++ b/Software/Visual_Studio/Tango.EmbroideryUI/app.config @@ -42,6 +42,14 @@ + + + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Emulations/Tango.Emulations.csproj b/Software/Visual_Studio/Tango.Emulations/Tango.Emulations.csproj index ec7315668..05be1077a 100644 --- a/Software/Visual_Studio/Tango.Emulations/Tango.Emulations.csproj +++ b/Software/Visual_Studio/Tango.Emulations/Tango.Emulations.csproj @@ -9,7 +9,7 @@ Properties Tango.Emulations Tango.Emulations - v4.6 + v4.7.2 512 diff --git a/Software/Visual_Studio/Tango.Hive/Tango.Hive.csproj b/Software/Visual_Studio/Tango.Hive/Tango.Hive.csproj index bda3d1d85..21aea4a42 100644 --- a/Software/Visual_Studio/Tango.Hive/Tango.Hive.csproj +++ b/Software/Visual_Studio/Tango.Hive/Tango.Hive.csproj @@ -9,7 +9,7 @@ Properties Tango.Hive Tango.Hive - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj b/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj index 035bbbe1f..a89bb0a6f 100644 --- a/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj +++ b/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj @@ -9,7 +9,7 @@ Properties Tango.Integration Tango.Integration - v4.6 + v4.7.2 512 diff --git a/Software/Visual_Studio/Tango.Logging/Tango.Logging.csproj b/Software/Visual_Studio/Tango.Logging/Tango.Logging.csproj index cdc5e56ba..69a47819a 100644 --- a/Software/Visual_Studio/Tango.Logging/Tango.Logging.csproj +++ b/Software/Visual_Studio/Tango.Logging/Tango.Logging.csproj @@ -9,7 +9,7 @@ Properties Tango.Logging Tango.Logging - v4.6 + v4.7.2 512 diff --git a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj index 0609b7bff..4090031e9 100644 --- a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj +++ b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj @@ -9,7 +9,7 @@ Properties Tango.PMR Tango.PMR - v4.6 + v4.7.2 512 diff --git a/Software/Visual_Studio/Tango.Protobuf/Tango.Protobuf.csproj b/Software/Visual_Studio/Tango.Protobuf/Tango.Protobuf.csproj index 1b1abc9f4..bf01bc079 100644 --- a/Software/Visual_Studio/Tango.Protobuf/Tango.Protobuf.csproj +++ b/Software/Visual_Studio/Tango.Protobuf/Tango.Protobuf.csproj @@ -9,7 +9,7 @@ Properties Tango.Protobuf Tango.Protobuf - v4.6 + v4.7.2 512 diff --git a/Software/Visual_Studio/Tango.SQLExaminer/Tango.SQLExaminer.csproj b/Software/Visual_Studio/Tango.SQLExaminer/Tango.SQLExaminer.csproj index cfa6aa282..a00259c58 100644 --- a/Software/Visual_Studio/Tango.SQLExaminer/Tango.SQLExaminer.csproj +++ b/Software/Visual_Studio/Tango.SQLExaminer/Tango.SQLExaminer.csproj @@ -9,7 +9,7 @@ Properties Tango.SQLExaminer Tango.SQLExaminer - v4.6 + v4.7.2 512 diff --git a/Software/Visual_Studio/Tango.Scripting/Tango.Scripting.csproj b/Software/Visual_Studio/Tango.Scripting/Tango.Scripting.csproj index b6503101c..66cf56c98 100644 --- a/Software/Visual_Studio/Tango.Scripting/Tango.Scripting.csproj +++ b/Software/Visual_Studio/Tango.Scripting/Tango.Scripting.csproj @@ -9,7 +9,7 @@ Properties Tango.Scripting Tango.Scripting - v4.6 + v4.7.2 512 true diff --git a/Software/Visual_Studio/Tango.Scripting/app.config b/Software/Visual_Studio/Tango.Scripting/app.config index 8766b29db..3a5d80ead 100644 --- a/Software/Visual_Studio/Tango.Scripting/app.config +++ b/Software/Visual_Studio/Tango.Scripting/app.config @@ -42,6 +42,10 @@ + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Serialization/Tango.Serialization.csproj b/Software/Visual_Studio/Tango.Serialization/Tango.Serialization.csproj index 91cac4c16..c9ec3cd12 100644 --- a/Software/Visual_Studio/Tango.Serialization/Tango.Serialization.csproj +++ b/Software/Visual_Studio/Tango.Serialization/Tango.Serialization.csproj @@ -9,7 +9,7 @@ Properties Tango.Serialization Tango.Serialization - v4.6 + v4.7.2 512 diff --git a/Software/Visual_Studio/Tango.Settings/Tango.Settings.csproj b/Software/Visual_Studio/Tango.Settings/Tango.Settings.csproj index 1f6596c0d..e4aafab3d 100644 --- a/Software/Visual_Studio/Tango.Settings/Tango.Settings.csproj +++ b/Software/Visual_Studio/Tango.Settings/Tango.Settings.csproj @@ -9,7 +9,7 @@ Properties Tango.Settings Tango.Settings - v4.6 + v4.7.2 512 diff --git a/Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj b/Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj index a17b66caf..1ecb8bc2f 100644 --- a/Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj +++ b/Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj @@ -8,7 +8,7 @@ library Tango.SharedUI Tango.SharedUI - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/Tango.SharedUI/app.config b/Software/Visual_Studio/Tango.SharedUI/app.config index 462d17b27..5e8c3436a 100644 --- a/Software/Visual_Studio/Tango.SharedUI/app.config +++ b/Software/Visual_Studio/Tango.SharedUI/app.config @@ -42,6 +42,10 @@ + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Stubs/Tango.Stubs.csproj b/Software/Visual_Studio/Tango.Stubs/Tango.Stubs.csproj index f270043c1..acc658e16 100644 --- a/Software/Visual_Studio/Tango.Stubs/Tango.Stubs.csproj +++ b/Software/Visual_Studio/Tango.Stubs/Tango.Stubs.csproj @@ -9,7 +9,7 @@ Properties Tango.Stubs Tango.Stubs - v4.6 + v4.7.2 512 diff --git a/Software/Visual_Studio/Tango.Stubs/app.config b/Software/Visual_Studio/Tango.Stubs/app.config index 5d794b958..8924e52e3 100644 --- a/Software/Visual_Studio/Tango.Stubs/app.config +++ b/Software/Visual_Studio/Tango.Stubs/app.config @@ -46,6 +46,10 @@ + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Synchronization/Remote/RemoteDBSynchronizer.cs b/Software/Visual_Studio/Tango.Synchronization/Remote/RemoteDBSynchronizer.cs index 79c719d0e..778a24b86 100644 --- a/Software/Visual_Studio/Tango.Synchronization/Remote/RemoteDBSynchronizer.cs +++ b/Software/Visual_Studio/Tango.Synchronization/Remote/RemoteDBSynchronizer.cs @@ -32,7 +32,7 @@ namespace Tango.Synchronization.Remote sqlite.ClearDataBase(); } - using (var remoteDB = new remote.RemoteDB(SettingsManager.Default.GetOrCreate().DataBaseSource, false)) + using (var remoteDB = new remote.RemoteDB(SettingsManager.Default.GetOrCreate().DataSource)) { using (var localDB = new local.LocalDB(sqliteDbFile)) { diff --git a/Software/Visual_Studio/Tango.Synchronization/Tango.Synchronization.csproj b/Software/Visual_Studio/Tango.Synchronization/Tango.Synchronization.csproj index e02b737ab..6150888da 100644 --- a/Software/Visual_Studio/Tango.Synchronization/Tango.Synchronization.csproj +++ b/Software/Visual_Studio/Tango.Synchronization/Tango.Synchronization.csproj @@ -9,7 +9,7 @@ Properties Tango.Synchronization Tango.Synchronization - v4.6 + v4.7.2 512 diff --git a/Software/Visual_Studio/Tango.TFS/Tango.TFS.csproj b/Software/Visual_Studio/Tango.TFS/Tango.TFS.csproj index f34892c4e..0d84fa56e 100644 --- a/Software/Visual_Studio/Tango.TFS/Tango.TFS.csproj +++ b/Software/Visual_Studio/Tango.TFS/Tango.TFS.csproj @@ -8,7 +8,7 @@ library Tango.TFS Tango.TFS - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/Tango.Touch/Tango.Touch.csproj b/Software/Visual_Studio/Tango.Touch/Tango.Touch.csproj index 3b66f6c61..4a9b7c7aa 100644 --- a/Software/Visual_Studio/Tango.Touch/Tango.Touch.csproj +++ b/Software/Visual_Studio/Tango.Touch/Tango.Touch.csproj @@ -8,7 +8,7 @@ library Tango.Touch Tango.Touch - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/Tango.Touch/app.config b/Software/Visual_Studio/Tango.Touch/app.config index 462d17b27..72700d700 100644 --- a/Software/Visual_Studio/Tango.Touch/app.config +++ b/Software/Visual_Studio/Tango.Touch/app.config @@ -42,6 +42,14 @@ + + + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Transport/Tango.Transport.csproj b/Software/Visual_Studio/Tango.Transport/Tango.Transport.csproj index 608538578..c0d37b76c 100644 --- a/Software/Visual_Studio/Tango.Transport/Tango.Transport.csproj +++ b/Software/Visual_Studio/Tango.Transport/Tango.Transport.csproj @@ -9,7 +9,7 @@ Properties Tango.Transport Tango.Transport - v4.6 + v4.7.2 512 diff --git a/Software/Visual_Studio/Tango.UnitTesting/DAL_TST.cs b/Software/Visual_Studio/Tango.UnitTesting/DAL_TST.cs index 305849694..0ea7b59ef 100644 --- a/Software/Visual_Studio/Tango.UnitTesting/DAL_TST.cs +++ b/Software/Visual_Studio/Tango.UnitTesting/DAL_TST.cs @@ -17,7 +17,7 @@ namespace Tango.UnitTesting { String guid = Guid.NewGuid().ToString(); - using (var db = new DAL.Remote.DB.RemoteDB(SettingsManager.Default.GetOrCreate().DataBaseSource, false)) + using (var db = new DAL.Remote.DB.RemoteDB(SettingsManager.Default.GetOrCreate().DataSource)) { var action = new DAL.Remote.DB.ACTION_TYPES(); action.CODE = 1; @@ -30,7 +30,7 @@ namespace Tango.UnitTesting db.SaveChanges(); } - using (var db = new DAL.Remote.DB.RemoteDB(SettingsManager.Default.GetOrCreate().DataBaseSource, false)) + using (var db = new DAL.Remote.DB.RemoteDB(SettingsManager.Default.GetOrCreate().DataSource)) { var action = db.ACTION_TYPES.Single(x => x.GUID == guid); db.ACTION_TYPES.Remove(action); @@ -67,7 +67,7 @@ namespace Tango.UnitTesting [TestMethod] public void Validate_SQLite_Connection_Using_Observables() { - using (ObservablesContext db = ObservablesContext.CreateDefault(@"D:\Development\Tango\Software\DB\Tango.db")) + using (ObservablesContext db = ObservablesContext.CreateDefault(@"D:\Development\Tango\Software\DB\Tango.db", DataSourceType.SQLite)) { var actions = db.ActionTypes.ToList(); } diff --git a/Software/Visual_Studio/Tango.UnitTesting/SQLExaminer_TST.cs b/Software/Visual_Studio/Tango.UnitTesting/SQLExaminer_TST.cs index 5ab70938c..5b7ce16ca 100644 --- a/Software/Visual_Studio/Tango.UnitTesting/SQLExaminer_TST.cs +++ b/Software/Visual_Studio/Tango.UnitTesting/SQLExaminer_TST.cs @@ -9,6 +9,7 @@ using System.Text; using System.Threading.Tasks; using Tango.BL; using Tango.BL.Entities; +using Tango.Core; using Tango.Core.DB; using Tango.Core.IO; using Tango.SQLExaminer; @@ -274,7 +275,7 @@ namespace Tango.UnitTesting String job_guid = String.Empty; - using (var context = ObservablesContext.CreateDefault("localhost\\SQLEXPRESS", target_db)) + using (var context = ObservablesContext.CreateDefault("localhost\\SQLEXPRESS", target_db, DataSourceType.SQLServer)) { context.Configuration.LazyLoadingEnabled = false; Assert.IsTrue(context.Machines.Count() == 1); @@ -323,13 +324,13 @@ namespace Tango.UnitTesting Assert.IsTrue(data_report.HasDifferences); //Check the new job exists on source.. - using (var context = ObservablesContext.CreateDefault("localhost\\SQLEXPRESS", source_db)) + using (var context = ObservablesContext.CreateDefault("localhost\\SQLEXPRESS", source_db, DataSourceType.SQLServer)) { Assert.IsTrue(context.Jobs.Any(x => x.Guid == job_guid)); } //Now change configuration in source and push to machine - using (var context = ObservablesContext.CreateDefault("localhost\\SQLEXPRESS", source_db)) + using (var context = ObservablesContext.CreateDefault("localhost\\SQLEXPRESS", source_db, DataSourceType.SQLServer)) { var machine = context.Machines.SingleOrDefault(x => x.SerialNumber == machine_serial_number); machine.Configuration.Name = "Test Name " + new Random().Next(0, 1000); diff --git a/Software/Visual_Studio/Tango.UnitTesting/Synchronization_TST.cs b/Software/Visual_Studio/Tango.UnitTesting/Synchronization_TST.cs index e4bbcaf51..d6713c2ac 100644 --- a/Software/Visual_Studio/Tango.UnitTesting/Synchronization_TST.cs +++ b/Software/Visual_Studio/Tango.UnitTesting/Synchronization_TST.cs @@ -21,7 +21,7 @@ namespace Tango.UnitTesting { var console = Helper.InitializeLogging(true); - using (var remoteDB = new remote.RemoteDB(SettingsManager.Default.GetOrCreate().DataBaseSource, false)) + using (var remoteDB = new remote.RemoteDB(SettingsManager.Default.GetOrCreate().DataSource)) { using (var localDB = new local.LocalDB(Helper.GetSQLiteFilePath())) { @@ -45,7 +45,7 @@ namespace Tango.UnitTesting [TestMethod] public void Generate_Demo_Remote_Machine() { - using (var remoteDB = new remote.RemoteDB(SettingsManager.Default.GetOrCreate().DataBaseSource, false)) + using (var remoteDB = new remote.RemoteDB(SettingsManager.Default.GetOrCreate().DataSource)) { var organization = new remote.ORGANIZATION() { diff --git a/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj b/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj index 0bf97caa6..7a37655a8 100644 --- a/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj +++ b/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj @@ -9,7 +9,7 @@ Properties Tango.UnitTesting Tango.UnitTesting - v4.6 + v4.7.2 512 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 15.0 diff --git a/Software/Visual_Studio/Tango.Video/Tango.Video.csproj b/Software/Visual_Studio/Tango.Video/Tango.Video.csproj index e485ce615..d60bf3f88 100644 --- a/Software/Visual_Studio/Tango.Video/Tango.Video.csproj +++ b/Software/Visual_Studio/Tango.Video/Tango.Video.csproj @@ -8,7 +8,7 @@ library Tango.Video Tango.Video - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/Tango.Visuals/Tango.Visuals.csproj b/Software/Visual_Studio/Tango.Visuals/Tango.Visuals.csproj index 337b91faa..682b64c39 100644 --- a/Software/Visual_Studio/Tango.Visuals/Tango.Visuals.csproj +++ b/Software/Visual_Studio/Tango.Visuals/Tango.Visuals.csproj @@ -9,7 +9,7 @@ Properties Tango.Visuals Tango.Visuals - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/Tango.WiFi/Tango.WiFi.csproj b/Software/Visual_Studio/Tango.WiFi/Tango.WiFi.csproj index 8b6231a3d..22d1e4d4d 100644 --- a/Software/Visual_Studio/Tango.WiFi/Tango.WiFi.csproj +++ b/Software/Visual_Studio/Tango.WiFi/Tango.WiFi.csproj @@ -10,7 +10,7 @@ Properties Tango.WiFi Tango.WiFi - v4.6 + v4.7.2 diff --git a/Software/Visual_Studio/Utilities/Tango.BugReporter/Tango.BugReporter.csproj b/Software/Visual_Studio/Utilities/Tango.BugReporter/Tango.BugReporter.csproj index d799e8231..0ace0d37b 100644 --- a/Software/Visual_Studio/Utilities/Tango.BugReporter/Tango.BugReporter.csproj +++ b/Software/Visual_Studio/Utilities/Tango.BugReporter/Tango.BugReporter.csproj @@ -8,7 +8,7 @@ Exe Tango.BugReporter Tango.BugReporter - v4.6 + v4.7.2 512 true diff --git a/Software/Visual_Studio/Utilities/Tango.CatalogGenerator/Tango.CatalogGenerator.csproj b/Software/Visual_Studio/Utilities/Tango.CatalogGenerator/Tango.CatalogGenerator.csproj index 85e4e5687..8eac3890f 100644 --- a/Software/Visual_Studio/Utilities/Tango.CatalogGenerator/Tango.CatalogGenerator.csproj +++ b/Software/Visual_Studio/Utilities/Tango.CatalogGenerator/Tango.CatalogGenerator.csproj @@ -8,7 +8,7 @@ Exe Tango.CatalogGenerator Tango.CatalogGenerator - v4.6 + v4.7.2 512 true diff --git a/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/App.config b/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/App.config index 92aa00bf9..a9e16aebe 100644 --- a/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/App.config +++ b/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/App.config @@ -13,4 +13,12 @@ + + + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/ObservablesGenerator.cs b/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/ObservablesGenerator.cs index b76b73715..59bfed1bd 100644 --- a/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/ObservablesGenerator.cs +++ b/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/ObservablesGenerator.cs @@ -33,7 +33,7 @@ namespace Tango.DBObservablesGenerator.CLI List dbDescriptions = new List(); //Get column descriptions... - using (RemoteDB db = new RemoteDB(SettingsManager.Default.GetOrCreate().DataBaseSource, false)) + using (RemoteDB db = new RemoteDB(SettingsManager.Default.GetOrCreate().DataSource)) { db.Configuration.LazyLoadingEnabled = false; db.Database.Connection.Open(); @@ -135,7 +135,7 @@ namespace Tango.DBObservablesGenerator.CLI //Generate Entities... //Generate Enumerations... - using (RemoteDB db = new RemoteDB(SettingsManager.Default.GetOrCreate().DataBaseSource, false)) + using (RemoteDB db = new RemoteDB(SettingsManager.Default.GetOrCreate().DataSource)) { foreach (var tableProp in db.GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance).Where(x => x.PropertyType.IsGenericType)) { @@ -324,7 +324,7 @@ namespace Tango.DBObservablesGenerator.CLI //Generate Entities... //Generate Enumerations... - using (RemoteDB db = new RemoteDB(SettingsManager.Default.GetOrCreate().DataBaseSource, false)) + using (RemoteDB db = new RemoteDB(SettingsManager.Default.GetOrCreate().DataSource)) { foreach (var tableProp in db.GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance).Where(x => x.PropertyType.IsGenericType)) { diff --git a/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/Tango.DBObservablesGenerator.CLI.csproj b/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/Tango.DBObservablesGenerator.CLI.csproj index 3b2e82a0b..e76ec0836 100644 --- a/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/Tango.DBObservablesGenerator.CLI.csproj +++ b/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/Tango.DBObservablesGenerator.CLI.csproj @@ -8,7 +8,7 @@ Exe Tango.DBObservablesGenerator.CLI dbobgen - v4.6 + v4.7.2 512 true diff --git a/Software/Visual_Studio/Utilities/Tango.EmbroideryViewer/App.config b/Software/Visual_Studio/Utilities/Tango.EmbroideryViewer/App.config index 0715f3c37..cfaef6c7d 100644 --- a/Software/Visual_Studio/Utilities/Tango.EmbroideryViewer/App.config +++ b/Software/Visual_Studio/Utilities/Tango.EmbroideryViewer/App.config @@ -45,6 +45,14 @@ + + + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/Utilities/Tango.EmbroideryViewer/Tango.EmbroideryViewer.csproj b/Software/Visual_Studio/Utilities/Tango.EmbroideryViewer/Tango.EmbroideryViewer.csproj index b059730b3..f8237bc27 100644 --- a/Software/Visual_Studio/Utilities/Tango.EmbroideryViewer/Tango.EmbroideryViewer.csproj +++ b/Software/Visual_Studio/Utilities/Tango.EmbroideryViewer/Tango.EmbroideryViewer.csproj @@ -8,7 +8,7 @@ WinExe Tango.EmbroideryViewer Tango.EmbroideryViewer - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Tango.EventsTypesGenerator.csproj b/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Tango.EventsTypesGenerator.csproj index cbc88d4b2..8845ab479 100644 --- a/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Tango.EventsTypesGenerator.csproj +++ b/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Tango.EventsTypesGenerator.csproj @@ -8,7 +8,7 @@ Exe Tango.EventsTypesGenerator Tango.EventsTypesGenerator - v4.6 + v4.7.2 512 true diff --git a/Software/Visual_Studio/Utilities/Tango.HashGenerator/Tango.HashGenerator.csproj b/Software/Visual_Studio/Utilities/Tango.HashGenerator/Tango.HashGenerator.csproj index d7cae7a29..45e68cc70 100644 --- a/Software/Visual_Studio/Utilities/Tango.HashGenerator/Tango.HashGenerator.csproj +++ b/Software/Visual_Studio/Utilities/Tango.HashGenerator/Tango.HashGenerator.csproj @@ -8,7 +8,7 @@ Exe Tango.HashGenerator Tango.HashGenerator - v4.6 + v4.7.2 512 true diff --git a/Software/Visual_Studio/Utilities/Tango.ILMerge.UI/App.config b/Software/Visual_Studio/Utilities/Tango.ILMerge.UI/App.config index 0715f3c37..cfaef6c7d 100644 --- a/Software/Visual_Studio/Utilities/Tango.ILMerge.UI/App.config +++ b/Software/Visual_Studio/Utilities/Tango.ILMerge.UI/App.config @@ -45,6 +45,14 @@ + + + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/Utilities/Tango.ILMerge.UI/Tango.ILMerge.UI.csproj b/Software/Visual_Studio/Utilities/Tango.ILMerge.UI/Tango.ILMerge.UI.csproj index b751815ce..685abb122 100644 --- a/Software/Visual_Studio/Utilities/Tango.ILMerge.UI/Tango.ILMerge.UI.csproj +++ b/Software/Visual_Studio/Utilities/Tango.ILMerge.UI/Tango.ILMerge.UI.csproj @@ -8,7 +8,7 @@ WinExe Tango.ILMerge.UI Tango.ILMerge.UI - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/App.config b/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/App.config index ada51894a..8adf1a638 100644 --- a/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/App.config +++ b/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/App.config @@ -53,6 +53,14 @@ + + + + + + + + diff --git a/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Tango.MachineEM.UI.csproj b/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Tango.MachineEM.UI.csproj index 8df299f0e..28f1bf6fa 100644 --- a/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Tango.MachineEM.UI.csproj +++ b/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Tango.MachineEM.UI.csproj @@ -8,7 +8,7 @@ WinExe Tango.MachineEM.UI Tango.MachineEM.UI - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Tango.PMRGenerator.CLI.csproj b/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Tango.PMRGenerator.CLI.csproj index 543fab734..7026fe389 100644 --- a/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Tango.PMRGenerator.CLI.csproj +++ b/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Tango.PMRGenerator.CLI.csproj @@ -8,7 +8,7 @@ Exe Tango.PMRGenerator.CLI Tango.PMRGenerator.CLI - v4.6 + v4.7.2 512 true diff --git a/Software/Visual_Studio/Utilities/Tango.PortsListGenerator/Tango.PortsListGenerator.csproj b/Software/Visual_Studio/Utilities/Tango.PortsListGenerator/Tango.PortsListGenerator.csproj index e2119e7b1..54e3bb0b1 100644 --- a/Software/Visual_Studio/Utilities/Tango.PortsListGenerator/Tango.PortsListGenerator.csproj +++ b/Software/Visual_Studio/Utilities/Tango.PortsListGenerator/Tango.PortsListGenerator.csproj @@ -8,7 +8,7 @@ Exe Tango.PortsListGenerator Tango.PortsListGenerator - v4.6 + v4.7.2 512 true diff --git a/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Tango.Protobuf.CLI.csproj b/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Tango.Protobuf.CLI.csproj index d51e2c019..84bd48950 100644 --- a/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Tango.Protobuf.CLI.csproj +++ b/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Tango.Protobuf.CLI.csproj @@ -8,7 +8,7 @@ Exe Tango.Protobuf.CLI proto-tc - v4.6 + v4.7.2 512 diff --git a/Software/Visual_Studio/Utilities/Tango.Protobuf.UI/App.config b/Software/Visual_Studio/Utilities/Tango.Protobuf.UI/App.config index 6a26aa552..b53d37a13 100644 --- a/Software/Visual_Studio/Utilities/Tango.Protobuf.UI/App.config +++ b/Software/Visual_Studio/Utilities/Tango.Protobuf.UI/App.config @@ -45,6 +45,14 @@ + + + + + + + + diff --git a/Software/Visual_Studio/Utilities/Tango.Protobuf.UI/Tango.Protobuf.UI.csproj b/Software/Visual_Studio/Utilities/Tango.Protobuf.UI/Tango.Protobuf.UI.csproj index 3ae824d59..37952e03c 100644 --- a/Software/Visual_Studio/Utilities/Tango.Protobuf.UI/Tango.Protobuf.UI.csproj +++ b/Software/Visual_Studio/Utilities/Tango.Protobuf.UI/Tango.Protobuf.UI.csproj @@ -8,7 +8,7 @@ WinExe Tango.Protobuf.UI TangoProtoGUI - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/Utilities/Tango.RemoteRunner.UI/App.config b/Software/Visual_Studio/Utilities/Tango.RemoteRunner.UI/App.config index c06036970..3c5b5ff38 100644 --- a/Software/Visual_Studio/Utilities/Tango.RemoteRunner.UI/App.config +++ b/Software/Visual_Studio/Utilities/Tango.RemoteRunner.UI/App.config @@ -4,5 +4,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/Utilities/Tango.RemoteRunner.UI/Tango.RemoteRunner.UI.csproj b/Software/Visual_Studio/Utilities/Tango.RemoteRunner.UI/Tango.RemoteRunner.UI.csproj index df2fc762a..afada30e0 100644 --- a/Software/Visual_Studio/Utilities/Tango.RemoteRunner.UI/Tango.RemoteRunner.UI.csproj +++ b/Software/Visual_Studio/Utilities/Tango.RemoteRunner.UI/Tango.RemoteRunner.UI.csproj @@ -8,7 +8,7 @@ WinExe Tango.RemoteRunner.UI Tango.RemoteRunner.UI - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/Utilities/Tango.SQLiteGenerator.CLI/App.config b/Software/Visual_Studio/Utilities/Tango.SQLiteGenerator.CLI/App.config index 92aa00bf9..a9e16aebe 100644 --- a/Software/Visual_Studio/Utilities/Tango.SQLiteGenerator.CLI/App.config +++ b/Software/Visual_Studio/Utilities/Tango.SQLiteGenerator.CLI/App.config @@ -13,4 +13,12 @@ + + + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/Utilities/Tango.SQLiteGenerator.CLI/Program.cs b/Software/Visual_Studio/Utilities/Tango.SQLiteGenerator.CLI/Program.cs index b254833a6..b971621ab 100644 --- a/Software/Visual_Studio/Utilities/Tango.SQLiteGenerator.CLI/Program.cs +++ b/Software/Visual_Studio/Utilities/Tango.SQLiteGenerator.CLI/Program.cs @@ -41,7 +41,7 @@ namespace Tango.SQLiteGenerator.CLI bool completed = false; - String connectionString = SettingsManager.Default.GetOrCreate().DataBaseSource; + String connectionString = SettingsManager.Default.GetOrCreate().DataSource.ToConnection().ConnectionString; Console.WriteLine("Connecting to " + connectionString + "..."); @@ -49,7 +49,7 @@ namespace Tango.SQLiteGenerator.CLI List sync_configurations = new List(); - using (RemoteDB db = RemoteDB.CreateDefault()) + using (RemoteDB db = new RemoteDB(SettingsManager.Default.GetOrCreate().DataSource)) { sync_configurations = db.SYNC_CONFIGURATIONS.ToList(); } diff --git a/Software/Visual_Studio/Utilities/Tango.SQLiteGenerator.CLI/Tango.SQLiteGenerator.CLI.csproj b/Software/Visual_Studio/Utilities/Tango.SQLiteGenerator.CLI/Tango.SQLiteGenerator.CLI.csproj index 2fe5bf15d..a49870aff 100644 --- a/Software/Visual_Studio/Utilities/Tango.SQLiteGenerator.CLI/Tango.SQLiteGenerator.CLI.csproj +++ b/Software/Visual_Studio/Utilities/Tango.SQLiteGenerator.CLI/Tango.SQLiteGenerator.CLI.csproj @@ -8,7 +8,7 @@ Exe Tango.SQLiteGenerator.CLI sqlitegen - v4.6 + v4.7.2 512 true diff --git a/Software/Visual_Studio/Utilities/Tango.ShortcutGenerator.CLI/Tango.ShortcutGenerator.CLI.csproj b/Software/Visual_Studio/Utilities/Tango.ShortcutGenerator.CLI/Tango.ShortcutGenerator.CLI.csproj index 70f711bba..15736ba8f 100644 --- a/Software/Visual_Studio/Utilities/Tango.ShortcutGenerator.CLI/Tango.ShortcutGenerator.CLI.csproj +++ b/Software/Visual_Studio/Utilities/Tango.ShortcutGenerator.CLI/Tango.ShortcutGenerator.CLI.csproj @@ -8,7 +8,7 @@ Exe Tango.ShortcutGenerator.CLI linkgen - v4.6 + v4.7.2 512 diff --git a/Software/Visual_Studio/Utilities/Tango.Stubs.CLI/Tango.Stubs.CLI.csproj b/Software/Visual_Studio/Utilities/Tango.Stubs.CLI/Tango.Stubs.CLI.csproj index 3ed5b46b2..785f8af54 100644 --- a/Software/Visual_Studio/Utilities/Tango.Stubs.CLI/Tango.Stubs.CLI.csproj +++ b/Software/Visual_Studio/Utilities/Tango.Stubs.CLI/Tango.Stubs.CLI.csproj @@ -8,7 +8,7 @@ Exe Tango.Stubs.CLI stubexec - v4.6 + v4.7.2 512 true diff --git a/Software/Visual_Studio/Utilities/Tango.Stubs.UI/App.config b/Software/Visual_Studio/Utilities/Tango.Stubs.UI/App.config index be1387189..e42f12838 100644 --- a/Software/Visual_Studio/Utilities/Tango.Stubs.UI/App.config +++ b/Software/Visual_Studio/Utilities/Tango.Stubs.UI/App.config @@ -49,6 +49,14 @@ + + + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/Utilities/Tango.Stubs.UI/Tango.Stubs.UI.csproj b/Software/Visual_Studio/Utilities/Tango.Stubs.UI/Tango.Stubs.UI.csproj index e2f57e4c6..0dd165bb4 100644 --- a/Software/Visual_Studio/Utilities/Tango.Stubs.UI/Tango.Stubs.UI.csproj +++ b/Software/Visual_Studio/Utilities/Tango.Stubs.UI/Tango.Stubs.UI.csproj @@ -8,7 +8,7 @@ WinExe Tango.Stubs.UI StubsExecutionGUI - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/Utilities/Tango.TransportRouter.UI/App.config b/Software/Visual_Studio/Utilities/Tango.TransportRouter.UI/App.config index d14be49eb..adc853f50 100644 --- a/Software/Visual_Studio/Utilities/Tango.TransportRouter.UI/App.config +++ b/Software/Visual_Studio/Utilities/Tango.TransportRouter.UI/App.config @@ -49,6 +49,14 @@ + + + + + + + + diff --git a/Software/Visual_Studio/Utilities/Tango.TransportRouter.UI/Tango.TransportRouter.UI.csproj b/Software/Visual_Studio/Utilities/Tango.TransportRouter.UI/Tango.TransportRouter.UI.csproj index 89d7aa2f9..831db6598 100644 --- a/Software/Visual_Studio/Utilities/Tango.TransportRouter.UI/Tango.TransportRouter.UI.csproj +++ b/Software/Visual_Studio/Utilities/Tango.TransportRouter.UI/Tango.TransportRouter.UI.csproj @@ -8,7 +8,7 @@ WinExe Tango.TransportRouter.UI Tango.TransportRouter.UI - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/Utilities/Tango.UITests/App.config b/Software/Visual_Studio/Utilities/Tango.UITests/App.config index f6e6de0cc..77c59fc95 100644 --- a/Software/Visual_Studio/Utilities/Tango.UITests/App.config +++ b/Software/Visual_Studio/Utilities/Tango.UITests/App.config @@ -56,6 +56,10 @@ + + + + diff --git a/Software/Visual_Studio/Utilities/Tango.UITests/Tango.UITests.csproj b/Software/Visual_Studio/Utilities/Tango.UITests/Tango.UITests.csproj index a89b67dfb..593b1ecd3 100644 --- a/Software/Visual_Studio/Utilities/Tango.UITests/Tango.UITests.csproj +++ b/Software/Visual_Studio/Utilities/Tango.UITests/Tango.UITests.csproj @@ -8,7 +8,7 @@ WinExe Tango.UITests Tango.UITests - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Tango.BuildExtensions.csproj b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Tango.BuildExtensions.csproj index ccc33aac4..f2aee8e22 100644 --- a/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Tango.BuildExtensions.csproj +++ b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Tango.BuildExtensions.csproj @@ -40,7 +40,7 @@ Properties Tango.BuildExtensions Tango.BuildExtensions - v4.6 + v4.7.2 true true true diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj b/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj index 87d50b99d..bc05f04bc 100644 --- a/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj +++ b/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj @@ -15,7 +15,7 @@ Properties Tango.MachineService Tango.MachineService - v4.6 + v4.7.2 false true -- cgit v1.3.1