From 90811d5bdb4a291a9c3fbea1330bcff42b9ef532 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 8 Apr 2020 19:39:09 +0200 Subject: [PATCH] Iniziato rename progetti: Step --> Termo.Active --- .../GatewayNewtorkConfigurationBuilder.cs | 4 +- .../GatewayProxyConfigurationBuilder.cs | 4 +- Step.CmsConnectGateway/Builders/iBuilder.cs | 2 +- .../Events/GatewayRebootEventHandlerArgs.cs | 2 +- .../Exceptions/GatewayException.cs | 2 +- Step.CmsConnectGateway/GatewayAdapter.cs | 6 +- .../Models/GatewayConfiguration.cs | 2 +- ... => Termo.Active.CmsConnectGateway.csproj} | 124 +- Step.Config/ServerConfig.cs | 10 +- Step.Config/ServerConfigController.cs | 14 +- ...nfig.csproj => Termo.Active.Config.csproj} | 322 +- Step.Core/Properties/Resources.Designer.cs | 32 +- ...p.Core.csproj => Termo.Active.Core.csproj} | 194 +- Step.Core/ThreadsFunctions.cs | 24 +- Step.Core/ThreadsHandler.cs | 4 +- Step.Core/ThreadsSiemensHmi.cs | 8 +- Step.Database/Controllers/AlarmsController.cs | 14 +- .../Controllers/FunctionsAccessController.cs | 8 +- .../Controllers/MachinesController.cs | 6 +- .../Controllers/MachinesUsersController.cs | 8 +- .../Controllers/MaintenancesController.cs | 14 +- .../Controllers/NcToolManagerController.cs | 12 +- Step.Database/Controllers/QueueController.cs | 8 +- Step.Database/Controllers/RedisController.cs | 4 +- .../Controllers/SessionsController.cs | 4 +- .../Controllers/UserSoftkeysController.cs | 10 +- Step.Database/Controllers/UsersController.cs | 10 +- Step.Database/DatabaseContext.cs | 16 +- .../201902121508312_InitMigration.Designer.cs | 2 +- .../201902121508312_InitMigration.cs | 2 +- .../201903070940012_InitMigrtion.Designer.cs | 2 +- .../201903070940012_InitMigrtion.cs | 2 +- ...04041054202_UserDeleteMigratin.Designer.cs | 2 +- .../201904041054202_UserDeleteMigratin.cs | 2 +- Step.Database/Migrations/Configuration.cs | 10 +- Step.Database/Redis/redUtil.cs | 2 +- ...se.csproj => Termo.Active.Database.csproj} | 368 +- Step.Model/ConfigModels/AlarmsConfigModel.cs | 2 +- Step.Model/ConfigModels/AreasConfigModel.cs | 2 +- .../ConfigModels/CmsConnectConfigModel.cs | 2 +- Step.Model/ConfigModels/ExtSoftwareModel.cs | 2 +- Step.Model/ConfigModels/HeadsConfigModel.cs | 30 +- Step.Model/ConfigModels/MagazineNamesModel.cs | 2 +- .../ConfigModels/MaintenanceConfigModel.cs | 2 +- Step.Model/ConfigModels/MessageModel.cs | 4 +- Step.Model/ConfigModels/NcConfigModel.cs | 2 +- Step.Model/ConfigModels/NcSoftKeysModel.cs | 2 +- Step.Model/ConfigModels/ServerConfigModel.cs | 2 +- .../ConfigModels/SoftwareProdConfigModel.cs | 2 +- .../ConfigModels/ToolManagerConfigModel.cs | 2 +- .../ConfigModels/ToolTypeConfigModel.cs | 2 +- .../ConfigModels/UserSoftKeyConfigModel.cs | 50 +- Step.Model/Constants.cs | 2 +- .../AlarmModels/DTOAlarmHistoricModel.cs | 6 +- .../DTOModels/AlarmModels/DTOAlarmsModel.cs | 2 +- .../AlarmModels/DTONewAlarmNoteModel.cs | 4 +- .../DTOModels/DTOActiveProgramInfoModel.cs | 2 +- Step.Model/DTOModels/DTOAxesModel.cs | 2 +- Step.Model/DTOModels/DTOAxisNameModel.cs | 2 +- .../DTOModels/DTOClientConfigurationModel.cs | 4 +- Step.Model/DTOModels/DTOCmsConnectGateway.cs | 2 +- .../DTOModels/DTOFunctionAccessModel.cs | 2 +- Step.Model/DTOModels/DTOHeadModel.cs | 2 +- Step.Model/DTOModels/DTOHeadsConfigModel.cs | 2 +- Step.Model/DTOModels/DTOLanguageModel.cs | 2 +- Step.Model/DTOModels/DTONcGenericDataModel.cs | 2 +- Step.Model/DTOModels/DTONcSoftKeyModel.cs | 2 +- Step.Model/DTOModels/DTONetworkMonitor.cs | 2 +- Step.Model/DTOModels/DTOPowerOnDataModel.cs | 2 +- Step.Model/DTOModels/DTOProcessDataModel.cs | 2 +- Step.Model/DTOModels/DTOQueueModel.cs | 4 +- Step.Model/DTOModels/DTORoleModel.cs | 2 +- .../DTORuntimeFunctionAccessModel.cs | 2 +- .../DTOModels/DTOStartupConfigurationModel.cs | 4 +- Step.Model/DTOModels/DTOUserModel.cs | 4 +- Step.Model/DTOModels/DTOUserSoftKeyModel.cs | 4 +- .../JobModels/DTOGenericParamModel.cs | 2 +- .../DTOModels/JobModels/DTOImageParamModel.cs | 2 +- .../JobModels/DTOJobCustomParamModel.cs | 2 +- Step.Model/DTOModels/JobModels/DTOJobModel.cs | 2 +- .../JobModels/DTOMetadataFieldsModel.cs | 2 +- .../DTOModels/JobModels/DTOMetadataModel.cs | 2 +- .../DTOExpiredMaintenanceModel.cs | 2 +- .../MaintenanceModels/DTOMaintenanceModel.cs | 6 +- .../DTOMaintenanceNoteModel.cs | 4 +- .../DTONewMaintenanceModel.cs | 4 +- Step.Model/DTOModels/Scada/DTOScadaModel.cs | 2 +- .../DTOModels/Scada/ScadaSchemaModel.cs | 2 +- .../ToolModels/DTOAssistedToolingModel.cs | 2 +- .../DTOModels/ToolModels/DTOEdgeModel.cs | 2 +- .../ToolModels/DTOExportToolTableModel.cs | 4 +- .../ToolModels/DTOMagazineStatusModel.cs | 2 +- .../DTOModels/ToolModels/DTONcFamilyModel.cs | 4 +- .../ToolModels/DTONcMagazinePositionModel.cs | 4 +- .../ToolModels/DTONcMountedShankModel.cs | 2 +- .../DTOModels/ToolModels/DTONcShankModel.cs | 4 +- .../DTOModels/ToolModels/DTONcToolModel.cs | 4 +- .../ToolModels/DTONewToolDataModel.cs | 2 +- .../ToolModels/DTONewToolWithFamilyModel.cs | 2 +- .../ToolModels/DTOSelfAdaptiveModel.cs | 2 +- .../DTOModels/ToolModels/DTOShankModel.cs | 2 +- .../ToolModels/DTOSiemensToolModel.cs | 2 +- .../ToolModels/DTOUpdateMagazineModel.cs | 2 +- .../DatabaseModels/AlarmDescriptionsModel.cs | 2 +- Step.Model/DatabaseModels/AlarmFileModel.cs | 4 +- Step.Model/DatabaseModels/AlarmNoteModel.cs | 4 +- .../DatabaseModels/AlarmOccurrencesModel.cs | 4 +- Step.Model/DatabaseModels/AlarmUserModel.cs | 2 +- .../FavoriteUserSoftKeyModel.cs | 2 +- .../DatabaseModels/FunctionAccessModel.cs | 2 +- Step.Model/DatabaseModels/MachineModel.cs | 2 +- Step.Model/DatabaseModels/MachineUserModel.cs | 2 +- .../DatabaseModels/MaintenanceFileModel.cs | 2 +- Step.Model/DatabaseModels/MaintenanceModel.cs | 4 +- .../DatabaseModels/MaintenanceNoteModel.cs | 4 +- Step.Model/DatabaseModels/NcFamilyModel.cs | 2 +- .../DatabaseModels/NcMagazinePositionModel.cs | 2 +- Step.Model/DatabaseModels/NcOffsetModel.cs | 2 +- Step.Model/DatabaseModels/NcShankModel.cs | 2 +- Step.Model/DatabaseModels/NcToolModel.cs | 2 +- .../PerformedMaintenanceModel.cs | 2 +- Step.Model/DatabaseModels/QueueItemsModel.cs | 2 +- Step.Model/DatabaseModels/RoleModel.cs | 2 +- Step.Model/DatabaseModels/SessionModel.cs | 2 +- Step.Model/DatabaseModels/UserModel.cs | 2 +- ...Model.csproj => Termo.Active.Model.csproj} | 360 +- ...oj.user => Termo.Active.Model.csproj.user} | 0 Step.NC/NcAdapter.cs | 20 +- Step.NC/NcFileAdapter.cs | 16 +- Step.NC/NcToolTableAdapter.cs | 14 +- Step.NC/SiemensToolTableAdapter.cs | 8 +- ...{Step.NC.csproj => Termo.Active.NC.csproj} | 20 +- Step.UI/Dialogs/LockForm.Designer.cs | 2 +- Step.UI/Dialogs/LockForm.cs | 4 +- Step.UI/Dialogs/PasswordForm.Designer.cs | 2 +- Step.UI/Dialogs/PasswordForm.cs | 4 +- Step.UI/Dialogs/ResetCountersForm.Designer.cs | 2 +- Step.UI/Dialogs/ResetCountersForm.cs | 6 +- .../Dialogs/ResetMachineHoursForm.Designer.cs | 2 +- Step.UI/Dialogs/ResetMachineHoursForm.cs | 6 +- Step.UI/Dialogs/ResetSpindleForm.Designer.cs | 2 +- Step.UI/Dialogs/ResetSpindleForm.cs | 6 +- Step.UI/Properties/Resources.Designer.cs | 56 +- Step.UI/ServerControlWindow.Designer.cs | 2 +- Step.UI/ServerControlWindow.cs | 16 +- ...{Step.UI.csproj => Termo.Active.UI.csproj} | 404 +- Step.UI/Views/OpeningLayer.Designer.cs | 2 +- Step.UI/Views/OpeningLayer.cs | 2 +- Step.Utils/CandiesController.cs | 4 +- Step.Utils/ExceptionManager.cs | 8 +- Step.Utils/LanguageController.cs | 6 +- Step.Utils/StepLogger.cs | 4 +- ...Utils.csproj => Termo.Active.Utils.csproj} | 308 +- Step.Utils/supportFunctions.cs | 6 +- Step.sln | 24 +- Step/App_Start/SignalRContractResolver.cs | 2 +- Step/App_Start/Startup.cs | 12 +- Step/App_Start/SwaggerConfig.cs | 4 +- Step/App_Start/WebApiConfig.cs | 2 +- Step/Attributes/PositiveNumberAttribute.cs | 2 +- Step/Attributes/SignalRAuthorizeAttribute.cs | 16 +- Step/Attributes/WebApiAuthorizeAttribute.cs | 14 +- Step/Controllers/SignalR/NcHub.cs | 12 +- Step/Controllers/WebApi/ApiAlarmController.cs | 18 +- .../WebApi/ApiMaintenanceController.cs | 20 +- .../WebApi/AuthorizationController.cs | 8 +- .../WebApi/CmsConnectController.cs | 12 +- .../WebApi/ConfigurationController.cs | 14 +- .../WebApi/FavoriteUserSoftKeyController.cs | 10 +- Step/Controllers/WebApi/LanguageController.cs | 12 +- Step/Controllers/WebApi/NcApiController.cs | 8 +- Step/Controllers/WebApi/NcFileController.cs | 10 +- .../WebApi/NcToolManagerController.cs | 20 +- Step/Controllers/WebApi/ReportController.cs | 2 +- Step/Controllers/WebApi/ScadaController.cs | 12 +- .../WebApi/SiemensToolManagerController.cs | 8 +- Step/Controllers/WebApi/UserController.cs | 16 +- .../Database/SignalRDatabaseHandler.cs | 18 +- Step/Listeners/ListenersHandler.cs | 12 +- Step/Listeners/SignalR/SignalRListener.cs | 24 +- Step/Listeners/SignalRStaticObjects.cs | 10 +- Step/MultipartHandler.cs | 2 +- Step/Provider/ApplicationOAuthProvider.cs | 10 +- .../CustomMultipartFormDataStreamProvider.cs | 2 +- Step/Provider/SignalROAuthBearerProvider.cs | 2 +- Step/{Step.csproj => Termo.Active.csproj} | 32920 ++++++++-------- ...p.csproj.user => Termo.Active.csproj.user} | 0 Step/WebApiUnhandledExceptionHandler.cs | 2 +- Step/program.cs | 26 +- 189 files changed, 18068 insertions(+), 18068 deletions(-) rename Step.CmsConnectGateway/{Step.CmsConnectGateway.csproj => Termo.Active.CmsConnectGateway.csproj} (94%) rename Step.Config/{Step.Config.csproj => Termo.Active.Config.csproj} (93%) rename Step.Core/{Step.Core.csproj => Termo.Active.Core.csproj} (84%) rename Step.Database/{Step.Database.csproj => Termo.Active.Database.csproj} (94%) rename Step.Model/{Step.Model.csproj => Termo.Active.Model.csproj} (97%) rename Step.Model/{Step.Model.csproj.user => Termo.Active.Model.csproj.user} (100%) rename Step.NC/{Step.NC.csproj => Termo.Active.NC.csproj} (89%) rename Step.UI/{Step.UI.csproj => Termo.Active.UI.csproj} (90%) rename Step.Utils/{Step.Utils.csproj => Termo.Active.Utils.csproj} (95%) rename Step/{Step.csproj => Termo.Active.csproj} (98%) rename Step/{Step.csproj.user => Termo.Active.csproj.user} (100%) diff --git a/Step.CmsConnectGateway/Builders/GatewayNewtorkConfigurationBuilder.cs b/Step.CmsConnectGateway/Builders/GatewayNewtorkConfigurationBuilder.cs index 0f1b2ae8..0ef5df05 100644 --- a/Step.CmsConnectGateway/Builders/GatewayNewtorkConfigurationBuilder.cs +++ b/Step.CmsConnectGateway/Builders/GatewayNewtorkConfigurationBuilder.cs @@ -1,4 +1,4 @@ -using Step.CmsConnectGateway.Builders; +using Termo.Active.CmsConnectGateway.Builders; using System; using System.Collections.Generic; using System.Linq; @@ -6,7 +6,7 @@ using System.Net; using System.Text; using System.Threading.Tasks; -namespace Step.CmsConnectGateway +namespace Termo.Active.CmsConnectGateway { public class GatewayNetworkConfigurationBuilder : iBuilder { diff --git a/Step.CmsConnectGateway/Builders/GatewayProxyConfigurationBuilder.cs b/Step.CmsConnectGateway/Builders/GatewayProxyConfigurationBuilder.cs index e76096d3..69f6da7a 100644 --- a/Step.CmsConnectGateway/Builders/GatewayProxyConfigurationBuilder.cs +++ b/Step.CmsConnectGateway/Builders/GatewayProxyConfigurationBuilder.cs @@ -1,4 +1,4 @@ -using Step.CmsConnectGateway.Builders; +using Termo.Active.CmsConnectGateway.Builders; using System; using System.Collections.Generic; using System.Linq; @@ -6,7 +6,7 @@ using System.Net; using System.Text; using System.Threading.Tasks; -namespace Step.CmsConnectGateway +namespace Termo.Active.CmsConnectGateway { public class GatewayProxyConfigurationBuilder : iBuilder { diff --git a/Step.CmsConnectGateway/Builders/iBuilder.cs b/Step.CmsConnectGateway/Builders/iBuilder.cs index 8a920757..cfacc04a 100644 --- a/Step.CmsConnectGateway/Builders/iBuilder.cs +++ b/Step.CmsConnectGateway/Builders/iBuilder.cs @@ -6,7 +6,7 @@ using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; -namespace Step.CmsConnectGateway.Builders +namespace Termo.Active.CmsConnectGateway.Builders { public abstract class iBuilder { diff --git a/Step.CmsConnectGateway/Events/GatewayRebootEventHandlerArgs.cs b/Step.CmsConnectGateway/Events/GatewayRebootEventHandlerArgs.cs index 50c76768..17a6d36d 100644 --- a/Step.CmsConnectGateway/Events/GatewayRebootEventHandlerArgs.cs +++ b/Step.CmsConnectGateway/Events/GatewayRebootEventHandlerArgs.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Step.CmsConnectGateway.Events +namespace Termo.Active.CmsConnectGateway.Events { public class GatewayRebootEventHandlerArgs : EventArgs { diff --git a/Step.CmsConnectGateway/Exceptions/GatewayException.cs b/Step.CmsConnectGateway/Exceptions/GatewayException.cs index f9986cc8..4fa566d6 100644 --- a/Step.CmsConnectGateway/Exceptions/GatewayException.cs +++ b/Step.CmsConnectGateway/Exceptions/GatewayException.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Step.CmsConnectGateway.Exceptions +namespace Termo.Active.CmsConnectGateway.Exceptions { public class GatewayException: Exception { diff --git a/Step.CmsConnectGateway/GatewayAdapter.cs b/Step.CmsConnectGateway/GatewayAdapter.cs index 897ab378..e90e1aae 100644 --- a/Step.CmsConnectGateway/GatewayAdapter.cs +++ b/Step.CmsConnectGateway/GatewayAdapter.cs @@ -1,7 +1,7 @@ using Renci.SshNet; using Renci.SshNet.Common; -using Step.CmsConnectGateway.Events; -using Step.CmsConnectGateway.Exceptions; +using Termo.Active.CmsConnectGateway.Events; +using Termo.Active.CmsConnectGateway.Exceptions; using System; using System.Collections.Generic; using System.Linq; @@ -12,7 +12,7 @@ using System.Text.RegularExpressions; using System.Threading; using System.Threading.Tasks; -namespace Step.CmsConnectGateway +namespace Termo.Active.CmsConnectGateway { public class GatewayAdapter : IDisposable { diff --git a/Step.CmsConnectGateway/Models/GatewayConfiguration.cs b/Step.CmsConnectGateway/Models/GatewayConfiguration.cs index 089e3f59..d3e6939f 100644 --- a/Step.CmsConnectGateway/Models/GatewayConfiguration.cs +++ b/Step.CmsConnectGateway/Models/GatewayConfiguration.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using System.Net; -namespace Step.CmsConnectGateway +namespace Termo.Active.CmsConnectGateway { diff --git a/Step.CmsConnectGateway/Step.CmsConnectGateway.csproj b/Step.CmsConnectGateway/Termo.Active.CmsConnectGateway.csproj similarity index 94% rename from Step.CmsConnectGateway/Step.CmsConnectGateway.csproj rename to Step.CmsConnectGateway/Termo.Active.CmsConnectGateway.csproj index eaab3452..f5ebee80 100644 --- a/Step.CmsConnectGateway/Step.CmsConnectGateway.csproj +++ b/Step.CmsConnectGateway/Termo.Active.CmsConnectGateway.csproj @@ -1,63 +1,63 @@ - - - - - Debug - AnyCPU - {49B04D99-0ECD-4900-86D3-7098D61314D7} - Library - Properties - Step.CmsConnectGateway - Step.CmsConnectGateway - v4.6.1 - 512 - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\packages\SSH.NET.2016.1.0\lib\net40\Renci.SshNet.dll - - - - - ..\packages\IPNetwork2.2.4.0.126\lib\net46\System.Net.IPNetwork.dll - - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug + AnyCPU + {49B04D99-0ECD-4900-86D3-7098D61314D7} + Library + Properties + Termo.Active.CmsConnectGateway + Termo.Active.CmsConnectGateway + v4.6.1 + 512 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\packages\SSH.NET.2016.1.0\lib\net40\Renci.SshNet.dll + + + + + ..\packages\IPNetwork2.2.4.0.126\lib\net46\System.Net.IPNetwork.dll + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Step.Config/ServerConfig.cs b/Step.Config/ServerConfig.cs index bf97d3c1..bdeddbc6 100644 --- a/Step.Config/ServerConfig.cs +++ b/Step.Config/ServerConfig.cs @@ -1,10 +1,10 @@ -using Step.Model.ConfigModels; -using Step.Model.DatabaseModels; -using Step.Model.DTOModels; -using Step.Model.DTOModels.Scada; +using Termo.Active.Model.ConfigModels; +using Termo.Active.Model.DatabaseModels; +using Termo.Active.Model.DTOModels; +using Termo.Active.Model.DTOModels.Scada; using System.Collections.Generic; -namespace Step.Config +namespace Termo.Active.Config { public static class ServerConfig { diff --git a/Step.Config/ServerConfigController.cs b/Step.Config/ServerConfigController.cs index 27588ee3..6680f510 100644 --- a/Step.Config/ServerConfigController.cs +++ b/Step.Config/ServerConfigController.cs @@ -1,6 +1,6 @@ -using Step.Model.ConfigModels; -using Step.Model.DTOModels.Scada; -using Step.Utils; +using Termo.Active.Model.ConfigModels; +using Termo.Active.Model.DTOModels.Scada; +using Termo.Active.Utils; using System; using System.Collections.Generic; using System.Globalization; @@ -12,11 +12,11 @@ using System.Xml; using System.Xml.Linq; using System.Xml.Schema; using System.Xml.Serialization; -using static Step.Config.ServerConfig; -using static Step.Model.Constants; -using static Step.Utils.SupportFunctions; +using static Termo.Active.Config.ServerConfig; +using static Termo.Active.Model.Constants; +using static Termo.Active.Utils.SupportFunctions; -namespace Step.Config +namespace Termo.Active.Config { public static class ServerConfigController { diff --git a/Step.Config/Step.Config.csproj b/Step.Config/Termo.Active.Config.csproj similarity index 93% rename from Step.Config/Step.Config.csproj rename to Step.Config/Termo.Active.Config.csproj index 8bebe507..1827ae8c 100644 --- a/Step.Config/Step.Config.csproj +++ b/Step.Config/Termo.Active.Config.csproj @@ -1,162 +1,162 @@ - - - - - Debug - AnyCPU - {3F5C2483-FC87-43EF-92A8-66FF7D0E440F} - Library - Properties - Step.Config - Step.Config - v4.6.2 - 512 - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - PreserveNewest - - - PreserveNewest - - - Designer - PreserveNewest - - - - - - Always - - - Always - - - Always - - - - - Always - - - PreserveNewest - Designer - - - PreserveNewest - Designer - - - Designer - - - PreserveNewest - - - PreserveNewest - Designer - - - Designer - - - Designer - - - PreserveNewest - Designer - - - PreserveNewest - - - PreserveNewest - Designer - - - Designer - - - Designer - - - Designer - - - Designer - - - - - {631375dd-06d3-49bb-8130-d9ddb34c429d} - Step.Model - - - {cbeb631b-abfa-4042-9779-c0060b0dfefe} - Step.Utils - - - - - PreserveNewest - Designer - - - - - Designer - - - - - Designer - - - - - Designer - - - - - Designer - - - - - Designer - - - + + + + + Debug + AnyCPU + {3F5C2483-FC87-43EF-92A8-66FF7D0E440F} + Library + Properties + Termo.Active.Config + Termo.Active.Config + v4.6.2 + 512 + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + false + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + PreserveNewest + + + PreserveNewest + + + Designer + PreserveNewest + + + + + + Always + + + Always + + + Always + + + + + Always + + + PreserveNewest + Designer + + + PreserveNewest + Designer + + + Designer + + + PreserveNewest + + + PreserveNewest + Designer + + + Designer + + + Designer + + + PreserveNewest + Designer + + + PreserveNewest + + + PreserveNewest + Designer + + + Designer + + + Designer + + + Designer + + + Designer + + + + + {631375dd-06d3-49bb-8130-d9ddb34c429d} + Termo.Active.Model + + + {cbeb631b-abfa-4042-9779-c0060b0dfefe} + Termo.Active.Utils + + + + + PreserveNewest + Designer + + + + + Designer + + + + + Designer + + + + + Designer + + + + + Designer + + + + + Designer + + + \ No newline at end of file diff --git a/Step.Core/Properties/Resources.Designer.cs b/Step.Core/Properties/Resources.Designer.cs index d163b246..439774bc 100644 --- a/Step.Core/Properties/Resources.Designer.cs +++ b/Step.Core/Properties/Resources.Designer.cs @@ -1,25 +1,25 @@ //------------------------------------------------------------------------------ // -// Il codice è stato generato da uno strumento. -// Versione runtime:4.0.30319.42000 +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 // -// Le modifiche apportate a questo file possono provocare un comportamento non corretto e andranno perse se -// il codice viene rigenerato. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. // //------------------------------------------------------------------------------ -namespace Step.Core.Properties { +namespace Termo.Active.Core.Properties { using System; /// - /// Classe di risorse fortemente tipizzata per la ricerca di stringhe localizzate e così via. + /// A strongly-typed resource class, for looking up localized strings, etc. /// - // Questa classe è stata generata automaticamente dalla classe StronglyTypedResourceBuilder. - // tramite uno strumento quale ResGen o Visual Studio. - // Per aggiungere o rimuovere un membro, modificare il file con estensione ResX ed eseguire nuovamente ResGen - // con l'opzione /str oppure ricompilare il progetto VS. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] + // This class was auto-generated by the StronglyTypedResourceBuilder + // 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", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -33,13 +33,13 @@ namespace Step.Core.Properties { } /// - /// Restituisce l'istanza di ResourceManager nella cache utilizzata da questa classe. + /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Step.Core.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Termo.Active.Core.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; @@ -47,8 +47,8 @@ namespace Step.Core.Properties { } /// - /// Esegue l'override della proprietà CurrentUICulture del thread corrente per tutte le - /// ricerche di risorse eseguite utilizzando questa classe di risorse fortemente tipizzata. + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { @@ -61,7 +61,7 @@ namespace Step.Core.Properties { } /// - /// Cerca una risorsa localizzata di tipo System.Drawing.Icon simile a (Icona). + /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// internal static System.Drawing.Icon SinumerikHmi { get { diff --git a/Step.Core/Step.Core.csproj b/Step.Core/Termo.Active.Core.csproj similarity index 84% rename from Step.Core/Step.Core.csproj rename to Step.Core/Termo.Active.Core.csproj index d3940693..cc57327d 100644 --- a/Step.Core/Step.Core.csproj +++ b/Step.Core/Termo.Active.Core.csproj @@ -1,98 +1,98 @@ - - - - - Debug - AnyCPU - {DE54FF4C-8390-4489-882A-1BC7D99EF185} - Library - Properties - Step.Core - Step.Core - v4.6.2 - 512 - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\Libs\CMS_CORE_Library.dll - - - - - - - - - - - - ..\Libs\TeamDev.SDK.6.dll - - - ..\Libs\TeamDev.SDK.WPF.dll - - - - - - True - True - Resources.resx - - - - - - - - {3f5c2483-fc87-43ef-92a8-66ff7d0e440f} - Step.Config - - - {357d5ee1-ffc8-489b-9232-22cf474d9a6f} - Step.Database - - - {631375DD-06D3-49BB-8130-D9DDB34C429D} - Step.Model - - - {b2366b08-96bd-4f6b-b748-b45089b87a14} - Step.NC - - - {cbeb631b-abfa-4042-9779-c0060b0dfefe} - Step.Utils - - - - - ResXFileCodeGenerator - Resources.Designer.cs - - - - - - - + + + + + Debug + AnyCPU + {DE54FF4C-8390-4489-882A-1BC7D99EF185} + Library + Properties + Termo.Active.Core + Termo.Active.Core + v4.6.2 + 512 + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + false + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\Libs\CMS_CORE_Library.dll + + + + + + + + + + + + ..\Libs\TeamDev.SDK.6.dll + + + ..\Libs\TeamDev.SDK.WPF.dll + + + + + + True + True + Resources.resx + + + + + + + + {3f5c2483-fc87-43ef-92a8-66ff7d0e440f} + Termo.Active.Config + + + {357d5ee1-ffc8-489b-9232-22cf474d9a6f} + Termo.Active.Database + + + {631375DD-06D3-49BB-8130-D9DDB34C429D} + Termo.Active.Model + + + {b2366b08-96bd-4f6b-b748-b45089b87a14} + Termo.Active.NC + + + {cbeb631b-abfa-4042-9779-c0060b0dfefe} + Termo.Active.Utils + + + + + ResXFileCodeGenerator + Resources.Designer.cs + + + + + + + \ No newline at end of file diff --git a/Step.Core/ThreadsFunctions.cs b/Step.Core/ThreadsFunctions.cs index a5516bc0..f6e4afb2 100644 --- a/Step.Core/ThreadsFunctions.cs +++ b/Step.Core/ThreadsFunctions.cs @@ -1,13 +1,13 @@ using CMS_CORE_Library.Models; -using Step.Config; -using Step.Core; -using Step.Database.Controllers; -using Step.Model.DTOModels; -using Step.Model.DTOModels.AlarmModels; -using Step.Model.DTOModels.Scada; -using Step.Model.DTOModels.ToolModels; -using Step.NC; -using Step.Utils; +using Termo.Active.Config; +using Termo.Active.Core; +using Termo.Active.Database.Controllers; +using Termo.Active.Model.DTOModels; +using Termo.Active.Model.DTOModels.AlarmModels; +using Termo.Active.Model.DTOModels.Scada; +using Termo.Active.Model.DTOModels.ToolModels; +using Termo.Active.NC; +using Termo.Active.Utils; using System; using System.Collections.Concurrent; using System.Collections.Generic; @@ -20,9 +20,9 @@ using System.Runtime.InteropServices; using System.Threading; using TeamDev.SDK.MVVM; using static CMS_CORE_Library.Models.DataStructures; -using static Step.Config.ServerConfig; -using static Step.Model.Constants; -using static Step.Utils.ExceptionManager; +using static Termo.Active.Config.ServerConfig; +using static Termo.Active.Model.Constants; +using static Termo.Active.Utils.ExceptionManager; public static class ThreadsFunctions { diff --git a/Step.Core/ThreadsHandler.cs b/Step.Core/ThreadsHandler.cs index a066a3be..a92431bb 100644 --- a/Step.Core/ThreadsHandler.cs +++ b/Step.Core/ThreadsHandler.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Threading; using TeamDev.SDK.MVVM; -using static Step.Model.Constants; +using static Termo.Active.Model.Constants; -namespace Step.Core +namespace Termo.Active.Core { public static class ThreadsHandler { diff --git a/Step.Core/ThreadsSiemensHmi.cs b/Step.Core/ThreadsSiemensHmi.cs index c3a75204..e6e34426 100644 --- a/Step.Core/ThreadsSiemensHmi.cs +++ b/Step.Core/ThreadsSiemensHmi.cs @@ -1,6 +1,6 @@ -using Step.Core.Properties; -using Step.Model; -using Step.Utils; +using Termo.Active.Core.Properties; +using Termo.Active.Model; +using Termo.Active.Utils; using System; using System.Diagnostics; using System.IO; @@ -8,7 +8,7 @@ using System.Runtime.InteropServices; using System.Threading; using TeamDev.SDK.MVVM; -namespace Step.Core +namespace Termo.Active.Core { public static class ThreadSiemensHmi { diff --git a/Step.Database/Controllers/AlarmsController.cs b/Step.Database/Controllers/AlarmsController.cs index ad02651d..a4bd85cb 100644 --- a/Step.Database/Controllers/AlarmsController.cs +++ b/Step.Database/Controllers/AlarmsController.cs @@ -1,17 +1,17 @@ -using Step.Model.DatabaseModels; -using Step.Model.DTOModels; -using Step.Model.DTOModels.AlarmModels; +using Termo.Active.Model.DatabaseModels; +using Termo.Active.Model.DTOModels; +using Termo.Active.Model.DTOModels.AlarmModels; using System; using System.Collections.Generic; using System.Data.Entity; using System.IO; using System.Linq; -using static Step.Model.Constants; -using static Step.Config.ServerConfig; +using static Termo.Active.Model.Constants; +using static Termo.Active.Config.ServerConfig; using System.Diagnostics; -using Step.Config; +using Termo.Active.Config; -namespace Step.Database.Controllers +namespace Termo.Active.Database.Controllers { public class AlarmsController : IDisposable { diff --git a/Step.Database/Controllers/FunctionsAccessController.cs b/Step.Database/Controllers/FunctionsAccessController.cs index 2e241ed9..b5e24996 100644 --- a/Step.Database/Controllers/FunctionsAccessController.cs +++ b/Step.Database/Controllers/FunctionsAccessController.cs @@ -1,12 +1,12 @@ -using Step.Model.DatabaseModels; -using Step.Model.DTOModels; +using Termo.Active.Model.DatabaseModels; +using Termo.Active.Model.DTOModels; using System; using System.Collections.Generic; using System.Linq; using static CMS_CORE_Library.Models.DataStructures; -using static Step.Config.ServerConfig; +using static Termo.Active.Config.ServerConfig; -namespace Step.Database.Controllers +namespace Termo.Active.Database.Controllers { public class FunctionsAccessController : IDisposable { diff --git a/Step.Database/Controllers/MachinesController.cs b/Step.Database/Controllers/MachinesController.cs index 73ae8ce7..e97d76c6 100644 --- a/Step.Database/Controllers/MachinesController.cs +++ b/Step.Database/Controllers/MachinesController.cs @@ -1,9 +1,9 @@ -using Step.Model.DatabaseModels; +using Termo.Active.Model.DatabaseModels; using System; using System.Linq; -using static Step.Config.ServerConfig; +using static Termo.Active.Config.ServerConfig; -namespace Step.Database.Controllers +namespace Termo.Active.Database.Controllers { public class MachinesController : IDisposable { diff --git a/Step.Database/Controllers/MachinesUsersController.cs b/Step.Database/Controllers/MachinesUsersController.cs index d2f88073..9629f137 100644 --- a/Step.Database/Controllers/MachinesUsersController.cs +++ b/Step.Database/Controllers/MachinesUsersController.cs @@ -1,11 +1,11 @@ -using Step.Model.DatabaseModels; -using Step.Model.DTOModels; +using Termo.Active.Model.DatabaseModels; +using Termo.Active.Model.DTOModels; using System; using System.Collections.Generic; using System.Linq; -using static Step.Model.Constants; +using static Termo.Active.Model.Constants; -namespace Step.Database.Controllers +namespace Termo.Active.Database.Controllers { public class MachinesUsersController : IDisposable { diff --git a/Step.Database/Controllers/MaintenancesController.cs b/Step.Database/Controllers/MaintenancesController.cs index c3b82b36..4d65ae19 100644 --- a/Step.Database/Controllers/MaintenancesController.cs +++ b/Step.Database/Controllers/MaintenancesController.cs @@ -1,17 +1,17 @@ -using Step.Model.DatabaseModels; -using Step.Model.DTOModels; -using Step.Model.DTOModels.MaintenanceModels; -using Step.Utils; +using Termo.Active.Model.DatabaseModels; +using Termo.Active.Model.DTOModels; +using Termo.Active.Model.DTOModels.MaintenanceModels; +using Termo.Active.Utils; using System; using System.Collections; using System.Collections.Generic; using System.Data.Entity; using System.IO; using System.Linq; -using static Step.Config.ServerConfig; -using static Step.Model.Constants; +using static Termo.Active.Config.ServerConfig; +using static Termo.Active.Model.Constants; -namespace Step.Database.Controllers +namespace Termo.Active.Database.Controllers { public class MaintenancesController : IDisposable { diff --git a/Step.Database/Controllers/NcToolManagerController.cs b/Step.Database/Controllers/NcToolManagerController.cs index 29b77cdb..9ebef662 100644 --- a/Step.Database/Controllers/NcToolManagerController.cs +++ b/Step.Database/Controllers/NcToolManagerController.cs @@ -1,14 +1,14 @@ -using Step.Model.DatabaseModels; -using Step.Model.DTOModels.ToolModels; -using Step.Utils; +using Termo.Active.Model.DatabaseModels; +using Termo.Active.Model.DTOModels.ToolModels; +using Termo.Active.Utils; using System; using System.Collections.Generic; using System.Data.Entity; using System.Linq; -using static Step.Utils.SupportFunctions; -using static Step.Model.Constants; +using static Termo.Active.Utils.SupportFunctions; +using static Termo.Active.Model.Constants; -namespace Step.Database.Controllers +namespace Termo.Active.Database.Controllers { public class NcToolManagerController : IDisposable { diff --git a/Step.Database/Controllers/QueueController.cs b/Step.Database/Controllers/QueueController.cs index 4dca4d93..cadc9b3a 100644 --- a/Step.Database/Controllers/QueueController.cs +++ b/Step.Database/Controllers/QueueController.cs @@ -1,13 +1,13 @@ -using Step.Model.DatabaseModels; -using Step.Model.DTOModels; +using Termo.Active.Model.DatabaseModels; +using Termo.Active.Model.DTOModels; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using static Step.Model.Constants; +using static Termo.Active.Model.Constants; -namespace Step.Database.Controllers +namespace Termo.Active.Database.Controllers { public class QueueController : IDisposable { diff --git a/Step.Database/Controllers/RedisController.cs b/Step.Database/Controllers/RedisController.cs index e929b9fc..b0f42ea3 100644 --- a/Step.Database/Controllers/RedisController.cs +++ b/Step.Database/Controllers/RedisController.cs @@ -1,11 +1,11 @@ -using Step.Database.Redis; +using Termo.Active.Database.Redis; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Step.Database.Controllers +namespace Termo.Active.Database.Controllers { public static class RedisController { diff --git a/Step.Database/Controllers/SessionsController.cs b/Step.Database/Controllers/SessionsController.cs index 08e99ffc..ac65245a 100644 --- a/Step.Database/Controllers/SessionsController.cs +++ b/Step.Database/Controllers/SessionsController.cs @@ -1,9 +1,9 @@ -using Step.Model.DatabaseModels; +using Termo.Active.Model.DatabaseModels; using System; using System.Collections.Generic; using System.Linq; -namespace Step.Database.Controllers +namespace Termo.Active.Database.Controllers { public class SessionsController : IDisposable { diff --git a/Step.Database/Controllers/UserSoftkeysController.cs b/Step.Database/Controllers/UserSoftkeysController.cs index 82807ba4..f2a10d0b 100644 --- a/Step.Database/Controllers/UserSoftkeysController.cs +++ b/Step.Database/Controllers/UserSoftkeysController.cs @@ -1,12 +1,12 @@ -using Step.Model.DatabaseModels; -using Step.Model.DTOModels; +using Termo.Active.Model.DatabaseModels; +using Termo.Active.Model.DTOModels; using System; using System.Collections.Generic; using System.Linq; -using static Step.Model.Constants; -using static Step.Config.ServerConfig; +using static Termo.Active.Model.Constants; +using static Termo.Active.Config.ServerConfig; -namespace Step.Database.Controllers +namespace Termo.Active.Database.Controllers { public class UserSoftkeysController : IDisposable { diff --git a/Step.Database/Controllers/UsersController.cs b/Step.Database/Controllers/UsersController.cs index ac49dcae..bb1659d4 100644 --- a/Step.Database/Controllers/UsersController.cs +++ b/Step.Database/Controllers/UsersController.cs @@ -1,14 +1,14 @@ -using Step.Model.DatabaseModels; -using Step.Model.DTOModels; +using Termo.Active.Model.DatabaseModels; +using Termo.Active.Model.DTOModels; using System; using System.Collections.Generic; using System.Globalization; using System.Linq; using System.Web.Helpers; -using static Step.Config.ServerConfig; -using static Step.Model.Constants; +using static Termo.Active.Config.ServerConfig; +using static Termo.Active.Model.Constants; -namespace Step.Database.Controllers +namespace Termo.Active.Database.Controllers { public class UsersController : IDisposable { diff --git a/Step.Database/DatabaseContext.cs b/Step.Database/DatabaseContext.cs index 39602192..b61c0a35 100644 --- a/Step.Database/DatabaseContext.cs +++ b/Step.Database/DatabaseContext.cs @@ -1,8 +1,8 @@ using Microsoft.Win32; using MySql.Data.Entity; -using Step.Database.Controllers; -using Step.Database.Migrations; -using Step.Model.DatabaseModels; +using Termo.Active.Database.Controllers; +using Termo.Active.Database.Migrations; +using Termo.Active.Model.DatabaseModels; using System; using System.Data.Entity; @@ -11,11 +11,11 @@ using System.Globalization; using System.IO; using System.Linq; using System.ServiceProcess; -using static Step.Config.ServerConfig; -using static Step.Model.Constants; -using static Step.Utils.ExceptionManager; +using static Termo.Active.Config.ServerConfig; +using static Termo.Active.Model.Constants; +using static Termo.Active.Utils.ExceptionManager; -namespace Step.Database +namespace Termo.Active.Database { [DbConfigurationType(typeof(MySqlEFConfiguration))] public class DatabaseContext : DbContext @@ -64,7 +64,7 @@ namespace Step.Database { try { - ServiceController service = new ServiceController(System.Configuration.ConfigurationManager.AppSettings["ServerServiceName"] ?? "MySQL"); + ServiceController service = new ServiceController("MySQL"); try { TimeSpan timeout = TimeSpan.FromSeconds(DATABASE_PROCESS_TIMEOUT); diff --git a/Step.Database/Migrations/201902121508312_InitMigration.Designer.cs b/Step.Database/Migrations/201902121508312_InitMigration.Designer.cs index 1ac47655..d6778630 100644 --- a/Step.Database/Migrations/201902121508312_InitMigration.Designer.cs +++ b/Step.Database/Migrations/201902121508312_InitMigration.Designer.cs @@ -1,5 +1,5 @@ // -namespace Step.Database.Migrations +namespace Termo.Active.Database.Migrations { using System.CodeDom.Compiler; using System.Data.Entity.Migrations; diff --git a/Step.Database/Migrations/201902121508312_InitMigration.cs b/Step.Database/Migrations/201902121508312_InitMigration.cs index 6cec64db..0d0024d4 100644 --- a/Step.Database/Migrations/201902121508312_InitMigration.cs +++ b/Step.Database/Migrations/201902121508312_InitMigration.cs @@ -1,4 +1,4 @@ -namespace Step.Database.Migrations +namespace Termo.Active.Database.Migrations { using System; using System.Data.Entity.Migrations; diff --git a/Step.Database/Migrations/201903070940012_InitMigrtion.Designer.cs b/Step.Database/Migrations/201903070940012_InitMigrtion.Designer.cs index 0f38aea6..aa38f65e 100644 --- a/Step.Database/Migrations/201903070940012_InitMigrtion.Designer.cs +++ b/Step.Database/Migrations/201903070940012_InitMigrtion.Designer.cs @@ -1,5 +1,5 @@ // -namespace Step.Database.Migrations +namespace Termo.Active.Database.Migrations { using System.CodeDom.Compiler; using System.Data.Entity.Migrations; diff --git a/Step.Database/Migrations/201903070940012_InitMigrtion.cs b/Step.Database/Migrations/201903070940012_InitMigrtion.cs index 62dae962..a33a92de 100644 --- a/Step.Database/Migrations/201903070940012_InitMigrtion.cs +++ b/Step.Database/Migrations/201903070940012_InitMigrtion.cs @@ -1,4 +1,4 @@ -namespace Step.Database.Migrations +namespace Termo.Active.Database.Migrations { using System; using System.Data.Entity.Migrations; diff --git a/Step.Database/Migrations/201904041054202_UserDeleteMigratin.Designer.cs b/Step.Database/Migrations/201904041054202_UserDeleteMigratin.Designer.cs index f9cde1a0..71657df6 100644 --- a/Step.Database/Migrations/201904041054202_UserDeleteMigratin.Designer.cs +++ b/Step.Database/Migrations/201904041054202_UserDeleteMigratin.Designer.cs @@ -1,5 +1,5 @@ // -namespace Step.Database.Migrations +namespace Termo.Active.Database.Migrations { using System.CodeDom.Compiler; using System.Data.Entity.Migrations; diff --git a/Step.Database/Migrations/201904041054202_UserDeleteMigratin.cs b/Step.Database/Migrations/201904041054202_UserDeleteMigratin.cs index bf804aff..749341f8 100644 --- a/Step.Database/Migrations/201904041054202_UserDeleteMigratin.cs +++ b/Step.Database/Migrations/201904041054202_UserDeleteMigratin.cs @@ -1,4 +1,4 @@ -namespace Step.Database.Migrations +namespace Termo.Active.Database.Migrations { using System; using System.Data.Entity.Migrations; diff --git a/Step.Database/Migrations/Configuration.cs b/Step.Database/Migrations/Configuration.cs index 72952d08..f37b67cc 100644 --- a/Step.Database/Migrations/Configuration.cs +++ b/Step.Database/Migrations/Configuration.cs @@ -1,10 +1,10 @@ -namespace Step.Database.Migrations +namespace Termo.Active.Database.Migrations { - using Step.Model.DatabaseModels; + using Termo.Active.Model.DatabaseModels; using System.Data.Entity.Migrations; - using static Step.Model.Constants.FUNCTIONALITY_NAMES; - using static Step.Model.Constants.AREAS; - using static Step.Model.Constants; + using static Termo.Active.Model.Constants.FUNCTIONALITY_NAMES; + using static Termo.Active.Model.Constants.AREAS; + using static Termo.Active.Model.Constants; public sealed class Configuration : DbMigrationsConfiguration { diff --git a/Step.Database/Redis/redUtil.cs b/Step.Database/Redis/redUtil.cs index 9a7b66ce..07742bc3 100644 --- a/Step.Database/Redis/redUtil.cs +++ b/Step.Database/Redis/redUtil.cs @@ -4,7 +4,7 @@ using StackExchange.Redis; using System; using System.Collections.Generic; -namespace Step.Database.Redis +namespace Termo.Active.Database.Redis { public class redUtil diff --git a/Step.Database/Step.Database.csproj b/Step.Database/Termo.Active.Database.csproj similarity index 94% rename from Step.Database/Step.Database.csproj rename to Step.Database/Termo.Active.Database.csproj index d7aed763..252bedfb 100644 --- a/Step.Database/Step.Database.csproj +++ b/Step.Database/Termo.Active.Database.csproj @@ -1,185 +1,185 @@ - - - - - Debug - AnyCPU - {357D5EE1-FFC8-489B-9232-22CF474D9A6F} - Library - Properties - Step.Database - Step.Database - v4.6.2 - 512 - - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\Libs\CMS_CORE_Library.dll - - - ..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll - - - ..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll - - - ..\packages\Microsoft.AspNet.Identity.Core.2.2.1\lib\net45\Microsoft.AspNet.Identity.Core.dll - - - ..\packages\Microsoft.AspNet.Identity.EntityFramework.2.2.1\lib\net45\Microsoft.AspNet.Identity.EntityFramework.dll - - - ..\packages\MySql.Data.6.10.4\lib\net452\MySql.Data.dll - True - - - ..\packages\MySql.Data.Entity.6.9.10\lib\net45\MySql.Data.Entity.EF6.dll - - - ..\packages\NLog.4.5.11\lib\net45\NLog.dll - - - ..\packages\Pipelines.Sockets.Unofficial.1.0.7\lib\net461\Pipelines.Sockets.Unofficial.dll - - - ..\packages\StackExchange.Redis.2.0.519\lib\net461\StackExchange.Redis.dll - - - - ..\packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll - - - - - - ..\packages\System.Diagnostics.PerformanceCounter.4.5.0\lib\net461\System.Diagnostics.PerformanceCounter.dll - - - - ..\packages\System.IO.Pipelines.4.5.1\lib\netstandard2.0\System.IO.Pipelines.dll - - - ..\packages\System.Memory.4.5.1\lib\netstandard2.0\System.Memory.dll - - - - ..\packages\System.Numerics.Vectors.4.4.0\lib\net46\System.Numerics.Vectors.dll - - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll - - - - - - ..\packages\System.Threading.Channels.4.5.0\lib\netstandard2.0\System.Threading.Channels.dll - - - ..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll - - - - ..\packages\System.Web.Helpers.Crypto.3.2.3\lib\net40\System.Web.Helpers.Crypto.dll - - - - - - - - - - - - - - - - - - - - - - - - 201902121508312_InitMigration.cs - - - - 201903070940012_InitMigrtion.cs - - - - 201904041054202_UserDeleteMigratin.cs - - - - - - - - {3f5c2483-fc87-43ef-92a8-66ff7d0e440f} - Step.Config - - - {631375dd-06d3-49bb-8130-d9ddb34c429d} - Step.Model - - - {cbeb631b-abfa-4042-9779-c0060b0dfefe} - Step.Utils - - - - - - - - - - - - - - - - - - - - - - 201902121508312_InitMigration.cs - - - 201903070940012_InitMigrtion.cs - - - 201904041054202_UserDeleteMigratin.cs - - - - + + + + + Debug + AnyCPU + {357D5EE1-FFC8-489B-9232-22CF474D9A6F} + Library + Properties + Termo.Active.Database + Termo.Active.Database + v4.6.2 + 512 + + + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + false + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\Libs\CMS_CORE_Library.dll + + + ..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll + + + ..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll + + + ..\packages\Microsoft.AspNet.Identity.Core.2.2.1\lib\net45\Microsoft.AspNet.Identity.Core.dll + + + ..\packages\Microsoft.AspNet.Identity.EntityFramework.2.2.1\lib\net45\Microsoft.AspNet.Identity.EntityFramework.dll + + + ..\packages\MySql.Data.6.10.4\lib\net452\MySql.Data.dll + True + + + ..\packages\MySql.Data.Entity.6.9.10\lib\net45\MySql.Data.Entity.EF6.dll + + + ..\packages\NLog.4.5.11\lib\net45\NLog.dll + + + ..\packages\Pipelines.Sockets.Unofficial.1.0.7\lib\net461\Pipelines.Sockets.Unofficial.dll + + + ..\packages\StackExchange.Redis.2.0.519\lib\net461\StackExchange.Redis.dll + + + + ..\packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll + + + + + + ..\packages\System.Diagnostics.PerformanceCounter.4.5.0\lib\net461\System.Diagnostics.PerformanceCounter.dll + + + + ..\packages\System.IO.Pipelines.4.5.1\lib\netstandard2.0\System.IO.Pipelines.dll + + + ..\packages\System.Memory.4.5.1\lib\netstandard2.0\System.Memory.dll + + + + ..\packages\System.Numerics.Vectors.4.4.0\lib\net46\System.Numerics.Vectors.dll + + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + + + + + + ..\packages\System.Threading.Channels.4.5.0\lib\netstandard2.0\System.Threading.Channels.dll + + + ..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + + + + ..\packages\System.Web.Helpers.Crypto.3.2.3\lib\net40\System.Web.Helpers.Crypto.dll + + + + + + + + + + + + + + + + + + + + + + + + 201902121508312_InitMigration.cs + + + + 201903070940012_InitMigrtion.cs + + + + 201904041054202_UserDeleteMigratin.cs + + + + + + + + {3f5c2483-fc87-43ef-92a8-66ff7d0e440f} + Termo.Active.Config + + + {631375dd-06d3-49bb-8130-d9ddb34c429d} + Termo.Active.Model + + + {cbeb631b-abfa-4042-9779-c0060b0dfefe} + Termo.Active.Utils + + + + + + + + + + + + + + + + + + + + + + 201902121508312_InitMigration.cs + + + 201903070940012_InitMigrtion.cs + + + 201904041054202_UserDeleteMigratin.cs + + + + \ No newline at end of file diff --git a/Step.Model/ConfigModels/AlarmsConfigModel.cs b/Step.Model/ConfigModels/AlarmsConfigModel.cs index 72d68538..05280f49 100644 --- a/Step.Model/ConfigModels/AlarmsConfigModel.cs +++ b/Step.Model/ConfigModels/AlarmsConfigModel.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Step.Model.ConfigModels +namespace Termo.Active.Model.ConfigModels { public class AlarmsConfigModel { diff --git a/Step.Model/ConfigModels/AreasConfigModel.cs b/Step.Model/ConfigModels/AreasConfigModel.cs index fbc7e723..09fceb19 100644 --- a/Step.Model/ConfigModels/AreasConfigModel.cs +++ b/Step.Model/ConfigModels/AreasConfigModel.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Step.Model.ConfigModels +namespace Termo.Active.Model.ConfigModels { public class AreasConfigModel { diff --git a/Step.Model/ConfigModels/CmsConnectConfigModel.cs b/Step.Model/ConfigModels/CmsConnectConfigModel.cs index 2b615c61..04b3082f 100644 --- a/Step.Model/ConfigModels/CmsConnectConfigModel.cs +++ b/Step.Model/ConfigModels/CmsConnectConfigModel.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Step.Model.ConfigModels +namespace Termo.Active.Model.ConfigModels { public class CmsConnectConfigModel { diff --git a/Step.Model/ConfigModels/ExtSoftwareModel.cs b/Step.Model/ConfigModels/ExtSoftwareModel.cs index 5cdca97a..b7ced310 100644 --- a/Step.Model/ConfigModels/ExtSoftwareModel.cs +++ b/Step.Model/ConfigModels/ExtSoftwareModel.cs @@ -5,7 +5,7 @@ using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; -namespace Step.Model.ConfigModels +namespace Termo.Active.Model.ConfigModels { [DataContract] public class ExtSoftwareModel diff --git a/Step.Model/ConfigModels/HeadsConfigModel.cs b/Step.Model/ConfigModels/HeadsConfigModel.cs index 5c53a17f..6e7fa9f6 100644 --- a/Step.Model/ConfigModels/HeadsConfigModel.cs +++ b/Step.Model/ConfigModels/HeadsConfigModel.cs @@ -1,16 +1,16 @@ using System.Collections.Generic; -using static Step.Model.Constants; - -namespace Step.Model.ConfigModels -{ - public class HeadsConfigModel - { - public int Id; - public HEAD_TYPE Type; - public short WarningLimit; - public short AlarmLimit; - public bool FixedHead; - - public Dictionary LocalizedNames { get; set; } - } -} +using static Termo.Active.Model.Constants; + +namespace Termo.Active.Model.ConfigModels +{ + public class HeadsConfigModel + { + public int Id; + public HEAD_TYPE Type; + public short WarningLimit; + public short AlarmLimit; + public bool FixedHead; + + public Dictionary LocalizedNames { get; set; } + } +} diff --git a/Step.Model/ConfigModels/MagazineNamesModel.cs b/Step.Model/ConfigModels/MagazineNamesModel.cs index f71c4338..0f539fbb 100644 --- a/Step.Model/ConfigModels/MagazineNamesModel.cs +++ b/Step.Model/ConfigModels/MagazineNamesModel.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Step.Model.ConfigModels +namespace Termo.Active.Model.ConfigModels { public class MagazineNamesModel { diff --git a/Step.Model/ConfigModels/MaintenanceConfigModel.cs b/Step.Model/ConfigModels/MaintenanceConfigModel.cs index 9e49f3ed..f1204cbb 100644 --- a/Step.Model/ConfigModels/MaintenanceConfigModel.cs +++ b/Step.Model/ConfigModels/MaintenanceConfigModel.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace Step.Model.ConfigModels +namespace Termo.Active.Model.ConfigModels { public class MaintenanceConfigModel { diff --git a/Step.Model/ConfigModels/MessageModel.cs b/Step.Model/ConfigModels/MessageModel.cs index c3686213..89d0d96e 100644 --- a/Step.Model/ConfigModels/MessageModel.cs +++ b/Step.Model/ConfigModels/MessageModel.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using static Step.Model.Constants; +using static Termo.Active.Model.Constants; -namespace Step.Model +namespace Termo.Active.Model { public class ErrorMessageModel { diff --git a/Step.Model/ConfigModels/NcConfigModel.cs b/Step.Model/ConfigModels/NcConfigModel.cs index 8bc31a22..45da3d25 100644 --- a/Step.Model/ConfigModels/NcConfigModel.cs +++ b/Step.Model/ConfigModels/NcConfigModel.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Step.Model.ConfigModels +namespace Termo.Active.Model.ConfigModels { public class NcConfigModel { diff --git a/Step.Model/ConfigModels/NcSoftKeysModel.cs b/Step.Model/ConfigModels/NcSoftKeysModel.cs index d6b4065c..8df5f65d 100644 --- a/Step.Model/ConfigModels/NcSoftKeysModel.cs +++ b/Step.Model/ConfigModels/NcSoftKeysModel.cs @@ -1,4 +1,4 @@ -namespace Step.Model.ConfigModels +namespace Termo.Active.Model.ConfigModels { public class NcSoftKeysModel { diff --git a/Step.Model/ConfigModels/ServerConfigModel.cs b/Step.Model/ConfigModels/ServerConfigModel.cs index ac5a3920..4e2e8304 100644 --- a/Step.Model/ConfigModels/ServerConfigModel.cs +++ b/Step.Model/ConfigModels/ServerConfigModel.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Step.Model.ConfigModels +namespace Termo.Active.Model.ConfigModels { public class ServerConfigModel { diff --git a/Step.Model/ConfigModels/SoftwareProdConfigModel.cs b/Step.Model/ConfigModels/SoftwareProdConfigModel.cs index 580a9bd7..2b8e6dac 100644 --- a/Step.Model/ConfigModels/SoftwareProdConfigModel.cs +++ b/Step.Model/ConfigModels/SoftwareProdConfigModel.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Step.Model.ConfigModels +namespace Termo.Active.Model.ConfigModels { public class SoftwareProdConfigModel { diff --git a/Step.Model/ConfigModels/ToolManagerConfigModel.cs b/Step.Model/ConfigModels/ToolManagerConfigModel.cs index d2318d5d..557b9c24 100644 --- a/Step.Model/ConfigModels/ToolManagerConfigModel.cs +++ b/Step.Model/ConfigModels/ToolManagerConfigModel.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Step.Model.ConfigModels +namespace Termo.Active.Model.ConfigModels { public class ToolManagerConfigModel { diff --git a/Step.Model/ConfigModels/ToolTypeConfigModel.cs b/Step.Model/ConfigModels/ToolTypeConfigModel.cs index 268bc406..ac9cc565 100644 --- a/Step.Model/ConfigModels/ToolTypeConfigModel.cs +++ b/Step.Model/ConfigModels/ToolTypeConfigModel.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Step.Model.ConfigModels +namespace Termo.Active.Model.ConfigModels { public class ToolTypeConfigModel { diff --git a/Step.Model/ConfigModels/UserSoftKeyConfigModel.cs b/Step.Model/ConfigModels/UserSoftKeyConfigModel.cs index 67b0fea1..b19c864d 100644 --- a/Step.Model/ConfigModels/UserSoftKeyConfigModel.cs +++ b/Step.Model/ConfigModels/UserSoftKeyConfigModel.cs @@ -1,26 +1,26 @@ -using System.Collections.Generic; -using static Step.Model.Constants; - -namespace Step.Model.ConfigModels -{ - public class UserSoftKeyConfigModel - { - public int Id { get; set; } - public Dictionary LocalizedNames { get; set; } - public int Category { get; set; } - public bool IsActive { get; set; } - public bool IsVisible { get; set; } - public bool OperatorConfirmationNeeded { get; set; } - public List SubKeys { get; set; } - public int PlcId { get; set; } - public SOFTKEY_TYPE Type { get; set; } - } - - public class SubKeysModel - { - public int Id; - public int PlcId; +using System.Collections.Generic; +using static Termo.Active.Model.Constants; + +namespace Termo.Active.Model.ConfigModels +{ + public class UserSoftKeyConfigModel + { + public int Id { get; set; } + public Dictionary LocalizedNames { get; set; } + public int Category { get; set; } + public bool IsActive { get; set; } + public bool IsVisible { get; set; } + public bool OperatorConfirmationNeeded { get; set; } + public List SubKeys { get; set; } + public int PlcId { get; set; } + public SOFTKEY_TYPE Type { get; set; } + } + + public class SubKeysModel + { + public int Id; + public int PlcId; public bool IsActive; - public string Text; - } -} + public string Text; + } +} diff --git a/Step.Model/Constants.cs b/Step.Model/Constants.cs index c846eac5..2f2bdec2 100644 --- a/Step.Model/Constants.cs +++ b/Step.Model/Constants.cs @@ -1,7 +1,7 @@ using System.IO; using System.Reflection; -namespace Step.Model +namespace Termo.Active.Model { public static class Constants { diff --git a/Step.Model/DTOModels/AlarmModels/DTOAlarmHistoricModel.cs b/Step.Model/DTOModels/AlarmModels/DTOAlarmHistoricModel.cs index f8c3773d..25a5808e 100644 --- a/Step.Model/DTOModels/AlarmModels/DTOAlarmHistoricModel.cs +++ b/Step.Model/DTOModels/AlarmModels/DTOAlarmHistoricModel.cs @@ -1,13 +1,13 @@ using CMS_CORE_Library.Utils; -using Step.Model.DatabaseModels; +using Termo.Active.Model.DatabaseModels; using System; using System.Collections; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; -using static Step.Model.Constants; +using static Termo.Active.Model.Constants; -namespace Step.Model.DTOModels.AlarmModels +namespace Termo.Active.Model.DTOModels.AlarmModels { public class DTOAlarmHistoricModel { diff --git a/Step.Model/DTOModels/AlarmModels/DTOAlarmsModel.cs b/Step.Model/DTOModels/AlarmModels/DTOAlarmsModel.cs index 278416db..fdd6ccb1 100644 --- a/Step.Model/DTOModels/AlarmModels/DTOAlarmsModel.cs +++ b/Step.Model/DTOModels/AlarmModels/DTOAlarmsModel.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using static CMS_CORE_Library.Models.DataStructures; -namespace Step.Model.DTOModels.AlarmModels +namespace Termo.Active.Model.DTOModels.AlarmModels { // Alarms from NC public class DTOAlarmsModel diff --git a/Step.Model/DTOModels/AlarmModels/DTONewAlarmNoteModel.cs b/Step.Model/DTOModels/AlarmModels/DTONewAlarmNoteModel.cs index 138b6a13..e0fa1588 100644 --- a/Step.Model/DTOModels/AlarmModels/DTONewAlarmNoteModel.cs +++ b/Step.Model/DTOModels/AlarmModels/DTONewAlarmNoteModel.cs @@ -1,4 +1,4 @@ -using Step.Model.DatabaseModels; +using Termo.Active.Model.DatabaseModels; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; @@ -6,7 +6,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Step.Model.DTOModels.AlarmModels +namespace Termo.Active.Model.DTOModels.AlarmModels { public class DTONewAlarmNoteModel { diff --git a/Step.Model/DTOModels/DTOActiveProgramInfoModel.cs b/Step.Model/DTOModels/DTOActiveProgramInfoModel.cs index b6f3474a..e8184191 100644 --- a/Step.Model/DTOModels/DTOActiveProgramInfoModel.cs +++ b/Step.Model/DTOModels/DTOActiveProgramInfoModel.cs @@ -1,7 +1,7 @@ using System.Linq; using static CMS_CORE_Library.Models.DataStructures; -namespace Step.Model.DTOModels +namespace Termo.Active.Model.DTOModels { public class DTOActiveProgramDataModel : ActiveProgramDataModel { diff --git a/Step.Model/DTOModels/DTOAxesModel.cs b/Step.Model/DTOModels/DTOAxesModel.cs index d32be3ef..7df5315b 100644 --- a/Step.Model/DTOModels/DTOAxesModel.cs +++ b/Step.Model/DTOModels/DTOAxesModel.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; -namespace Step.Model.DTOModels +namespace Termo.Active.Model.DTOModels { public class DTOAxesModel { diff --git a/Step.Model/DTOModels/DTOAxisNameModel.cs b/Step.Model/DTOModels/DTOAxisNameModel.cs index 74448fdb..2e1c28b7 100644 --- a/Step.Model/DTOModels/DTOAxisNameModel.cs +++ b/Step.Model/DTOModels/DTOAxisNameModel.cs @@ -1,6 +1,6 @@ using static CMS_CORE_Library.Models.DataStructures; -namespace Step.Model.DTOModels +namespace Termo.Active.Model.DTOModels { public class DTOAxisNameModel : AxisModel { diff --git a/Step.Model/DTOModels/DTOClientConfigurationModel.cs b/Step.Model/DTOModels/DTOClientConfigurationModel.cs index 40132909..c80780fd 100644 --- a/Step.Model/DTOModels/DTOClientConfigurationModel.cs +++ b/Step.Model/DTOModels/DTOClientConfigurationModel.cs @@ -1,8 +1,8 @@ -using Step.Model.ConfigModels; +using Termo.Active.Model.ConfigModels; using System.Collections.Generic; using System.Globalization; -namespace Step.Model.DTOModels +namespace Termo.Active.Model.DTOModels { public class DTOClientConfigurationModel { diff --git a/Step.Model/DTOModels/DTOCmsConnectGateway.cs b/Step.Model/DTOModels/DTOCmsConnectGateway.cs index d07a4a6b..2e5409a2 100644 --- a/Step.Model/DTOModels/DTOCmsConnectGateway.cs +++ b/Step.Model/DTOModels/DTOCmsConnectGateway.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Step.Model.DTOModels +namespace Termo.Active.Model.DTOModels { public class DTOCmsConnectGatewayNetworkModel { diff --git a/Step.Model/DTOModels/DTOFunctionAccessModel.cs b/Step.Model/DTOModels/DTOFunctionAccessModel.cs index dbb5849f..9668f612 100644 --- a/Step.Model/DTOModels/DTOFunctionAccessModel.cs +++ b/Step.Model/DTOModels/DTOFunctionAccessModel.cs @@ -1,4 +1,4 @@ -namespace Step.Model.DTOModels +namespace Termo.Active.Model.DTOModels { public class DTOFunctionAccessModel { diff --git a/Step.Model/DTOModels/DTOHeadModel.cs b/Step.Model/DTOModels/DTOHeadModel.cs index f13fba44..23ba9cfb 100644 --- a/Step.Model/DTOModels/DTOHeadModel.cs +++ b/Step.Model/DTOModels/DTOHeadModel.cs @@ -1,6 +1,6 @@ using static CMS_CORE_Library.Models.DataStructures; -namespace Step.Model.DTOModels +namespace Termo.Active.Model.DTOModels { public class DTOHeadModel { diff --git a/Step.Model/DTOModels/DTOHeadsConfigModel.cs b/Step.Model/DTOModels/DTOHeadsConfigModel.cs index d6b253b7..501b614d 100644 --- a/Step.Model/DTOModels/DTOHeadsConfigModel.cs +++ b/Step.Model/DTOModels/DTOHeadsConfigModel.cs @@ -1,4 +1,4 @@ -namespace Step.Model.DTOModels +namespace Termo.Active.Model.DTOModels { public class DTOHeadsConfigModel { diff --git a/Step.Model/DTOModels/DTOLanguageModel.cs b/Step.Model/DTOModels/DTOLanguageModel.cs index c41ae22f..2ddbbd29 100644 --- a/Step.Model/DTOModels/DTOLanguageModel.cs +++ b/Step.Model/DTOModels/DTOLanguageModel.cs @@ -1,4 +1,4 @@ -namespace Step.Model.DTOModels +namespace Termo.Active.Model.DTOModels { public class DTOLanguageModel { diff --git a/Step.Model/DTOModels/DTONcGenericDataModel.cs b/Step.Model/DTOModels/DTONcGenericDataModel.cs index 8102dece..93efe740 100644 --- a/Step.Model/DTOModels/DTONcGenericDataModel.cs +++ b/Step.Model/DTOModels/DTONcGenericDataModel.cs @@ -2,7 +2,7 @@ using System.Linq; using System.Reflection; -namespace Step.Model.DTOModels +namespace Termo.Active.Model.DTOModels { public class DTONcGenericDataModel { diff --git a/Step.Model/DTOModels/DTONcSoftKeyModel.cs b/Step.Model/DTOModels/DTONcSoftKeyModel.cs index 6300affd..a6dd3f65 100644 --- a/Step.Model/DTOModels/DTONcSoftKeyModel.cs +++ b/Step.Model/DTOModels/DTONcSoftKeyModel.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Step.Model.DTOModels +namespace Termo.Active.Model.DTOModels { public class DTONcSoftKeyModel { diff --git a/Step.Model/DTOModels/DTONetworkMonitor.cs b/Step.Model/DTOModels/DTONetworkMonitor.cs index b776f1e1..1c3bfb87 100644 --- a/Step.Model/DTOModels/DTONetworkMonitor.cs +++ b/Step.Model/DTOModels/DTONetworkMonitor.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Step.Model.DTOModels +namespace Termo.Active.Model.DTOModels { public class DTONetworkMonitorModel { diff --git a/Step.Model/DTOModels/DTOPowerOnDataModel.cs b/Step.Model/DTOModels/DTOPowerOnDataModel.cs index 34d2d5be..01315263 100644 --- a/Step.Model/DTOModels/DTOPowerOnDataModel.cs +++ b/Step.Model/DTOModels/DTOPowerOnDataModel.cs @@ -1,7 +1,7 @@ using CMS_CORE_Library.Models; using static CMS_CORE_Library.Models.DataStructures; -namespace Step.Model.DTOModels +namespace Termo.Active.Model.DTOModels { public class DTOPowerOnDataModel { diff --git a/Step.Model/DTOModels/DTOProcessDataModel.cs b/Step.Model/DTOModels/DTOProcessDataModel.cs index 8d94849d..7fcc9a7e 100644 --- a/Step.Model/DTOModels/DTOProcessDataModel.cs +++ b/Step.Model/DTOModels/DTOProcessDataModel.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using static CMS_CORE_Library.Models.DataStructures; -namespace Step.Model.DTOModels +namespace Termo.Active.Model.DTOModels { public class DTOProcessesDataModel { diff --git a/Step.Model/DTOModels/DTOQueueModel.cs b/Step.Model/DTOModels/DTOQueueModel.cs index dbcfa9b4..2e6e3089 100644 --- a/Step.Model/DTOModels/DTOQueueModel.cs +++ b/Step.Model/DTOModels/DTOQueueModel.cs @@ -1,6 +1,6 @@ -using static Step.Model.Constants; +using static Termo.Active.Model.Constants; -namespace Step.Model.DTOModels +namespace Termo.Active.Model.DTOModels { public class DTOQueueModel { diff --git a/Step.Model/DTOModels/DTORoleModel.cs b/Step.Model/DTOModels/DTORoleModel.cs index 8f623ae8..18d0f47c 100644 --- a/Step.Model/DTOModels/DTORoleModel.cs +++ b/Step.Model/DTOModels/DTORoleModel.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Step.Model.DTOModels +namespace Termo.Active.Model.DTOModels { public class DTORoleModel { diff --git a/Step.Model/DTOModels/DTORuntimeFunctionAccessModel.cs b/Step.Model/DTOModels/DTORuntimeFunctionAccessModel.cs index 3db2ee43..7f0179bf 100644 --- a/Step.Model/DTOModels/DTORuntimeFunctionAccessModel.cs +++ b/Step.Model/DTOModels/DTORuntimeFunctionAccessModel.cs @@ -1,4 +1,4 @@ -namespace Step.Model.DTOModels +namespace Termo.Active.Model.DTOModels { public class DTORuntimeFunctionalityModel { diff --git a/Step.Model/DTOModels/DTOStartupConfigurationModel.cs b/Step.Model/DTOModels/DTOStartupConfigurationModel.cs index 88ae6871..af00aad6 100644 --- a/Step.Model/DTOModels/DTOStartupConfigurationModel.cs +++ b/Step.Model/DTOModels/DTOStartupConfigurationModel.cs @@ -1,11 +1,11 @@ -using Step.Model.ConfigModels; +using Termo.Active.Model.ConfigModels; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Step.Model.DTOModels +namespace Termo.Active.Model.DTOModels { public class DTOStartupConfigurationModel { diff --git a/Step.Model/DTOModels/DTOUserModel.cs b/Step.Model/DTOModels/DTOUserModel.cs index f021e091..534577ad 100644 --- a/Step.Model/DTOModels/DTOUserModel.cs +++ b/Step.Model/DTOModels/DTOUserModel.cs @@ -1,4 +1,4 @@ -using Step.Model.DatabaseModels; +using Termo.Active.Model.DatabaseModels; using System; using System.Collections.Generic; using System.Globalization; @@ -6,7 +6,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Step.Model.DTOModels +namespace Termo.Active.Model.DTOModels { public class DTONewUserModel { diff --git a/Step.Model/DTOModels/DTOUserSoftKeyModel.cs b/Step.Model/DTOModels/DTOUserSoftKeyModel.cs index 216b5995..5251b78f 100644 --- a/Step.Model/DTOModels/DTOUserSoftKeyModel.cs +++ b/Step.Model/DTOModels/DTOUserSoftKeyModel.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using static Step.Model.Constants; +using static Termo.Active.Model.Constants; -namespace Step.Model.DTOModels +namespace Termo.Active.Model.DTOModels { public class DTOUserSoftKeyConfigModel { diff --git a/Step.Model/DTOModels/JobModels/DTOGenericParamModel.cs b/Step.Model/DTOModels/JobModels/DTOGenericParamModel.cs index 5b889381..374621f3 100644 --- a/Step.Model/DTOModels/JobModels/DTOGenericParamModel.cs +++ b/Step.Model/DTOModels/JobModels/DTOGenericParamModel.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace Step.Model.DTOModels.JobModels +namespace Termo.Active.Model.DTOModels.JobModels { public class DTOGenericParamModel { diff --git a/Step.Model/DTOModels/JobModels/DTOImageParamModel.cs b/Step.Model/DTOModels/JobModels/DTOImageParamModel.cs index c01d8eb0..68b0f99c 100644 --- a/Step.Model/DTOModels/JobModels/DTOImageParamModel.cs +++ b/Step.Model/DTOModels/JobModels/DTOImageParamModel.cs @@ -1,4 +1,4 @@ -namespace Step.Model.DTOModels.JobModels +namespace Termo.Active.Model.DTOModels.JobModels { public class DTOImageParamModel { diff --git a/Step.Model/DTOModels/JobModels/DTOJobCustomParamModel.cs b/Step.Model/DTOModels/JobModels/DTOJobCustomParamModel.cs index 797f55a4..15d43c1c 100644 --- a/Step.Model/DTOModels/JobModels/DTOJobCustomParamModel.cs +++ b/Step.Model/DTOModels/JobModels/DTOJobCustomParamModel.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Step.Model.DTOModels.JobModels +namespace Termo.Active.Model.DTOModels.JobModels { public class DTOJobCustomParamModel { diff --git a/Step.Model/DTOModels/JobModels/DTOJobModel.cs b/Step.Model/DTOModels/JobModels/DTOJobModel.cs index 03e0d3d5..f5432b3d 100644 --- a/Step.Model/DTOModels/JobModels/DTOJobModel.cs +++ b/Step.Model/DTOModels/JobModels/DTOJobModel.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace Step.Model.DTOModels.JobModels +namespace Termo.Active.Model.DTOModels.JobModels { public class DTOJobModel { diff --git a/Step.Model/DTOModels/JobModels/DTOMetadataFieldsModel.cs b/Step.Model/DTOModels/JobModels/DTOMetadataFieldsModel.cs index c7d94987..4927587f 100644 --- a/Step.Model/DTOModels/JobModels/DTOMetadataFieldsModel.cs +++ b/Step.Model/DTOModels/JobModels/DTOMetadataFieldsModel.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace Step.Model.DTOModels.JobModels +namespace Termo.Active.Model.DTOModels.JobModels { public class DTOMetadataFieldsModel { diff --git a/Step.Model/DTOModels/JobModels/DTOMetadataModel.cs b/Step.Model/DTOModels/JobModels/DTOMetadataModel.cs index c44563a1..44f28cab 100644 --- a/Step.Model/DTOModels/JobModels/DTOMetadataModel.cs +++ b/Step.Model/DTOModels/JobModels/DTOMetadataModel.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Step.Model.DTOModels.JobModels +namespace Termo.Active.Model.DTOModels.JobModels { public class DTOMetadataModel { diff --git a/Step.Model/DTOModels/MaintenanceModels/DTOExpiredMaintenanceModel.cs b/Step.Model/DTOModels/MaintenanceModels/DTOExpiredMaintenanceModel.cs index f0840565..b49036d7 100644 --- a/Step.Model/DTOModels/MaintenanceModels/DTOExpiredMaintenanceModel.cs +++ b/Step.Model/DTOModels/MaintenanceModels/DTOExpiredMaintenanceModel.cs @@ -1,6 +1,6 @@ using System; -namespace Step.Model.DTOModels +namespace Termo.Active.Model.DTOModels { public class DTOExpiredMaintenanceModel { diff --git a/Step.Model/DTOModels/MaintenanceModels/DTOMaintenanceModel.cs b/Step.Model/DTOModels/MaintenanceModels/DTOMaintenanceModel.cs index 6ffd3a1a..77bd7e89 100644 --- a/Step.Model/DTOModels/MaintenanceModels/DTOMaintenanceModel.cs +++ b/Step.Model/DTOModels/MaintenanceModels/DTOMaintenanceModel.cs @@ -1,8 +1,8 @@ -using Step.Model.DatabaseModels; +using Termo.Active.Model.DatabaseModels; using System; -using static Step.Model.Constants; +using static Termo.Active.Model.Constants; -namespace Step.Model.DTOModels.MaintenanceModels +namespace Termo.Active.Model.DTOModels.MaintenanceModels { public class DTOMaintenanceModel { diff --git a/Step.Model/DTOModels/MaintenanceModels/DTOMaintenanceNoteModel.cs b/Step.Model/DTOModels/MaintenanceModels/DTOMaintenanceNoteModel.cs index 4573a74e..78a34794 100644 --- a/Step.Model/DTOModels/MaintenanceModels/DTOMaintenanceNoteModel.cs +++ b/Step.Model/DTOModels/MaintenanceModels/DTOMaintenanceNoteModel.cs @@ -1,4 +1,4 @@ -using Step.Model.DatabaseModels; +using Termo.Active.Model.DatabaseModels; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; @@ -6,7 +6,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Step.Model.DTOModels.MaintenanceModels +namespace Termo.Active.Model.DTOModels.MaintenanceModels { public class DTONewMaintenanceNoteModel { diff --git a/Step.Model/DTOModels/MaintenanceModels/DTONewMaintenanceModel.cs b/Step.Model/DTOModels/MaintenanceModels/DTONewMaintenanceModel.cs index 8a4dac32..0668858e 100644 --- a/Step.Model/DTOModels/MaintenanceModels/DTONewMaintenanceModel.cs +++ b/Step.Model/DTOModels/MaintenanceModels/DTONewMaintenanceModel.cs @@ -4,9 +4,9 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Text; using System.Threading.Tasks; -using static Step.Model.Constants; +using static Termo.Active.Model.Constants; -namespace Step.Model.DTOModels.MaintenanceModels +namespace Termo.Active.Model.DTOModels.MaintenanceModels { public class DTONewMaintenanceModel { diff --git a/Step.Model/DTOModels/Scada/DTOScadaModel.cs b/Step.Model/DTOModels/Scada/DTOScadaModel.cs index 0f9bf9c2..bd854353 100644 --- a/Step.Model/DTOModels/Scada/DTOScadaModel.cs +++ b/Step.Model/DTOModels/Scada/DTOScadaModel.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; -namespace Step.Model.DTOModels.Scada +namespace Termo.Active.Model.DTOModels.Scada { public class DTOScadaModel { diff --git a/Step.Model/DTOModels/Scada/ScadaSchemaModel.cs b/Step.Model/DTOModels/Scada/ScadaSchemaModel.cs index 14e96500..aeb584dd 100644 --- a/Step.Model/DTOModels/Scada/ScadaSchemaModel.cs +++ b/Step.Model/DTOModels/Scada/ScadaSchemaModel.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Xml.Serialization; -namespace Step.Model.DTOModels.Scada +namespace Termo.Active.Model.DTOModels.Scada { [XmlRoot("scada")] public class ScadaSchemaModel diff --git a/Step.Model/DTOModels/ToolModels/DTOAssistedToolingModel.cs b/Step.Model/DTOModels/ToolModels/DTOAssistedToolingModel.cs index 36ba6477..25869cdb 100644 --- a/Step.Model/DTOModels/ToolModels/DTOAssistedToolingModel.cs +++ b/Step.Model/DTOModels/ToolModels/DTOAssistedToolingModel.cs @@ -1,6 +1,6 @@ using static CMS_CORE_Library.Models.DataStructures; -namespace Step.Model.DTOModels.ToolModels +namespace Termo.Active.Model.DTOModels.ToolModels { public class DTOAssistedToolingModel { diff --git a/Step.Model/DTOModels/ToolModels/DTOEdgeModel.cs b/Step.Model/DTOModels/ToolModels/DTOEdgeModel.cs index 10c26698..5788b34b 100644 --- a/Step.Model/DTOModels/ToolModels/DTOEdgeModel.cs +++ b/Step.Model/DTOModels/ToolModels/DTOEdgeModel.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -namespace Step.Model.DTOModels.ToolModels +namespace Termo.Active.Model.DTOModels.ToolModels { public class DTOEdgeModel { diff --git a/Step.Model/DTOModels/ToolModels/DTOExportToolTableModel.cs b/Step.Model/DTOModels/ToolModels/DTOExportToolTableModel.cs index 7ec85f5b..5cf54676 100644 --- a/Step.Model/DTOModels/ToolModels/DTOExportToolTableModel.cs +++ b/Step.Model/DTOModels/ToolModels/DTOExportToolTableModel.cs @@ -1,11 +1,11 @@ -using Step.Model.DatabaseModels; +using Termo.Active.Model.DatabaseModels; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Step.Model.DTOModels.ToolModels +namespace Termo.Active.Model.DTOModels.ToolModels { public class DTOExportToolTableModel { diff --git a/Step.Model/DTOModels/ToolModels/DTOMagazineStatusModel.cs b/Step.Model/DTOModels/ToolModels/DTOMagazineStatusModel.cs index 069234e8..af2e0f2f 100644 --- a/Step.Model/DTOModels/ToolModels/DTOMagazineStatusModel.cs +++ b/Step.Model/DTOModels/ToolModels/DTOMagazineStatusModel.cs @@ -1,7 +1,7 @@ using CMS_CORE_Library.Models; using static CMS_CORE_Library.Models.DataStructures; -namespace Step.Model.DTOModels.ToolModels +namespace Termo.Active.Model.DTOModels.ToolModels { public class DTOMagazineActionModel { diff --git a/Step.Model/DTOModels/ToolModels/DTONcFamilyModel.cs b/Step.Model/DTOModels/ToolModels/DTONcFamilyModel.cs index 76f31d87..e13145eb 100644 --- a/Step.Model/DTOModels/ToolModels/DTONcFamilyModel.cs +++ b/Step.Model/DTOModels/ToolModels/DTONcFamilyModel.cs @@ -1,4 +1,4 @@ -using Step.Model.DatabaseModels; +using Termo.Active.Model.DatabaseModels; using System; using System.Collections; using System.Collections.Generic; @@ -7,7 +7,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Step.Model.DTOModels.ToolModels +namespace Termo.Active.Model.DTOModels.ToolModels { public class DTONewNcFamilyModel { diff --git a/Step.Model/DTOModels/ToolModels/DTONcMagazinePositionModel.cs b/Step.Model/DTOModels/ToolModels/DTONcMagazinePositionModel.cs index 4df92b93..d0a2b1b3 100644 --- a/Step.Model/DTOModels/ToolModels/DTONcMagazinePositionModel.cs +++ b/Step.Model/DTOModels/ToolModels/DTONcMagazinePositionModel.cs @@ -1,4 +1,4 @@ -using Step.Model.DatabaseModels; +using Termo.Active.Model.DatabaseModels; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; @@ -6,7 +6,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Step.Model.DTOModels.ToolModels +namespace Termo.Active.Model.DTOModels.ToolModels { public class DTONcMagazinePositionModel { diff --git a/Step.Model/DTOModels/ToolModels/DTONcMountedShankModel.cs b/Step.Model/DTOModels/ToolModels/DTONcMountedShankModel.cs index 33f8b81d..05b56888 100644 --- a/Step.Model/DTOModels/ToolModels/DTONcMountedShankModel.cs +++ b/Step.Model/DTOModels/ToolModels/DTONcMountedShankModel.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Step.Model.DTOModels.ToolModels +namespace Termo.Active.Model.DTOModels.ToolModels { public class DTONcMountedShankModel { diff --git a/Step.Model/DTOModels/ToolModels/DTONcShankModel.cs b/Step.Model/DTOModels/ToolModels/DTONcShankModel.cs index 43dad4a4..f94cb025 100644 --- a/Step.Model/DTOModels/ToolModels/DTONcShankModel.cs +++ b/Step.Model/DTOModels/ToolModels/DTONcShankModel.cs @@ -1,8 +1,8 @@ -using Step.Model.DatabaseModels; +using Termo.Active.Model.DatabaseModels; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -namespace Step.Model.DTOModels.ToolModels +namespace Termo.Active.Model.DTOModels.ToolModels { public class DTONewNcShankModel { diff --git a/Step.Model/DTOModels/ToolModels/DTONcToolModel.cs b/Step.Model/DTOModels/ToolModels/DTONcToolModel.cs index 1dbbc7d5..87788ca5 100644 --- a/Step.Model/DTOModels/ToolModels/DTONcToolModel.cs +++ b/Step.Model/DTOModels/ToolModels/DTONcToolModel.cs @@ -1,9 +1,9 @@ using CMS_CORE_Library.Models; -using Step.Model.DatabaseModels; +using Termo.Active.Model.DatabaseModels; using System.Collections; using System.ComponentModel.DataAnnotations; -namespace Step.Model.DTOModels.ToolModels +namespace Termo.Active.Model.DTOModels.ToolModels { public class DTONcTool diff --git a/Step.Model/DTOModels/ToolModels/DTONewToolDataModel.cs b/Step.Model/DTOModels/ToolModels/DTONewToolDataModel.cs index d103e245..2cb48ce8 100644 --- a/Step.Model/DTOModels/ToolModels/DTONewToolDataModel.cs +++ b/Step.Model/DTOModels/ToolModels/DTONewToolDataModel.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Step.Model.DTOModels.ToolModels +namespace Termo.Active.Model.DTOModels.ToolModels { public class DTONewToolDataModel { diff --git a/Step.Model/DTOModels/ToolModels/DTONewToolWithFamilyModel.cs b/Step.Model/DTOModels/ToolModels/DTONewToolWithFamilyModel.cs index 8d340749..6697e1f4 100644 --- a/Step.Model/DTOModels/ToolModels/DTONewToolWithFamilyModel.cs +++ b/Step.Model/DTOModels/ToolModels/DTONewToolWithFamilyModel.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Step.Model.DTOModels.ToolModels +namespace Termo.Active.Model.DTOModels.ToolModels { // Tool with family data diff --git a/Step.Model/DTOModels/ToolModels/DTOSelfAdaptiveModel.cs b/Step.Model/DTOModels/ToolModels/DTOSelfAdaptiveModel.cs index 0b203963..f755201e 100644 --- a/Step.Model/DTOModels/ToolModels/DTOSelfAdaptiveModel.cs +++ b/Step.Model/DTOModels/ToolModels/DTOSelfAdaptiveModel.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -namespace Step.Model.DTOModels.ToolModels +namespace Termo.Active.Model.DTOModels.ToolModels { public class DTOSelfAdaptiveModel { diff --git a/Step.Model/DTOModels/ToolModels/DTOShankModel.cs b/Step.Model/DTOModels/ToolModels/DTOShankModel.cs index 3dc7e1b0..14698a0a 100644 --- a/Step.Model/DTOModels/ToolModels/DTOShankModel.cs +++ b/Step.Model/DTOModels/ToolModels/DTOShankModel.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; -namespace Step.Model.DTOModels.ToolModels +namespace Termo.Active.Model.DTOModels.ToolModels { public class DTOShankModel { diff --git a/Step.Model/DTOModels/ToolModels/DTOSiemensToolModel.cs b/Step.Model/DTOModels/ToolModels/DTOSiemensToolModel.cs index 8a91a5f4..64ff6246 100644 --- a/Step.Model/DTOModels/ToolModels/DTOSiemensToolModel.cs +++ b/Step.Model/DTOModels/ToolModels/DTOSiemensToolModel.cs @@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations; using static CMS_CORE_Library.Models.DataStructures; -namespace Step.Model.DTOModels.ToolModels +namespace Termo.Active.Model.DTOModels.ToolModels { public class DTOSiemensToolModel { diff --git a/Step.Model/DTOModels/ToolModels/DTOUpdateMagazineModel.cs b/Step.Model/DTOModels/ToolModels/DTOUpdateMagazineModel.cs index cecf97e1..5ed04fa4 100644 --- a/Step.Model/DTOModels/ToolModels/DTOUpdateMagazineModel.cs +++ b/Step.Model/DTOModels/ToolModels/DTOUpdateMagazineModel.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Step.Model.DTOModels.ToolModels +namespace Termo.Active.Model.DTOModels.ToolModels { public class DTOSiemensUpdateMagazineModel { diff --git a/Step.Model/DatabaseModels/AlarmDescriptionsModel.cs b/Step.Model/DatabaseModels/AlarmDescriptionsModel.cs index 0225440b..6e48c707 100644 --- a/Step.Model/DatabaseModels/AlarmDescriptionsModel.cs +++ b/Step.Model/DatabaseModels/AlarmDescriptionsModel.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Step.Model.DatabaseModels +namespace Termo.Active.Model.DatabaseModels { [Table("alarm_description")] public class AlarmDescriptionsModel diff --git a/Step.Model/DatabaseModels/AlarmFileModel.cs b/Step.Model/DatabaseModels/AlarmFileModel.cs index 8134695c..8268a6c3 100644 --- a/Step.Model/DatabaseModels/AlarmFileModel.cs +++ b/Step.Model/DatabaseModels/AlarmFileModel.cs @@ -5,9 +5,9 @@ using System.ComponentModel.DataAnnotations.Schema; using System.Linq; using System.Text; using System.Threading.Tasks; -using static Step.Model.Constants; +using static Termo.Active.Model.Constants; -namespace Step.Model.DatabaseModels +namespace Termo.Active.Model.DatabaseModels { [Table("alarm_file")] public class AlarmFileModel diff --git a/Step.Model/DatabaseModels/AlarmNoteModel.cs b/Step.Model/DatabaseModels/AlarmNoteModel.cs index de40493f..abeed58d 100644 --- a/Step.Model/DatabaseModels/AlarmNoteModel.cs +++ b/Step.Model/DatabaseModels/AlarmNoteModel.cs @@ -1,9 +1,9 @@ using System; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -using static Step.Model.Constants; +using static Termo.Active.Model.Constants; -namespace Step.Model.DatabaseModels +namespace Termo.Active.Model.DatabaseModels { [Table("alarm_note")] public class AlarmNoteModel diff --git a/Step.Model/DatabaseModels/AlarmOccurrencesModel.cs b/Step.Model/DatabaseModels/AlarmOccurrencesModel.cs index 1e56961f..7074348e 100644 --- a/Step.Model/DatabaseModels/AlarmOccurrencesModel.cs +++ b/Step.Model/DatabaseModels/AlarmOccurrencesModel.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -using static Step.Model.Constants; +using static Termo.Active.Model.Constants; -namespace Step.Model.DatabaseModels +namespace Termo.Active.Model.DatabaseModels { [Table("alarm_occurrence")] public class AlarmOccurrencesModel diff --git a/Step.Model/DatabaseModels/AlarmUserModel.cs b/Step.Model/DatabaseModels/AlarmUserModel.cs index c4a97bb3..5ec6258e 100644 --- a/Step.Model/DatabaseModels/AlarmUserModel.cs +++ b/Step.Model/DatabaseModels/AlarmUserModel.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Step.Model.DatabaseModels +namespace Termo.Active.Model.DatabaseModels { [Table("alarm_user")] public class AlarmUserModel diff --git a/Step.Model/DatabaseModels/FavoriteUserSoftKeyModel.cs b/Step.Model/DatabaseModels/FavoriteUserSoftKeyModel.cs index 60771e52..ce55913b 100644 --- a/Step.Model/DatabaseModels/FavoriteUserSoftKeyModel.cs +++ b/Step.Model/DatabaseModels/FavoriteUserSoftKeyModel.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Step.Model.DatabaseModels +namespace Termo.Active.Model.DatabaseModels { [Table("favorite_user_softkey")] public class FavoriteUserSoftkeyModel diff --git a/Step.Model/DatabaseModels/FunctionAccessModel.cs b/Step.Model/DatabaseModels/FunctionAccessModel.cs index 2ef0c32f..a6b1fff0 100644 --- a/Step.Model/DatabaseModels/FunctionAccessModel.cs +++ b/Step.Model/DatabaseModels/FunctionAccessModel.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -namespace Step.Model.DatabaseModels +namespace Termo.Active.Model.DatabaseModels { [Table("function_access")] public class FunctionAccessModel diff --git a/Step.Model/DatabaseModels/MachineModel.cs b/Step.Model/DatabaseModels/MachineModel.cs index 1a64d9a4..cefcdbea 100644 --- a/Step.Model/DatabaseModels/MachineModel.cs +++ b/Step.Model/DatabaseModels/MachineModel.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -namespace Step.Model.DatabaseModels +namespace Termo.Active.Model.DatabaseModels { [Table("machine")] public class MachineModel diff --git a/Step.Model/DatabaseModels/MachineUserModel.cs b/Step.Model/DatabaseModels/MachineUserModel.cs index 218f3cd4..f1d5510e 100644 --- a/Step.Model/DatabaseModels/MachineUserModel.cs +++ b/Step.Model/DatabaseModels/MachineUserModel.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -namespace Step.Model.DatabaseModels +namespace Termo.Active.Model.DatabaseModels { [Table("machine_user")] public class MachineUserModel diff --git a/Step.Model/DatabaseModels/MaintenanceFileModel.cs b/Step.Model/DatabaseModels/MaintenanceFileModel.cs index 595fd663..475abb72 100644 --- a/Step.Model/DatabaseModels/MaintenanceFileModel.cs +++ b/Step.Model/DatabaseModels/MaintenanceFileModel.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Step.Model.DatabaseModels +namespace Termo.Active.Model.DatabaseModels { [Table("maintenance_file")] public class MaintenanceFileModel diff --git a/Step.Model/DatabaseModels/MaintenanceModel.cs b/Step.Model/DatabaseModels/MaintenanceModel.cs index 7d068800..598db722 100644 --- a/Step.Model/DatabaseModels/MaintenanceModel.cs +++ b/Step.Model/DatabaseModels/MaintenanceModel.cs @@ -2,9 +2,9 @@ using System.ComponentModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -using static Step.Model.Constants; +using static Termo.Active.Model.Constants; -namespace Step.Model.DatabaseModels +namespace Termo.Active.Model.DatabaseModels { [Table("maintenance")] public class MaintenanceModel diff --git a/Step.Model/DatabaseModels/MaintenanceNoteModel.cs b/Step.Model/DatabaseModels/MaintenanceNoteModel.cs index 969c4b47..21cd0841 100644 --- a/Step.Model/DatabaseModels/MaintenanceNoteModel.cs +++ b/Step.Model/DatabaseModels/MaintenanceNoteModel.cs @@ -1,4 +1,4 @@ -using Step.Model.DatabaseModels; +using Termo.Active.Model.DatabaseModels; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; @@ -7,7 +7,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Step.Model.DatabaseModels +namespace Termo.Active.Model.DatabaseModels { [Table("maintenance_note")] public class MaintenanceNoteModel diff --git a/Step.Model/DatabaseModels/NcFamilyModel.cs b/Step.Model/DatabaseModels/NcFamilyModel.cs index 13a95049..ae54d9dc 100644 --- a/Step.Model/DatabaseModels/NcFamilyModel.cs +++ b/Step.Model/DatabaseModels/NcFamilyModel.cs @@ -5,7 +5,7 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Runtime.Serialization; -namespace Step.Model.DatabaseModels +namespace Termo.Active.Model.DatabaseModels { [Table("family")] public class DbNcFamilyModel diff --git a/Step.Model/DatabaseModels/NcMagazinePositionModel.cs b/Step.Model/DatabaseModels/NcMagazinePositionModel.cs index d5e77bc4..dd6834dc 100644 --- a/Step.Model/DatabaseModels/NcMagazinePositionModel.cs +++ b/Step.Model/DatabaseModels/NcMagazinePositionModel.cs @@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using CMS_CORE_Library.Models; -namespace Step.Model.DatabaseModels +namespace Termo.Active.Model.DatabaseModels { [Table("magazine_position")] public class DbNcMagazinePositionModel diff --git a/Step.Model/DatabaseModels/NcOffsetModel.cs b/Step.Model/DatabaseModels/NcOffsetModel.cs index a88c8b2d..759db478 100644 --- a/Step.Model/DatabaseModels/NcOffsetModel.cs +++ b/Step.Model/DatabaseModels/NcOffsetModel.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -namespace Step.Model.DatabaseModels +namespace Termo.Active.Model.DatabaseModels { [Table("offset")] public class NcOffsetModel diff --git a/Step.Model/DatabaseModels/NcShankModel.cs b/Step.Model/DatabaseModels/NcShankModel.cs index d962a311..aecaf02d 100644 --- a/Step.Model/DatabaseModels/NcShankModel.cs +++ b/Step.Model/DatabaseModels/NcShankModel.cs @@ -6,7 +6,7 @@ using System.Runtime.Serialization; using CMS_CORE_Library.Models; using Newtonsoft.Json; -namespace Step.Model.DatabaseModels +namespace Termo.Active.Model.DatabaseModels { [Table("shank")] public class DbNcShankModel diff --git a/Step.Model/DatabaseModels/NcToolModel.cs b/Step.Model/DatabaseModels/NcToolModel.cs index 45034f91..5114814d 100644 --- a/Step.Model/DatabaseModels/NcToolModel.cs +++ b/Step.Model/DatabaseModels/NcToolModel.cs @@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Runtime.Serialization; -namespace Step.Model.DatabaseModels +namespace Termo.Active.Model.DatabaseModels { [Table("tool")] public class DbNcToolModel diff --git a/Step.Model/DatabaseModels/PerformedMaintenanceModel.cs b/Step.Model/DatabaseModels/PerformedMaintenanceModel.cs index 4a2eeada..0105d8d9 100644 --- a/Step.Model/DatabaseModels/PerformedMaintenanceModel.cs +++ b/Step.Model/DatabaseModels/PerformedMaintenanceModel.cs @@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -namespace Step.Model.DatabaseModels +namespace Termo.Active.Model.DatabaseModels { [Table("performed_maintenance")] public class PerformedMaintenanceModel diff --git a/Step.Model/DatabaseModels/QueueItemsModel.cs b/Step.Model/DatabaseModels/QueueItemsModel.cs index 62b7a529..3ba03743 100644 --- a/Step.Model/DatabaseModels/QueueItemsModel.cs +++ b/Step.Model/DatabaseModels/QueueItemsModel.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Step.Model.DatabaseModels +namespace Termo.Active.Model.DatabaseModels { [Table("queue")] public class QueueItemsModel diff --git a/Step.Model/DatabaseModels/RoleModel.cs b/Step.Model/DatabaseModels/RoleModel.cs index 7eb1e43a..e0a959a6 100644 --- a/Step.Model/DatabaseModels/RoleModel.cs +++ b/Step.Model/DatabaseModels/RoleModel.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -namespace Step.Model.DatabaseModels +namespace Termo.Active.Model.DatabaseModels { [Table("role")] public class RoleModel diff --git a/Step.Model/DatabaseModels/SessionModel.cs b/Step.Model/DatabaseModels/SessionModel.cs index c3da0749..3d59c9c1 100644 --- a/Step.Model/DatabaseModels/SessionModel.cs +++ b/Step.Model/DatabaseModels/SessionModel.cs @@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -namespace Step.Model.DatabaseModels +namespace Termo.Active.Model.DatabaseModels { [Table("session")] public class SessionModel diff --git a/Step.Model/DatabaseModels/UserModel.cs b/Step.Model/DatabaseModels/UserModel.cs index eb18308d..b3c03be7 100644 --- a/Step.Model/DatabaseModels/UserModel.cs +++ b/Step.Model/DatabaseModels/UserModel.cs @@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations.Schema; using System.Globalization; -namespace Step.Model.DatabaseModels +namespace Termo.Active.Model.DatabaseModels { [Table("user")] public class UserModel diff --git a/Step.Model/Step.Model.csproj b/Step.Model/Termo.Active.Model.csproj similarity index 97% rename from Step.Model/Step.Model.csproj rename to Step.Model/Termo.Active.Model.csproj index 6114d62a..7c3e09af 100644 --- a/Step.Model/Step.Model.csproj +++ b/Step.Model/Termo.Active.Model.csproj @@ -1,181 +1,181 @@ - - - - - Debug - AnyCPU - {631375DD-06D3-49BB-8130-D9DDB34C429D} - Library - Properties - Step.Model - Step.Model - v4.6.2 - 512 - Latest - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\Libs\CMS_CORE_Library.dll - - - ..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll - - - ..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll - - - ..\packages\Microsoft.AspNet.Identity.Core.2.2.1\lib\net45\Microsoft.AspNet.Identity.Core.dll - - - ..\packages\Microsoft.AspNet.Identity.EntityFramework.2.2.1\lib\net45\Microsoft.AspNet.Identity.EntityFramework.dll - - - ..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DtsGenerator - RoleModel.cs.d.ts - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DtsGenerator - DTOLanguageModel.cs.d.ts - - - - - - - - - - - - - - - - - - - - - - - - - - - - DtsGenerator - UserModel.cs.d.ts - - - - - - True - True - DTOLanguageModel.cs - - - - - - - - - - - + + + + + Debug + AnyCPU + {631375DD-06D3-49BB-8130-D9DDB34C429D} + Library + Properties + Termo.Active.Model + Termo.Active.Model + v4.6.2 + 512 + Latest + true + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + false + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\Libs\CMS_CORE_Library.dll + + + ..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll + + + ..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll + + + ..\packages\Microsoft.AspNet.Identity.Core.2.2.1\lib\net45\Microsoft.AspNet.Identity.Core.dll + + + ..\packages\Microsoft.AspNet.Identity.EntityFramework.2.2.1\lib\net45\Microsoft.AspNet.Identity.EntityFramework.dll + + + ..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + DtsGenerator + RoleModel.cs.d.ts + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + DtsGenerator + DTOLanguageModel.cs.d.ts + + + + + + + + + + + + + + + + + + + + + + + + + + + + DtsGenerator + UserModel.cs.d.ts + + + + + + True + True + DTOLanguageModel.cs + + + + + + + + + + + \ No newline at end of file diff --git a/Step.Model/Step.Model.csproj.user b/Step.Model/Termo.Active.Model.csproj.user similarity index 100% rename from Step.Model/Step.Model.csproj.user rename to Step.Model/Termo.Active.Model.csproj.user diff --git a/Step.NC/NcAdapter.cs b/Step.NC/NcAdapter.cs index 7d92846c..11ebe836 100644 --- a/Step.NC/NcAdapter.cs +++ b/Step.NC/NcAdapter.cs @@ -4,13 +4,13 @@ using CMS_CORE_Library.Fanuc; using CMS_CORE_Library.Models; using CMS_CORE_Library.Osai; using CMS_CORE_Library.Siemens; -using Step.Database.Controllers; -using Step.Model.DatabaseModels; -using Step.Model.DTOModels; -using Step.Model.DTOModels.AlarmModels; -using Step.Model.DTOModels.MaintenanceModels; -using Step.Model.DTOModels.Scada; -using Step.Utils; +using Termo.Active.Database.Controllers; +using Termo.Active.Model.DatabaseModels; +using Termo.Active.Model.DTOModels; +using Termo.Active.Model.DTOModels.AlarmModels; +using Termo.Active.Model.DTOModels.MaintenanceModels; +using Termo.Active.Model.DTOModels.Scada; +using Termo.Active.Utils; using System; using System.Collections.Generic; using System.Globalization; @@ -19,10 +19,10 @@ using System.Linq; using System.Reflection; using System.Text.RegularExpressions; using static CMS_CORE_Library.Models.DataStructures; -using static Step.Config.ServerConfig; -using static Step.Model.Constants; +using static Termo.Active.Config.ServerConfig; +using static Termo.Active.Model.Constants; -namespace Step.NC +namespace Termo.Active.NC { public class NcAdapter : IDisposable { diff --git a/Step.NC/NcFileAdapter.cs b/Step.NC/NcFileAdapter.cs index 9dfa7858..40339b9b 100644 --- a/Step.NC/NcFileAdapter.cs +++ b/Step.NC/NcFileAdapter.cs @@ -6,16 +6,16 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using static CMS_CORE_Library.Models.DataStructures; -using static Step.Model.Constants; -using static Step.Config.ServerConfig; -using Step.Model.DTOModels; -using Step.Model.DTOModels.JobModels; -using Step.Utils; -using Step.Database.Controllers; -using static Step.Database.Controllers.QueueController; +using static Termo.Active.Model.Constants; +using static Termo.Active.Config.ServerConfig; +using Termo.Active.Model.DTOModels; +using Termo.Active.Model.DTOModels.JobModels; +using Termo.Active.Utils; +using Termo.Active.Database.Controllers; +using static Termo.Active.Database.Controllers.QueueController; using System.Text.RegularExpressions; -namespace Step.NC +namespace Termo.Active.NC { public class NcFileAdapter : NcAdapter { diff --git a/Step.NC/NcToolTableAdapter.cs b/Step.NC/NcToolTableAdapter.cs index 42028d66..7667c5b3 100644 --- a/Step.NC/NcToolTableAdapter.cs +++ b/Step.NC/NcToolTableAdapter.cs @@ -1,16 +1,16 @@ using CMS_CORE_Library.Models; -using Step.Database.Controllers; -using Step.Model.DatabaseModels; -using Step.Model.DTOModels.ToolModels; -using Step.Utils; +using Termo.Active.Database.Controllers; +using Termo.Active.Model.DatabaseModels; +using Termo.Active.Model.DTOModels.ToolModels; +using Termo.Active.Utils; using System.Collections.Generic; using System.Data.Entity; using System.Linq; using static CMS_CORE_Library.Models.DataStructures; -using static Step.Config.ServerConfig; -using static Step.Model.Constants; +using static Termo.Active.Config.ServerConfig; +using static Termo.Active.Model.Constants; -namespace Step.NC +namespace Termo.Active.NC { public class NcToolTableAdapter : NcAdapter { diff --git a/Step.NC/SiemensToolTableAdapter.cs b/Step.NC/SiemensToolTableAdapter.cs index 8180cda8..a068fbb3 100644 --- a/Step.NC/SiemensToolTableAdapter.cs +++ b/Step.NC/SiemensToolTableAdapter.cs @@ -1,11 +1,11 @@ using CMS_CORE_Library.Models; -using Step.Model.DTOModels.ToolModels; +using Termo.Active.Model.DTOModels.ToolModels; using System.Collections.Generic; using System.Linq; -using static Step.Config.ServerConfig; -using static Step.Model.Constants; +using static Termo.Active.Config.ServerConfig; +using static Termo.Active.Model.Constants; -namespace Step.NC +namespace Termo.Active.NC { public class SiemensToolTableAdapter : NcAdapter { diff --git a/Step.NC/Step.NC.csproj b/Step.NC/Termo.Active.NC.csproj similarity index 89% rename from Step.NC/Step.NC.csproj rename to Step.NC/Termo.Active.NC.csproj index 0fdab46d..4e74e941 100644 --- a/Step.NC/Step.NC.csproj +++ b/Step.NC/Termo.Active.NC.csproj @@ -7,8 +7,8 @@ {B2366B08-96BD-4F6B-B748-B45089B87A14} Library Properties - Step.NC - Step.NC + Termo.Active.NC + Termo.Active.NC v4.6.2 512 @@ -72,21 +72,21 @@ - + {3f5c2483-fc87-43ef-92a8-66ff7d0e440f} - Step.Config + Termo.Active.Config - + {357D5EE1-FFC8-489B-9232-22CF474D9A6F} - Step.Database + Termo.Active.Database - + {631375DD-06D3-49BB-8130-D9DDB34C429D} - Step.Model + Termo.Active.Model - + {CBEB631B-ABFA-4042-9779-C0060B0DFEFE} - Step.Utils + Termo.Active.Utils diff --git a/Step.UI/Dialogs/LockForm.Designer.cs b/Step.UI/Dialogs/LockForm.Designer.cs index ab4954c3..d2ed651a 100644 --- a/Step.UI/Dialogs/LockForm.Designer.cs +++ b/Step.UI/Dialogs/LockForm.Designer.cs @@ -1,4 +1,4 @@ -namespace Step.UI +namespace Termo.Active.UI { partial class LockForm { diff --git a/Step.UI/Dialogs/LockForm.cs b/Step.UI/Dialogs/LockForm.cs index 0e71b18e..d2841038 100644 --- a/Step.UI/Dialogs/LockForm.cs +++ b/Step.UI/Dialogs/LockForm.cs @@ -1,4 +1,4 @@ -using Step.NC; +using Termo.Active.NC; using System; using System.Collections.Generic; using System.ComponentModel; @@ -9,7 +9,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace Step.UI +namespace Termo.Active.UI { public partial class LockForm : Form { diff --git a/Step.UI/Dialogs/PasswordForm.Designer.cs b/Step.UI/Dialogs/PasswordForm.Designer.cs index b29c5b1c..e064ef3b 100644 --- a/Step.UI/Dialogs/PasswordForm.Designer.cs +++ b/Step.UI/Dialogs/PasswordForm.Designer.cs @@ -1,4 +1,4 @@ -namespace Step.UI +namespace Termo.Active.UI { partial class PasswordForm { diff --git a/Step.UI/Dialogs/PasswordForm.cs b/Step.UI/Dialogs/PasswordForm.cs index 39ef34a4..f9ffe6f8 100644 --- a/Step.UI/Dialogs/PasswordForm.cs +++ b/Step.UI/Dialogs/PasswordForm.cs @@ -1,4 +1,4 @@ -using Step.NC; +using Termo.Active.NC; using System; using System.Collections.Generic; using System.ComponentModel; @@ -9,7 +9,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace Step.UI +namespace Termo.Active.UI { public partial class PasswordForm : Form { diff --git a/Step.UI/Dialogs/ResetCountersForm.Designer.cs b/Step.UI/Dialogs/ResetCountersForm.Designer.cs index 5e268bd2..c43ae83f 100644 --- a/Step.UI/Dialogs/ResetCountersForm.Designer.cs +++ b/Step.UI/Dialogs/ResetCountersForm.Designer.cs @@ -1,4 +1,4 @@ -namespace Step.UI +namespace Termo.Active.UI { partial class ResetCountersForm { diff --git a/Step.UI/Dialogs/ResetCountersForm.cs b/Step.UI/Dialogs/ResetCountersForm.cs index 25edda14..aaa82506 100644 --- a/Step.UI/Dialogs/ResetCountersForm.cs +++ b/Step.UI/Dialogs/ResetCountersForm.cs @@ -1,6 +1,6 @@ using CMS_CORE_Library.Models; -using Step.NC; -using Step.Utils; +using Termo.Active.NC; +using Termo.Active.Utils; using System; using System.Collections.Generic; using System.ComponentModel; @@ -12,7 +12,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using static CMS_CORE_Library.Models.DataStructures; -namespace Step.UI +namespace Termo.Active.UI { public partial class ResetCountersForm : Form { diff --git a/Step.UI/Dialogs/ResetMachineHoursForm.Designer.cs b/Step.UI/Dialogs/ResetMachineHoursForm.Designer.cs index a817971c..ebd53750 100644 --- a/Step.UI/Dialogs/ResetMachineHoursForm.Designer.cs +++ b/Step.UI/Dialogs/ResetMachineHoursForm.Designer.cs @@ -1,4 +1,4 @@ -namespace Step.UI +namespace Termo.Active.UI { partial class ResetMachineHoursForm { diff --git a/Step.UI/Dialogs/ResetMachineHoursForm.cs b/Step.UI/Dialogs/ResetMachineHoursForm.cs index db756227..de28b7ae 100644 --- a/Step.UI/Dialogs/ResetMachineHoursForm.cs +++ b/Step.UI/Dialogs/ResetMachineHoursForm.cs @@ -1,5 +1,5 @@ -using Step.NC; -using Step.Utils; +using Termo.Active.NC; +using Termo.Active.Utils; using System; using System.Collections.Generic; using System.ComponentModel; @@ -10,7 +10,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace Step.UI +namespace Termo.Active.UI { public partial class ResetMachineHoursForm : Form { diff --git a/Step.UI/Dialogs/ResetSpindleForm.Designer.cs b/Step.UI/Dialogs/ResetSpindleForm.Designer.cs index 7d21130f..3d8b7041 100644 --- a/Step.UI/Dialogs/ResetSpindleForm.Designer.cs +++ b/Step.UI/Dialogs/ResetSpindleForm.Designer.cs @@ -1,4 +1,4 @@ -namespace Step.UI +namespace Termo.Active.UI { partial class ResetSpindleForm { diff --git a/Step.UI/Dialogs/ResetSpindleForm.cs b/Step.UI/Dialogs/ResetSpindleForm.cs index 840d6222..f6d12bee 100644 --- a/Step.UI/Dialogs/ResetSpindleForm.cs +++ b/Step.UI/Dialogs/ResetSpindleForm.cs @@ -1,5 +1,5 @@ -using Step.NC; -using Step.Utils; +using Termo.Active.NC; +using Termo.Active.Utils; using System; using System.Collections.Generic; using System.ComponentModel; @@ -10,7 +10,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace Step.UI +namespace Termo.Active.UI { public partial class ResetSpindleForm : Form { diff --git a/Step.UI/Properties/Resources.Designer.cs b/Step.UI/Properties/Resources.Designer.cs index 0d3b7b4c..93426371 100644 --- a/Step.UI/Properties/Resources.Designer.cs +++ b/Step.UI/Properties/Resources.Designer.cs @@ -1,25 +1,25 @@ //------------------------------------------------------------------------------ // -// Il codice è stato generato da uno strumento. -// Versione runtime:4.0.30319.42000 +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 // -// Le modifiche apportate a questo file possono provocare un comportamento non corretto e andranno perse se -// il codice viene rigenerato. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. // //------------------------------------------------------------------------------ -namespace Step.UI.Properties { +namespace Termo.Active.UI.Properties { using System; /// - /// Classe di risorse fortemente tipizzata per la ricerca di stringhe localizzate e così via. + /// A strongly-typed resource class, for looking up localized strings, etc. /// - // Questa classe è stata generata automaticamente dalla classe StronglyTypedResourceBuilder. - // tramite uno strumento quale ResGen o Visual Studio. - // Per aggiungere o rimuovere un membro, modificare il file con estensione ResX ed eseguire nuovamente ResGen - // con l'opzione /str oppure ricompilare il progetto VS. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] + // This class was auto-generated by the StronglyTypedResourceBuilder + // 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", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -33,13 +33,13 @@ namespace Step.UI.Properties { } /// - /// Restituisce l'istanza di ResourceManager nella cache utilizzata da questa classe. + /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Step.UI.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Termo.Active.UI.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; @@ -47,8 +47,8 @@ namespace Step.UI.Properties { } /// - /// Esegue l'override della proprietà CurrentUICulture del thread corrente per tutte le - /// ricerche di risorse eseguite utilizzando questa classe di risorse fortemente tipizzata. + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { @@ -61,7 +61,7 @@ namespace Step.UI.Properties { } /// - /// Cerca una risorsa localizzata di tipo System.Drawing.Icon simile a (Icona). + /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// internal static System.Drawing.Icon ACTIVE_ICONA { get { @@ -71,7 +71,7 @@ namespace Step.UI.Properties { } /// - /// Cerca una risorsa localizzata di tipo System.Drawing.Icon simile a (Icona). + /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// internal static System.Drawing.Icon ACTIVE_ICONA_BW { get { @@ -81,7 +81,7 @@ namespace Step.UI.Properties { } /// - /// Cerca una risorsa localizzata di tipo System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap ACTIVE_ICONA_BW1 { get { @@ -91,7 +91,7 @@ namespace Step.UI.Properties { } /// - /// Cerca una risorsa localizzata di tipo System.Drawing.Icon simile a (Icona). + /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// internal static System.Drawing.Icon ACTIVE_ICONA_RED { get { @@ -101,7 +101,7 @@ namespace Step.UI.Properties { } /// - /// Cerca una risorsa localizzata di tipo System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap ACTIVE_ICONA_RED1 { get { @@ -111,7 +111,7 @@ namespace Step.UI.Properties { } /// - /// Cerca una risorsa localizzata di tipo System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap ACTIVE_ICONA1 { get { @@ -121,7 +121,7 @@ namespace Step.UI.Properties { } /// - /// Cerca una risorsa localizzata di tipo System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Apps_Lock_icon { get { @@ -131,7 +131,7 @@ namespace Step.UI.Properties { } /// - /// Cerca una risorsa localizzata di tipo System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Apps_Unlock_icon { get { @@ -141,7 +141,7 @@ namespace Step.UI.Properties { } /// - /// Cerca una risorsa localizzata di tipo System.Drawing.Icon simile a (Icona). + /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// internal static System.Drawing.Icon CMS_Disconnected { get { @@ -151,7 +151,7 @@ namespace Step.UI.Properties { } /// - /// Cerca una risorsa localizzata di tipo System.Drawing.Icon simile a (Icona). + /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// internal static System.Drawing.Icon CMS_Error { get { @@ -161,7 +161,7 @@ namespace Step.UI.Properties { } /// - /// Cerca una risorsa localizzata di tipo System.Drawing.Icon simile a (Icona). + /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// internal static System.Drawing.Icon CMS_Icon { get { @@ -171,7 +171,7 @@ namespace Step.UI.Properties { } /// - /// Cerca una risorsa localizzata di tipo System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap LockClose { get { @@ -181,7 +181,7 @@ namespace Step.UI.Properties { } /// - /// Cerca una risorsa localizzata di tipo System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap LockOpen { get { diff --git a/Step.UI/ServerControlWindow.Designer.cs b/Step.UI/ServerControlWindow.Designer.cs index c863834c..72847b3a 100644 --- a/Step.UI/ServerControlWindow.Designer.cs +++ b/Step.UI/ServerControlWindow.Designer.cs @@ -1,6 +1,6 @@ using System.Windows.Forms; -namespace Step.UI +namespace Termo.Active.UI { partial class ServerControlWindow { diff --git a/Step.UI/ServerControlWindow.cs b/Step.UI/ServerControlWindow.cs index 03082674..0ac36ffb 100644 --- a/Step.UI/ServerControlWindow.cs +++ b/Step.UI/ServerControlWindow.cs @@ -1,8 +1,8 @@ -using Step.Core; -using Step.Model; -using Step.Model.DTOModels; -using Step.NC; -using Step.Utils; +using Termo.Active.Core; +using Termo.Active.Model; +using Termo.Active.Model.DTOModels; +using Termo.Active.NC; +using Termo.Active.Utils; using System; using System.Collections.Generic; using System.ComponentModel; @@ -14,10 +14,10 @@ using System.Runtime.InteropServices; using System.Threading; using System.Windows.Forms; using TeamDev.SDK.MVVM; -using static Step.Config.ServerConfig; -using static Step.Model.Constants; +using static Termo.Active.Config.ServerConfig; +using static Termo.Active.Model.Constants; -namespace Step.UI +namespace Termo.Active.UI { public partial class ServerControlWindow : Form { diff --git a/Step.UI/Step.UI.csproj b/Step.UI/Termo.Active.UI.csproj similarity index 90% rename from Step.UI/Step.UI.csproj rename to Step.UI/Termo.Active.UI.csproj index 8402717a..113ebbe9 100644 --- a/Step.UI/Step.UI.csproj +++ b/Step.UI/Termo.Active.UI.csproj @@ -1,203 +1,203 @@ - - - - - Debug - AnyCPU - {20FC0937-E7CA-4693-95F9-7A948EFD173B} - Library - Properties - Step.UI - Step.UI - v4.6.2 - 512 - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - Resources\CMS_Icon.ico - - - - False - ..\Libs\CMS_CORE_Library.dll - - - - - - - - - - - - - False - ..\Libs\TeamDev.SDK.6.dll - - - False - ..\Libs\TeamDev.SDK.WPF.dll - - - - - Form - - - LockForm.cs - - - Form - - - ResetMachineHoursForm.cs - - - Form - - - ResetCountersForm.cs - - - Form - - - ResetSpindleForm.cs - - - Form - - - PasswordForm.cs - - - True - True - Resources.resx - - - Form - - - ServerControlWindow.cs - - - - UserControl - - - OpeningLayer.cs - - - - - - - - - LockForm.cs - - - ResetMachineHoursForm.cs - - - ResetCountersForm.cs - - - ResetSpindleForm.cs - - - PasswordForm.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - - - ServerControlWindow.cs - - - OpeningLayer.cs - - - - - {3f5c2483-fc87-43ef-92a8-66ff7d0e440f} - Step.Config - - - {de54ff4c-8390-4489-882a-1bc7d99ef185} - Step.Core - - - {631375DD-06D3-49BB-8130-D9DDB34C429D} - Step.Model - - - {b2366b08-96bd-4f6b-b748-b45089b87a14} - Step.NC - - - {cbeb631b-abfa-4042-9779-c0060b0dfefe} - Step.Utils - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug + AnyCPU + {20FC0937-E7CA-4693-95F9-7A948EFD173B} + Library + Properties + Termo.Active.UI + Termo.Active.UI + v4.6.2 + 512 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + false + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + Resources\CMS_Icon.ico + + + + False + ..\Libs\CMS_CORE_Library.dll + + + + + + + + + + + + + False + ..\Libs\TeamDev.SDK.6.dll + + + False + ..\Libs\TeamDev.SDK.WPF.dll + + + + + Form + + + LockForm.cs + + + Form + + + ResetMachineHoursForm.cs + + + Form + + + ResetCountersForm.cs + + + Form + + + ResetSpindleForm.cs + + + Form + + + PasswordForm.cs + + + True + True + Resources.resx + + + Form + + + ServerControlWindow.cs + + + + UserControl + + + OpeningLayer.cs + + + + + + + + + LockForm.cs + + + ResetMachineHoursForm.cs + + + ResetCountersForm.cs + + + ResetSpindleForm.cs + + + PasswordForm.cs + + + ResXFileCodeGenerator + Resources.Designer.cs + + + ServerControlWindow.cs + + + OpeningLayer.cs + + + + + {3f5c2483-fc87-43ef-92a8-66ff7d0e440f} + Termo.Active.Config + + + {de54ff4c-8390-4489-882a-1bc7d99ef185} + Termo.Active.Core + + + {631375DD-06D3-49BB-8130-D9DDB34C429D} + Termo.Active.Model + + + {b2366b08-96bd-4f6b-b748-b45089b87a14} + Termo.Active.NC + + + {cbeb631b-abfa-4042-9779-c0060b0dfefe} + Termo.Active.Utils + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Step.UI/Views/OpeningLayer.Designer.cs b/Step.UI/Views/OpeningLayer.Designer.cs index 02edc0b3..f1356571 100644 --- a/Step.UI/Views/OpeningLayer.Designer.cs +++ b/Step.UI/Views/OpeningLayer.Designer.cs @@ -1,4 +1,4 @@ -namespace Step.UI.Views +namespace Termo.Active.UI.Views { partial class OpeningLayer { diff --git a/Step.UI/Views/OpeningLayer.cs b/Step.UI/Views/OpeningLayer.cs index 25b6d333..5f3a9bec 100644 --- a/Step.UI/Views/OpeningLayer.cs +++ b/Step.UI/Views/OpeningLayer.cs @@ -2,7 +2,7 @@ using System.Windows.Forms; using System.Threading; -namespace Step.UI.Views +namespace Termo.Active.UI.Views { public partial class OpeningLayer : UserControl { diff --git a/Step.Utils/CandiesController.cs b/Step.Utils/CandiesController.cs index 20a33d08..46dba89f 100644 --- a/Step.Utils/CandiesController.cs +++ b/Step.Utils/CandiesController.cs @@ -1,5 +1,5 @@ using Microsoft.Win32; -using Step.Model; +using Termo.Active.Model; using System; using System.Collections.Generic; using System.IO; @@ -7,7 +7,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Step.Utils +namespace Termo.Active.Utils { public static class CandiesController { diff --git a/Step.Utils/ExceptionManager.cs b/Step.Utils/ExceptionManager.cs index 78695d7d..3ac15063 100644 --- a/Step.Utils/ExceptionManager.cs +++ b/Step.Utils/ExceptionManager.cs @@ -3,12 +3,12 @@ using System.Diagnostics; using System.Linq; using System.Reflection; using System.Windows.Forms; -using Step.Model; +using Termo.Active.Model; using TeamDev.SDK.MVVM; -using static Step.Model.Constants; -using static Step.Utils.StepLogger; +using static Termo.Active.Model.Constants; +using static Termo.Active.Utils.StepLogger; -namespace Step.Utils +namespace Termo.Active.Utils { public static class ExceptionManager { diff --git a/Step.Utils/LanguageController.cs b/Step.Utils/LanguageController.cs index 56b07cb3..5975c083 100644 --- a/Step.Utils/LanguageController.cs +++ b/Step.Utils/LanguageController.cs @@ -1,13 +1,13 @@ -using Step.Model.DTOModels; +using Termo.Active.Model.DTOModels; using System.Collections.Generic; using System.Globalization; using System.IO; using System.Linq; using System.Xml.Linq; using System.Xml.Schema; -using static Step.Model.Constants; +using static Termo.Active.Model.Constants; -namespace Step.Utils +namespace Termo.Active.Utils { public static class LanguageController { diff --git a/Step.Utils/StepLogger.cs b/Step.Utils/StepLogger.cs index 9efdb7db..8015627e 100644 --- a/Step.Utils/StepLogger.cs +++ b/Step.Utils/StepLogger.cs @@ -1,8 +1,8 @@ using NLog; using System; -using static Step.Model.Constants; +using static Termo.Active.Model.Constants; -namespace Step.Utils +namespace Termo.Active.Utils { public static class StepLogger { diff --git a/Step.Utils/Step.Utils.csproj b/Step.Utils/Termo.Active.Utils.csproj similarity index 95% rename from Step.Utils/Step.Utils.csproj rename to Step.Utils/Termo.Active.Utils.csproj index 56192d5a..4ba7ddc4 100644 --- a/Step.Utils/Step.Utils.csproj +++ b/Step.Utils/Termo.Active.Utils.csproj @@ -1,155 +1,155 @@ - - - - - Debug - AnyCPU - {CBEB631B-ABFA-4042-9779-C0060B0DFEFE} - Library - Properties - Step.Utils - Step.Utils - v4.6.2 - 512 - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - False - ..\Libs\CMS_CORE_Library.dll - - - ..\packages\MySql.Data.6.10.4\lib\net452\MySql.Data.dll - - - ..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll - - - ..\packages\NLog.4.5.11\lib\net45\NLog.dll - - - - - - - - - - - - - - - - - - - ..\Libs\TeamDev.SDK.6.dll - - - ..\Libs\TeamDev.SDK.WPF.dll - - - - - - - - - - - - - - - - - - - - - - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - Always - - - - - - Designer - Always - - - Designer - - - - - - {631375DD-06D3-49BB-8130-D9DDB34C429D} - Step.Model - - - + + + + + Debug + AnyCPU + {CBEB631B-ABFA-4042-9779-C0060B0DFEFE} + Library + Properties + Termo.Active.Utils + Termo.Active.Utils + v4.6.2 + 512 + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + false + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + False + ..\Libs\CMS_CORE_Library.dll + + + ..\packages\MySql.Data.6.10.4\lib\net452\MySql.Data.dll + + + ..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll + + + ..\packages\NLog.4.5.11\lib\net45\NLog.dll + + + + + + + + + + + + + + + + + + + ..\Libs\TeamDev.SDK.6.dll + + + ..\Libs\TeamDev.SDK.WPF.dll + + + + + + + + + + + + + + + + + + + + + + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + Always + + + + + + Designer + Always + + + Designer + + + + + + {631375DD-06D3-49BB-8130-D9DDB34C429D} + Termo.Active.Model + + + \ No newline at end of file diff --git a/Step.Utils/supportFunctions.cs b/Step.Utils/supportFunctions.cs index 36c1b50d..7ae9474f 100644 --- a/Step.Utils/supportFunctions.cs +++ b/Step.Utils/supportFunctions.cs @@ -1,5 +1,5 @@ using Newtonsoft.Json; -using Step.Model.DTOModels.JobModels; +using Termo.Active.Model.DTOModels.JobModels; using System; using System.Collections.Generic; using System.Drawing; @@ -12,9 +12,9 @@ using System.Security.Cryptography; using System.Text; using System.Text.RegularExpressions; using static CMS_CORE_Library.Models.DataStructures; -using static Step.Model.Constants; +using static Termo.Active.Model.Constants; -namespace Step.Utils +namespace Termo.Active.Utils { public static class SupportFunctions { diff --git a/Step.sln b/Step.sln index f4646718..472f86ab 100644 --- a/Step.sln +++ b/Step.sln @@ -1,43 +1,43 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26730.12 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29926.136 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Step", "Step\Step.csproj", "{AFED34E1-77DB-4D81-830A-A8D0A190573D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Termo.Active", "Step\Termo.Active.csproj", "{AFED34E1-77DB-4D81-830A-A8D0A190573D}" ProjectSection(ProjectDependencies) = postProject {3F5C2483-FC87-43EF-92A8-66FF7D0E440F} = {3F5C2483-FC87-43EF-92A8-66FF7D0E440F} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Step.Model", "Step.Model\Step.Model.csproj", "{631375DD-06D3-49BB-8130-D9DDB34C429D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Termo.Active.Model", "Step.Model\Termo.Active.Model.csproj", "{631375DD-06D3-49BB-8130-D9DDB34C429D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Step.UI", "Step.UI\Step.UI.csproj", "{20FC0937-E7CA-4693-95F9-7A948EFD173B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Termo.Active.UI", "Step.UI\Termo.Active.UI.csproj", "{20FC0937-E7CA-4693-95F9-7A948EFD173B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Step.Database", "Step.Database\Step.Database.csproj", "{357D5EE1-FFC8-489B-9232-22CF474D9A6F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Termo.Active.Database", "Step.Database\Termo.Active.Database.csproj", "{357D5EE1-FFC8-489B-9232-22CF474D9A6F}" ProjectSection(ProjectDependencies) = postProject {3F5C2483-FC87-43EF-92A8-66FF7D0E440F} = {3F5C2483-FC87-43EF-92A8-66FF7D0E440F} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Step.Config", "Step.Config\Step.Config.csproj", "{3F5C2483-FC87-43EF-92A8-66FF7D0E440F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Termo.Active.Config", "Step.Config\Termo.Active.Config.csproj", "{3F5C2483-FC87-43EF-92A8-66FF7D0E440F}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client", "Client\Client.csproj", "{66FA29DB-925A-402B-A4C7-D3D780FB1BC3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Step.Utils", "Step.Utils\Step.Utils.csproj", "{CBEB631B-ABFA-4042-9779-C0060B0DFEFE}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Termo.Active.Utils", "Step.Utils\Termo.Active.Utils.csproj", "{CBEB631B-ABFA-4042-9779-C0060B0DFEFE}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CMS.Client", "CMS.Client", "{2F873243-A483-40B6-A0F7-65FC3541A269}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CMS.Step", "CMS.Step", "{0769EE3C-4259-4C72-97B4-0CCAEBFA7724}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CMS.Termo.Active", "CMS.Termo.Active", "{0769EE3C-4259-4C72-97B4-0CCAEBFA7724}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client.Config", "Client.Config\Client.Config.csproj", "{205A6ADE-FB5A-45CB-9C51-9817E7BB8939}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client.Utils", "Client.Utils\Client.Utils.csproj", "{34434B22-D546-4A5C-B575-49720C77643A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Step.Core", "Step.Core\Step.Core.csproj", "{DE54FF4C-8390-4489-882A-1BC7D99EF185}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Termo.Active.Core", "Step.Core\Termo.Active.Core.csproj", "{DE54FF4C-8390-4489-882A-1BC7D99EF185}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Step.NC", "Step.NC\Step.NC.csproj", "{B2366B08-96BD-4F6B-B748-B45089B87A14}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Termo.Active.NC", "Step.NC\Termo.Active.NC.csproj", "{B2366B08-96BD-4F6B-B748-B45089B87A14}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client.Chromium", "Client.Chromium\Client.Chromium.csproj", "{F9F17F23-660E-488C-A7FA-6A5B35D64313}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Step.CmsConnectGateway", "Step.CmsConnectGateway\Step.CmsConnectGateway.csproj", "{49B04D99-0ECD-4900-86D3-7098D61314D7}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Termo.Active.CmsConnectGateway", "Step.CmsConnectGateway\Termo.Active.CmsConnectGateway.csproj", "{49B04D99-0ECD-4900-86D3-7098D61314D7}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Step/App_Start/SignalRContractResolver.cs b/Step/App_Start/SignalRContractResolver.cs index 15487066..9513f315 100644 --- a/Step/App_Start/SignalRContractResolver.cs +++ b/Step/App_Start/SignalRContractResolver.cs @@ -3,7 +3,7 @@ using System.Reflection; using Microsoft.AspNet.SignalR.Infrastructure; using Newtonsoft.Json.Serialization; -namespace Step.App_Start +namespace Termo.Active.App_Start { public class SignalRContractResolver : IContractResolver { diff --git a/Step/App_Start/Startup.cs b/Step/App_Start/Startup.cs index 185ae9f5..28cac832 100644 --- a/Step/App_Start/Startup.cs +++ b/Step/App_Start/Startup.cs @@ -6,21 +6,21 @@ using Microsoft.Owin.Security.OAuth; using Microsoft.Owin.StaticFiles; using Newtonsoft.Json; using Owin; -using Step.Core; -using Step.Provider; -using Step.Utils; +using Termo.Active.Core; +using Termo.Active.Provider; +using Termo.Active.Utils; using System; using System.Configuration; using System.IO; using System.Net; using System.Net.NetworkInformation; using System.Web.Http; -using static Step.Config.ServerConfig; -using static Step.Model.Constants; +using static Termo.Active.Config.ServerConfig; +using static Termo.Active.Model.Constants; [assembly: OwinStartup(typeof(Step.App_Start.Startup))] -namespace Step.App_Start +namespace Termo.Active.App_Start { public class Startup { diff --git a/Step/App_Start/SwaggerConfig.cs b/Step/App_Start/SwaggerConfig.cs index 9550f723..42efb448 100644 --- a/Step/App_Start/SwaggerConfig.cs +++ b/Step/App_Start/SwaggerConfig.cs @@ -1,12 +1,12 @@ using System.Web.Http; using WebActivatorEx; -using Step; +using Termo.Active; using Swashbuckle.Application; using Swashbuckle.Swagger; using System.Web.Http.Description; using System.Collections.Generic; -namespace Step +namespace Termo.Active { public class SwaggerConfig { diff --git a/Step/App_Start/WebApiConfig.cs b/Step/App_Start/WebApiConfig.cs index b2ea373e..442dac3a 100644 --- a/Step/App_Start/WebApiConfig.cs +++ b/Step/App_Start/WebApiConfig.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Web.Http; using System.Web.Http.ExceptionHandling; -namespace Step +namespace Termo.Active { public static class WebApiConfig { diff --git a/Step/Attributes/PositiveNumberAttribute.cs b/Step/Attributes/PositiveNumberAttribute.cs index d3653a5f..cc3f52fd 100644 --- a/Step/Attributes/PositiveNumberAttribute.cs +++ b/Step/Attributes/PositiveNumberAttribute.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Step.Attributes +namespace Termo.Active.Attributes { public class PositiveNumberAttribute : ValidationAttribute { diff --git a/Step/Attributes/SignalRAuthorizeAttribute.cs b/Step/Attributes/SignalRAuthorizeAttribute.cs index 8b78bde2..8aaac4ed 100644 --- a/Step/Attributes/SignalRAuthorizeAttribute.cs +++ b/Step/Attributes/SignalRAuthorizeAttribute.cs @@ -1,20 +1,20 @@ using Microsoft.AspNet.SignalR; using Microsoft.AspNet.SignalR.Hubs; using Microsoft.AspNet.SignalR.Owin; -using Step.App_Start; -using Step.Config; -using Step.Database.Controllers; -using Step.Model.DatabaseModels; +using Termo.Active.App_Start; +using Termo.Active.Config; +using Termo.Active.Database.Controllers; +using Termo.Active.Model.DatabaseModels; using System; using System.Collections.Generic; using System.Linq; using System.Security.Claims; using System.Security.Principal; -using static Step.Config.ServerConfig; -using static Step.Model.Constants; -using static Step.Listeners.SignalRStaticObjects; +using static Termo.Active.Config.ServerConfig; +using static Termo.Active.Model.Constants; +using static Termo.Active.Listeners.SignalRStaticObjects; -namespace Step.Attributes +namespace Termo.Active.Attributes { public class SignalRAuthorizeAttribute : AuthorizeAttribute { diff --git a/Step/Attributes/WebApiAuthorizeAttribute.cs b/Step/Attributes/WebApiAuthorizeAttribute.cs index 6410d5f9..e6e712a2 100644 --- a/Step/Attributes/WebApiAuthorizeAttribute.cs +++ b/Step/Attributes/WebApiAuthorizeAttribute.cs @@ -2,18 +2,18 @@ using System.Linq; using System.Web.Http; using System.Web.Http.Controllers; -using Step.Database.Controllers; -using Step.Config; -using Step.Model.DatabaseModels; -using static Step.Config.ServerConfig; -using static Step.Model.Constants; -using static Step.Listeners.SignalRStaticObjects; +using Termo.Active.Database.Controllers; +using Termo.Active.Config; +using Termo.Active.Model.DatabaseModels; +using static Termo.Active.Config.ServerConfig; +using static Termo.Active.Model.Constants; +using static Termo.Active.Listeners.SignalRStaticObjects; using Microsoft.Owin.Security.OAuth; using System.Security.Claims; using Microsoft.Owin.Security; -namespace Step +namespace Termo.Active { class WebApiAuthorizeAttribute : AuthorizeAttribute { diff --git a/Step/Controllers/SignalR/NcHub.cs b/Step/Controllers/SignalR/NcHub.cs index 4e122ec4..82ae65ad 100644 --- a/Step/Controllers/SignalR/NcHub.cs +++ b/Step/Controllers/SignalR/NcHub.cs @@ -1,16 +1,16 @@ using CMS_CORE_Library.Models; using Microsoft.AspNet.SignalR; -using Step.Attributes; -using Step.NC; +using Termo.Active.Attributes; +using Termo.Active.NC; using System.Collections.Generic; using System.Threading.Tasks; using TeamDev.SDK.MVVM; using static CMS_CORE_Library.Models.DataStructures; -using static Step.Config.ServerConfig; -using static Step.Model.Constants; -using static Step.Model.Constants.FUNCTIONALITY_NAMES; +using static Termo.Active.Config.ServerConfig; +using static Termo.Active.Model.Constants; +using static Termo.Active.Model.Constants.FUNCTIONALITY_NAMES; -namespace Step.Controllers.SignalR +namespace Termo.Active.Controllers.SignalR { // [SignalRAuthorize(FunctionAccess = "functionAccess", Action = ACTIONS.READ)] public class NcHub : Hub diff --git a/Step/Controllers/WebApi/ApiAlarmController.cs b/Step/Controllers/WebApi/ApiAlarmController.cs index 76dd89dc..0363befc 100644 --- a/Step/Controllers/WebApi/ApiAlarmController.cs +++ b/Step/Controllers/WebApi/ApiAlarmController.cs @@ -1,8 +1,8 @@ -using Step.Database.Controllers; -using Step.Model.DatabaseModels; -using Step.Model.DTOModels.AlarmModels; -using Step.NC; -using Step.Provider; +using Termo.Active.Database.Controllers; +using Termo.Active.Model.DatabaseModels; +using Termo.Active.Model.DTOModels.AlarmModels; +using Termo.Active.NC; +using Termo.Active.Provider; using System; using System.Collections.Generic; using System.Diagnostics; @@ -15,11 +15,11 @@ using System.Security.Claims; using System.Text; using System.Threading.Tasks; using System.Web.Http; -using static Step.Model.Constants; -using static Step.Config.ServerConfig; -using Step.Listeners; +using static Termo.Active.Model.Constants; +using static Termo.Active.Config.ServerConfig; +using Termo.Active.Listeners; -namespace Step.Controllers.WebApi +namespace Termo.Active.Controllers.WebApi { [RoutePrefix("api/alarm")] public class ApiAlarmController : ApiController diff --git a/Step/Controllers/WebApi/ApiMaintenanceController.cs b/Step/Controllers/WebApi/ApiMaintenanceController.cs index e4627fd6..1acbb909 100644 --- a/Step/Controllers/WebApi/ApiMaintenanceController.cs +++ b/Step/Controllers/WebApi/ApiMaintenanceController.cs @@ -1,12 +1,12 @@ using CMS_CORE_Library.Models; using Newtonsoft.Json; -using Step.Database.Controllers; -using Step.Model.DatabaseModels; -using Step.Model.DTOModels; -using Step.Model.DTOModels.MaintenanceModels; -using Step.NC; -using Step.Provider; -using Step.Utils; +using Termo.Active.Database.Controllers; +using Termo.Active.Model.DatabaseModels; +using Termo.Active.Model.DTOModels; +using Termo.Active.Model.DTOModels.MaintenanceModels; +using Termo.Active.NC; +using Termo.Active.Provider; +using Termo.Active.Utils; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; @@ -17,10 +17,10 @@ using System.Net.Http; using System.Security.Claims; using System.Threading.Tasks; using System.Web.Http; -using static Step.Config.ServerConfig; -using static Step.Model.Constants; +using static Termo.Active.Config.ServerConfig; +using static Termo.Active.Model.Constants; -namespace Step.Controllers.WebApi +namespace Termo.Active.Controllers.WebApi { [RoutePrefix("api/maintenance_manager")] public class ApiMaintenanceController : ApiController diff --git a/Step/Controllers/WebApi/AuthorizationController.cs b/Step/Controllers/WebApi/AuthorizationController.cs index 43d469d7..908918e9 100644 --- a/Step/Controllers/WebApi/AuthorizationController.cs +++ b/Step/Controllers/WebApi/AuthorizationController.cs @@ -1,13 +1,13 @@ -using Step.Database.Controllers; -using Step.Model.DTOModels; +using Termo.Active.Database.Controllers; +using Termo.Active.Model.DTOModels; using System; using System.Collections.Generic; using System.Linq; using System.Security.Claims; using System.Web.Http; -using static Step.Model.Constants; +using static Termo.Active.Model.Constants; -namespace Step.Controllers.WebApi +namespace Termo.Active.Controllers.WebApi { [RoutePrefix("api/authorization")] public class AuthorizationController : ApiController diff --git a/Step/Controllers/WebApi/CmsConnectController.cs b/Step/Controllers/WebApi/CmsConnectController.cs index 1ed39239..3495f8e1 100644 --- a/Step/Controllers/WebApi/CmsConnectController.cs +++ b/Step/Controllers/WebApi/CmsConnectController.cs @@ -1,7 +1,7 @@ -using Step.CmsConnectGateway; -using Step.CmsConnectGateway.Events; -using Step.CmsConnectGateway.Exceptions; -using Step.Model.DTOModels; +using Termo.Active.CmsConnectGateway; +using Termo.Active.CmsConnectGateway.Events; +using Termo.Active.CmsConnectGateway.Exceptions; +using Termo.Active.Model.DTOModels; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; @@ -11,9 +11,9 @@ using System.Text; using System.Threading.Tasks; using System.Web.Http; using TeamDev.SDK.MVVM; -using static Step.Model.Constants; +using static Termo.Active.Model.Constants; -namespace Step.Controllers.WebApi +namespace Termo.Active.Controllers.WebApi { [RoutePrefix("api/cms_connect")] public class CmsConnectController : ApiController diff --git a/Step/Controllers/WebApi/ConfigurationController.cs b/Step/Controllers/WebApi/ConfigurationController.cs index 740a2eb8..70c61643 100644 --- a/Step/Controllers/WebApi/ConfigurationController.cs +++ b/Step/Controllers/WebApi/ConfigurationController.cs @@ -1,15 +1,15 @@ using CMS_CORE_Library.Models; -using Step.Database.Controllers; -using Step.Model.ConfigModels; -using Step.Model.DTOModels; -using Step.Model.DTOModels.AlarmModels; -using Step.NC; +using Termo.Active.Database.Controllers; +using Termo.Active.Model.ConfigModels; +using Termo.Active.Model.DTOModels; +using Termo.Active.Model.DTOModels.AlarmModels; +using Termo.Active.NC; using System.Collections.Generic; using System.Linq; using System.Web.Http; -using static Step.Config.ServerConfig; +using static Termo.Active.Config.ServerConfig; -namespace Step.Controllers.WebApi +namespace Termo.Active.Controllers.WebApi { [RoutePrefix("api/configuration")] public class ConfigurationController : ApiController diff --git a/Step/Controllers/WebApi/FavoriteUserSoftKeyController.cs b/Step/Controllers/WebApi/FavoriteUserSoftKeyController.cs index cc96f710..0332b78f 100644 --- a/Step/Controllers/WebApi/FavoriteUserSoftKeyController.cs +++ b/Step/Controllers/WebApi/FavoriteUserSoftKeyController.cs @@ -1,6 +1,6 @@ -using Step.Database.Controllers; -using Step.Model.DatabaseModels; -using Step.Model.DTOModels; +using Termo.Active.Database.Controllers; +using Termo.Active.Model.DatabaseModels; +using Termo.Active.Model.DTOModels; using System; using System.Collections.Generic; using System.Linq; @@ -8,9 +8,9 @@ using System.Security.Claims; using System.Text; using System.Threading.Tasks; using System.Web.Http; -using static Step.Model.Constants; +using static Termo.Active.Model.Constants; -namespace Step.Controllers.WebApi +namespace Termo.Active.Controllers.WebApi { [RoutePrefix("api/user_softkey")] public class FavoriteUserSoftkeyController : ApiController diff --git a/Step/Controllers/WebApi/LanguageController.cs b/Step/Controllers/WebApi/LanguageController.cs index 37511923..535bb587 100644 --- a/Step/Controllers/WebApi/LanguageController.cs +++ b/Step/Controllers/WebApi/LanguageController.cs @@ -1,16 +1,16 @@ using CMS_CORE_Library.Models; -using Step.Model.DTOModels; -using Step.NC; +using Termo.Active.Model.DTOModels; +using Termo.Active.NC; using System.Collections.Generic; using System.Globalization; using System.Linq; using System.Web.Http; using static CMS_CORE_Library.Models.DataStructures; -using static Step.Config.ServerConfig; -using static Step.Model.Constants; -using static Step.Utils.LanguageController; +using static Termo.Active.Config.ServerConfig; +using static Termo.Active.Model.Constants; +using static Termo.Active.Utils.LanguageController; -namespace Step.Controllers.WebApi +namespace Termo.Active.Controllers.WebApi { [RoutePrefix("api/language")] public class LanguageController : ApiController diff --git a/Step/Controllers/WebApi/NcApiController.cs b/Step/Controllers/WebApi/NcApiController.cs index 4313810d..2871004b 100644 --- a/Step/Controllers/WebApi/NcApiController.cs +++ b/Step/Controllers/WebApi/NcApiController.cs @@ -1,11 +1,11 @@ using CMS_CORE_Library.Models; -using Step.Model.DTOModels; -using Step.NC; +using Termo.Active.Model.DTOModels; +using Termo.Active.NC; using System.Globalization; using System.Web.Http; -using static Step.Model.Constants; +using static Termo.Active.Model.Constants; -namespace Step.Controllers.WebApi +namespace Termo.Active.Controllers.WebApi { [RoutePrefix("api/nc")] public class NcApiController : ApiController diff --git a/Step/Controllers/WebApi/NcFileController.cs b/Step/Controllers/WebApi/NcFileController.cs index 63133e42..1de121b5 100644 --- a/Step/Controllers/WebApi/NcFileController.cs +++ b/Step/Controllers/WebApi/NcFileController.cs @@ -1,6 +1,6 @@ using CMS_CORE_Library.Models; -using Step.Model.DTOModels; -using Step.NC; +using Termo.Active.Model.DTOModels; +using Termo.Active.NC; using System; using System.Collections.Generic; using System.IO; @@ -10,10 +10,10 @@ using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; using static CMS_CORE_Library.Models.DataStructures; -using static Step.Config.ServerConfig; -using static Step.Model.Constants; +using static Termo.Active.Config.ServerConfig; +using static Termo.Active.Model.Constants; -namespace Step.Controllers.WebApi +namespace Termo.Active.Controllers.WebApi { [RoutePrefix("api/file_manager")] public class NcFileController : ApiController diff --git a/Step/Controllers/WebApi/NcToolManagerController.cs b/Step/Controllers/WebApi/NcToolManagerController.cs index 30fe5de6..056a5fa9 100644 --- a/Step/Controllers/WebApi/NcToolManagerController.cs +++ b/Step/Controllers/WebApi/NcToolManagerController.cs @@ -1,11 +1,11 @@ using CMS_CORE_Library.Models; using Newtonsoft.Json; -using Step.Database.Controllers; -using Step.Model.DatabaseModels; -using Step.Model.DTOModels; -using Step.Model.DTOModels.ToolModels; -using Step.NC; -using Step.Utils; +using Termo.Active.Database.Controllers; +using Termo.Active.Model.DatabaseModels; +using Termo.Active.Model.DTOModels; +using Termo.Active.Model.DTOModels.ToolModels; +using Termo.Active.NC; +using Termo.Active.Utils; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; @@ -18,11 +18,11 @@ using System.Text; using System.Threading.Tasks; using System.Web; using System.Web.Http; -using static Step.Config.ServerConfig; -using static Step.Listeners.SignalRStaticObjects; -using static Step.Model.Constants; +using static Termo.Active.Config.ServerConfig; +using static Termo.Active.Listeners.SignalRStaticObjects; +using static Termo.Active.Model.Constants; -namespace Step.Controllers.WebApi +namespace Termo.Active.Controllers.WebApi { [RoutePrefix("api/tool_manager/nc")] public class NcToolManagerApiController : ApiController diff --git a/Step/Controllers/WebApi/ReportController.cs b/Step/Controllers/WebApi/ReportController.cs index 166c1372..32e633c5 100644 --- a/Step/Controllers/WebApi/ReportController.cs +++ b/Step/Controllers/WebApi/ReportController.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Web.Http; using System.Xml.Serialization; -namespace Step.Controllers.WebApi +namespace Termo.Active.Controllers.WebApi { [RoutePrefix("api/report")] public class ReportController : ApiController diff --git a/Step/Controllers/WebApi/ScadaController.cs b/Step/Controllers/WebApi/ScadaController.cs index 2511121b..817c7e7c 100644 --- a/Step/Controllers/WebApi/ScadaController.cs +++ b/Step/Controllers/WebApi/ScadaController.cs @@ -1,7 +1,7 @@ using CMS_CORE_Library.Models; -using Step.Model.DTOModels.Scada; -using Step.NC; -using Step.Utils; +using Termo.Active.Model.DTOModels.Scada; +using Termo.Active.NC; +using Termo.Active.Utils; using System; using System.Collections.Generic; using System.Linq; @@ -9,10 +9,10 @@ using System.Text; using System.Threading.Tasks; using System.Web.Http; using static CMS_CORE_Library.Models.DataStructures; -using static Step.Config.ServerConfig; -using static Step.Model.Constants; +using static Termo.Active.Config.ServerConfig; +using static Termo.Active.Model.Constants; -namespace Step.Controllers.WebApi +namespace Termo.Active.Controllers.WebApi { [RoutePrefix("api/scada")] public class ScadaController : ApiController diff --git a/Step/Controllers/WebApi/SiemensToolManagerController.cs b/Step/Controllers/WebApi/SiemensToolManagerController.cs index 2c5a28b0..a0535390 100644 --- a/Step/Controllers/WebApi/SiemensToolManagerController.cs +++ b/Step/Controllers/WebApi/SiemensToolManagerController.cs @@ -1,14 +1,14 @@ using CMS_CORE_Library.Models; -using Step.Model.DatabaseModels; -using Step.Model.DTOModels.ToolModels; -using Step.NC; +using Termo.Active.Model.DatabaseModels; +using Termo.Active.Model.DTOModels.ToolModels; +using Termo.Active.NC; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; using System.Web.Http; -namespace Step.Controllers.WebApi +namespace Termo.Active.Controllers.WebApi { [RoutePrefix("api/tool_manager")] public class SiemensToolManagerController : ApiController diff --git a/Step/Controllers/WebApi/UserController.cs b/Step/Controllers/WebApi/UserController.cs index 06eb4868..7da774bd 100644 --- a/Step/Controllers/WebApi/UserController.cs +++ b/Step/Controllers/WebApi/UserController.cs @@ -1,8 +1,8 @@ using Microsoft.AspNet.SignalR; -using Step.Controllers.SignalR; -using Step.Database.Controllers; -using Step.Model.DatabaseModels; -using Step.Model.DTOModels; +using Termo.Active.Controllers.SignalR; +using Termo.Active.Database.Controllers; +using Termo.Active.Model.DatabaseModels; +using Termo.Active.Model.DTOModels; using System; using System.Collections.Generic; using System.Globalization; @@ -10,11 +10,11 @@ using System.Linq; using System.Security.Claims; using System.Web.Http; using System.Web.Helpers; -using static Step.Model.Constants; -using static Step.Utils.LanguageController; -using Step.Utils; +using static Termo.Active.Model.Constants; +using static Termo.Active.Utils.LanguageController; +using Termo.Active.Utils; -namespace Step.Controllers.WebApi +namespace Termo.Active.Controllers.WebApi { [RoutePrefix("api/user")] public class UserController : ApiController diff --git a/Step/Listeners/Database/SignalRDatabaseHandler.cs b/Step/Listeners/Database/SignalRDatabaseHandler.cs index 81df06ca..9f94f4fe 100644 --- a/Step/Listeners/Database/SignalRDatabaseHandler.cs +++ b/Step/Listeners/Database/SignalRDatabaseHandler.cs @@ -1,16 +1,16 @@ -using Step.Database.Controllers; -using Step.Model.DatabaseModels; -using Step.Model.DTOModels; -using Step.Model.DTOModels.AlarmModels; -using Step.Model.DTOModels.ToolModels; -using Step.NC; +using Termo.Active.Database.Controllers; +using Termo.Active.Model.DatabaseModels; +using Termo.Active.Model.DTOModels; +using Termo.Active.Model.DTOModels.AlarmModels; +using Termo.Active.Model.DTOModels.ToolModels; +using Termo.Active.NC; using System.Collections.Generic; using System.Linq; using static CMS_CORE_Library.Models.DataStructures; -using static Step.Listeners.SignalRStaticObjects; -using static Step.Model.Constants; +using static Termo.Active.Listeners.SignalRStaticObjects; +using static Termo.Active.Model.Constants; -namespace Step.Listeners.Database +namespace Termo.Active.Listeners.Database { public static class SignalRDatabaseHandler { diff --git a/Step/Listeners/ListenersHandler.cs b/Step/Listeners/ListenersHandler.cs index 09525d72..db4c09d2 100644 --- a/Step/Listeners/ListenersHandler.cs +++ b/Step/Listeners/ListenersHandler.cs @@ -1,13 +1,13 @@ -using Step.Listeners.Database; -using Step.Listeners.SignalR; -using Step.Model.DTOModels; -using Step.Model.DTOModels.AlarmModels; +using Termo.Active.Listeners.Database; +using Termo.Active.Listeners.SignalR; +using Termo.Active.Model.DTOModels; +using Termo.Active.Model.DTOModels.AlarmModels; using System.Collections.Generic; using System.Threading; using TeamDev.SDK.MVVM; -using static Step.Model.Constants; +using static Termo.Active.Model.Constants; -namespace Step.Listeners +namespace Termo.Active.Listeners { public class ListenersHandler { diff --git a/Step/Listeners/SignalR/SignalRListener.cs b/Step/Listeners/SignalR/SignalRListener.cs index c92cb2b4..bffdea27 100644 --- a/Step/Listeners/SignalR/SignalRListener.cs +++ b/Step/Listeners/SignalR/SignalRListener.cs @@ -1,22 +1,22 @@ using Microsoft.AspNet.SignalR; -using Step.Config; -using Step.Controllers.SignalR; -using Step.Database.Controllers; -using Step.Model.DTOModels; -using Step.Model.DTOModels.AlarmModels; -using Step.Model.DTOModels.Scada; -using Step.Model.DTOModels.ToolModels; -using Step.Utils; +using Termo.Active.Config; +using Termo.Active.Controllers.SignalR; +using Termo.Active.Database.Controllers; +using Termo.Active.Model.DTOModels; +using Termo.Active.Model.DTOModels.AlarmModels; +using Termo.Active.Model.DTOModels.Scada; +using Termo.Active.Model.DTOModels.ToolModels; +using Termo.Active.Utils; using System; using System.Collections.Generic; using System.Diagnostics; using System.Linq; using System.Threading; -using static Step.Listeners.SignalRStaticObjects; -using static Step.Model.Constants; -using static Step.Config.ServerConfig; +using static Termo.Active.Listeners.SignalRStaticObjects; +using static Termo.Active.Model.Constants; +using static Termo.Active.Config.ServerConfig; -namespace Step.Listeners.SignalR +namespace Termo.Active.Listeners.SignalR { public static class SignalRListener { diff --git a/Step/Listeners/SignalRStaticObjects.cs b/Step/Listeners/SignalRStaticObjects.cs index 4fcf8fa6..d093b32a 100644 --- a/Step/Listeners/SignalRStaticObjects.cs +++ b/Step/Listeners/SignalRStaticObjects.cs @@ -1,10 +1,10 @@ -using Step.Model.DTOModels; -using Step.Model.DTOModels.AlarmModels; -using Step.Model.DTOModels.Scada; -using Step.Model.DTOModels.ToolModels; +using Termo.Active.Model.DTOModels; +using Termo.Active.Model.DTOModels.AlarmModels; +using Termo.Active.Model.DTOModels.Scada; +using Termo.Active.Model.DTOModels.ToolModels; using System.Collections.Generic; -namespace Step.Listeners +namespace Termo.Active.Listeners { public static class SignalRStaticObjects { diff --git a/Step/MultipartHandler.cs b/Step/MultipartHandler.cs index 66b99e0d..33012eb9 100644 --- a/Step/MultipartHandler.cs +++ b/Step/MultipartHandler.cs @@ -4,7 +4,7 @@ using System.Net.Http; using System.Text; using System.Threading.Tasks; -namespace Step +namespace Termo.Active { public class FormItem { diff --git a/Step/Provider/ApplicationOAuthProvider.cs b/Step/Provider/ApplicationOAuthProvider.cs index 01bf247a..49b8eb6e 100644 --- a/Step/Provider/ApplicationOAuthProvider.cs +++ b/Step/Provider/ApplicationOAuthProvider.cs @@ -1,15 +1,15 @@ using System; using System.Threading.Tasks; using Microsoft.Owin.Security.OAuth; -using Step.Database.Controllers; -using Step.Model.DatabaseModels; +using Termo.Active.Database.Controllers; +using Termo.Active.Model.DatabaseModels; using System.Security.Claims; -using static Step.Model.Constants; -using static Step.Config.ServerConfig; +using static Termo.Active.Model.Constants; +using static Termo.Active.Config.ServerConfig; using System.Linq; using Microsoft.Owin.Security; -namespace Step.Provider +namespace Termo.Active.Provider { public class ApplicationOAuthProvider : OAuthAuthorizationServerProvider { diff --git a/Step/Provider/CustomMultipartFormDataStreamProvider.cs b/Step/Provider/CustomMultipartFormDataStreamProvider.cs index 86b1fd8c..9ea43e34 100644 --- a/Step/Provider/CustomMultipartFormDataStreamProvider.cs +++ b/Step/Provider/CustomMultipartFormDataStreamProvider.cs @@ -8,7 +8,7 @@ using System.Threading.Tasks; using System.Web; using System.Web.Http; -namespace Step.Provider +namespace Termo.Active.Provider { public class FileResult : IHttpActionResult { diff --git a/Step/Provider/SignalROAuthBearerProvider.cs b/Step/Provider/SignalROAuthBearerProvider.cs index 3806cbea..59c3f257 100644 --- a/Step/Provider/SignalROAuthBearerProvider.cs +++ b/Step/Provider/SignalROAuthBearerProvider.cs @@ -1,7 +1,7 @@ using Microsoft.Owin.Security.OAuth; using System.Threading.Tasks; -namespace Step.Provider +namespace Termo.Active.Provider { public class SignalROAuthBearerProvider : OAuthBearerAuthenticationProvider { diff --git a/Step/Step.csproj b/Step/Termo.Active.csproj similarity index 98% rename from Step/Step.csproj rename to Step/Termo.Active.csproj index 53d7a656..487bef4f 100644 --- a/Step/Step.csproj +++ b/Step/Termo.Active.csproj @@ -1,16466 +1,16466 @@ - - - - - - - - Debug - AnyCPU - - - 2.0 - {AFED34E1-77DB-4D81-830A-A8D0A190573D} - WinExe - Properties - Step - Active - v4.6.2 - - - Latest - true - True - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - true - full - false - bin\ - DEBUG;TRACE - prompt - 4 - false - true - - - true - pdbonly - false - bin\ - TRACE - prompt - 4 - - - - ..\Libs\CMS_CORE_Library.dll - - - ..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll - - - ..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll - - - ..\packages\MetroModernUI.1.4.0.0\lib\net\MetroFramework.dll - - - ..\packages\MetroModernUI.1.4.0.0\lib\net\MetroFramework.Design.dll - - - ..\packages\MetroModernUI.1.4.0.0\lib\net\MetroFramework.Fonts.dll - - - ..\packages\Microsoft.AspNet.SignalR.Core.2.2.2\lib\net45\Microsoft.AspNet.SignalR.Core.dll - - - ..\packages\Microsoft.AspNet.SignalR.SystemWeb.2.2.2\lib\net45\Microsoft.AspNet.SignalR.SystemWeb.dll - - - ..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.8\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - - - - ..\packages\Microsoft.Owin.3.1.0\lib\net45\Microsoft.Owin.dll - - - ..\packages\Microsoft.Owin.Cors.3.1.0\lib\net45\Microsoft.Owin.Cors.dll - - - ..\packages\Microsoft.Owin.FileSystems.3.1.0\lib\net45\Microsoft.Owin.FileSystems.dll - - - ..\packages\Microsoft.Owin.Host.HttpListener.3.1.0\lib\net45\Microsoft.Owin.Host.HttpListener.dll - - - ..\packages\Microsoft.Owin.Host.SystemWeb.3.1.0\lib\net45\Microsoft.Owin.Host.SystemWeb.dll - - - ..\packages\Microsoft.Owin.Hosting.3.1.0\lib\net45\Microsoft.Owin.Hosting.dll - - - ..\packages\Microsoft.Owin.Security.3.1.0\lib\net45\Microsoft.Owin.Security.dll - - - ..\packages\Microsoft.Owin.Security.OAuth.3.1.0\lib\net45\Microsoft.Owin.Security.OAuth.dll - - - ..\packages\Microsoft.Owin.StaticFiles.3.1.0\lib\net45\Microsoft.Owin.StaticFiles.dll - - - ..\packages\microsoft-web-helpers.2.1.20710.2\lib\net40\Microsoft.Web.Helpers.dll - - - ..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll - - - ..\packages\Owin.1.0\lib\net40\Owin.dll - - - ..\packages\Swashbuckle.Core.5.6.0\lib\net40\Swashbuckle.Core.dll - - - - - - ..\packages\System.Security.Claims.4.0.1\lib\net46\System.Security.Claims.dll - - - ..\packages\System.Security.Principal.Windows.4.0.0\lib\net46\System.Security.Principal.Windows.dll - - - ..\packages\Microsoft.AspNet.Cors.5.2.3\lib\net45\System.Web.Cors.dll - - - - - - - - - ..\packages\Microsoft.AspNet.WebPages.2.0.20505.0\lib\net40\System.Web.Helpers.dll - - - ..\packages\Microsoft.AspNet.WebApi.Cors.5.2.3\lib\net45\System.Web.Http.Cors.dll - - - ..\packages\Microsoft.AspNet.WebApi.Owin.5.2.3\lib\net45\System.Web.Http.Owin.dll - - - - ..\packages\Microsoft.AspNet.Razor.2.0.20505.0\lib\net40\System.Web.Razor.dll - - - ..\packages\Microsoft.AspNet.WebPages.2.0.20505.0\lib\net40\System.Web.WebPages.dll - - - ..\packages\Microsoft.AspNet.WebPages.2.0.20505.0\lib\net40\System.Web.WebPages.Deployment.dll - - - ..\packages\Microsoft.AspNet.WebPages.2.0.20505.0\lib\net40\System.Web.WebPages.Razor.dll - - - - - - - - - - - True - ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - - - - ..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll - - - - - ..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll - - - ..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.3\lib\net45\System.Web.Http.WebHost.dll - - - False - ..\Libs\TeamDev.SDK.6.dll - - - False - ..\Libs\TeamDev.SDK.WPF.dll - - - ..\packages\WebActivatorEx.2.2.0\lib\net40\WebActivatorEx.dll - - - ..\packages\Microsoft.AspNet.WebPages.Data.2.0.20505.0\lib\net40\WebMatrix.Data.dll - - - ..\packages\Microsoft.AspNet.WebPages.WebData.2.0.20505.0\lib\net40\WebMatrix.WebData.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Designer - - - App.config - - - App.config - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Always - - - Always - - - Designer - - - - compilerconfig.json - - - Always - - - Always - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - False - Microsoft .NET Framework 4.6.2 %28x86 e x64%29 - true - - - False - .NET Framework 3.5 SP1 - false - - - - - - - - {49b04d99-0ecd-4900-86d3-7098d61314d7} - Step.CmsConnectGateway - - - {3f5c2483-fc87-43ef-92a8-66ff7d0e440f} - Step.Config - - - {de54ff4c-8390-4489-882a-1bc7d99ef185} - Step.Core - - - {357d5ee1-ffc8-489b-9232-22cf474d9a6f} - Step.Database - - - {631375dd-06d3-49bb-8130-d9ddb34c429d} - Step.Model - - - {b2366b08-96bd-4f6b-b748-b45089b87a14} - Step.NC - - - {20fc0937-e7ca-4693-95f9-7a948efd173b} - Step.UI - - - {cbeb631b-abfa-4042-9779-c0060b0dfefe} - Step.Utils - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - Step.Application - - - ACTIVE_ICONA.ico - - - app.manifest - - - - - - - - - - - - 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}. - - - - + + + + + + + + Debug + AnyCPU + + + 2.0 + {AFED34E1-77DB-4D81-830A-A8D0A190573D} + WinExe + Properties + Termo.Active + Termo.Active + v4.6.2 + + + Latest + true + True + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true + + + true + full + false + bin\ + DEBUG;TRACE + prompt + 4 + false + true + + + true + pdbonly + false + bin\ + TRACE + prompt + 4 + + + + ..\Libs\CMS_CORE_Library.dll + + + ..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll + + + ..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll + + + ..\packages\MetroModernUI.1.4.0.0\lib\net\MetroFramework.dll + + + ..\packages\MetroModernUI.1.4.0.0\lib\net\MetroFramework.Design.dll + + + ..\packages\MetroModernUI.1.4.0.0\lib\net\MetroFramework.Fonts.dll + + + ..\packages\Microsoft.AspNet.SignalR.Core.2.2.2\lib\net45\Microsoft.AspNet.SignalR.Core.dll + + + ..\packages\Microsoft.AspNet.SignalR.SystemWeb.2.2.2\lib\net45\Microsoft.AspNet.SignalR.SystemWeb.dll + + + ..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.8\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll + + + + ..\packages\Microsoft.Owin.3.1.0\lib\net45\Microsoft.Owin.dll + + + ..\packages\Microsoft.Owin.Cors.3.1.0\lib\net45\Microsoft.Owin.Cors.dll + + + ..\packages\Microsoft.Owin.FileSystems.3.1.0\lib\net45\Microsoft.Owin.FileSystems.dll + + + ..\packages\Microsoft.Owin.Host.HttpListener.3.1.0\lib\net45\Microsoft.Owin.Host.HttpListener.dll + + + ..\packages\Microsoft.Owin.Host.SystemWeb.3.1.0\lib\net45\Microsoft.Owin.Host.SystemWeb.dll + + + ..\packages\Microsoft.Owin.Hosting.3.1.0\lib\net45\Microsoft.Owin.Hosting.dll + + + ..\packages\Microsoft.Owin.Security.3.1.0\lib\net45\Microsoft.Owin.Security.dll + + + ..\packages\Microsoft.Owin.Security.OAuth.3.1.0\lib\net45\Microsoft.Owin.Security.OAuth.dll + + + ..\packages\Microsoft.Owin.StaticFiles.3.1.0\lib\net45\Microsoft.Owin.StaticFiles.dll + + + ..\packages\microsoft-web-helpers.2.1.20710.2\lib\net40\Microsoft.Web.Helpers.dll + + + ..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll + + + ..\packages\Owin.1.0\lib\net40\Owin.dll + + + ..\packages\Swashbuckle.Core.5.6.0\lib\net40\Swashbuckle.Core.dll + + + + + + ..\packages\System.Security.Claims.4.0.1\lib\net46\System.Security.Claims.dll + + + ..\packages\System.Security.Principal.Windows.4.0.0\lib\net46\System.Security.Principal.Windows.dll + + + ..\packages\Microsoft.AspNet.Cors.5.2.3\lib\net45\System.Web.Cors.dll + + + + + + + + + ..\packages\Microsoft.AspNet.WebPages.2.0.20505.0\lib\net40\System.Web.Helpers.dll + + + ..\packages\Microsoft.AspNet.WebApi.Cors.5.2.3\lib\net45\System.Web.Http.Cors.dll + + + ..\packages\Microsoft.AspNet.WebApi.Owin.5.2.3\lib\net45\System.Web.Http.Owin.dll + + + + ..\packages\Microsoft.AspNet.Razor.2.0.20505.0\lib\net40\System.Web.Razor.dll + + + ..\packages\Microsoft.AspNet.WebPages.2.0.20505.0\lib\net40\System.Web.WebPages.dll + + + ..\packages\Microsoft.AspNet.WebPages.2.0.20505.0\lib\net40\System.Web.WebPages.Deployment.dll + + + ..\packages\Microsoft.AspNet.WebPages.2.0.20505.0\lib\net40\System.Web.WebPages.Razor.dll + + + + + + + + + + + True + ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll + + + + + ..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll + + + + + ..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll + + + ..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.3\lib\net45\System.Web.Http.WebHost.dll + + + False + ..\Libs\TeamDev.SDK.6.dll + + + False + ..\Libs\TeamDev.SDK.WPF.dll + + + ..\packages\WebActivatorEx.2.2.0\lib\net40\WebActivatorEx.dll + + + ..\packages\Microsoft.AspNet.WebPages.Data.2.0.20505.0\lib\net40\WebMatrix.Data.dll + + + ..\packages\Microsoft.AspNet.WebPages.WebData.2.0.20505.0\lib\net40\WebMatrix.WebData.dll + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Designer + + + App.config + + + App.config + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Always + + + Always + + + Designer + + + + compilerconfig.json + + + Always + + + Always + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + False + Microsoft .NET Framework 4.6.2 %28x86 e x64%29 + true + + + False + .NET Framework 3.5 SP1 + false + + + + + + + + {49b04d99-0ecd-4900-86d3-7098d61314d7} + Termo.Active.CmsConnectGateway + + + {3f5c2483-fc87-43ef-92a8-66ff7d0e440f} + Termo.Active.Config + + + {de54ff4c-8390-4489-882a-1bc7d99ef185} + Termo.Active.Core + + + {357d5ee1-ffc8-489b-9232-22cf474d9a6f} + Termo.Active.Database + + + {631375dd-06d3-49bb-8130-d9ddb34c429d} + Termo.Active.Model + + + {b2366b08-96bd-4f6b-b748-b45089b87a14} + Termo.Active.NC + + + {20fc0937-e7ca-4693-95f9-7a948efd173b} + Termo.Active.UI + + + {cbeb631b-abfa-4042-9779-c0060b0dfefe} + Termo.Active.Utils + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 10.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + Step.Application + + + ACTIVE_ICONA.ico + + + app.manifest + + + + + + + + + + + + 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/Step/Step.csproj.user b/Step/Termo.Active.csproj.user similarity index 100% rename from Step/Step.csproj.user rename to Step/Termo.Active.csproj.user diff --git a/Step/WebApiUnhandledExceptionHandler.cs b/Step/WebApiUnhandledExceptionHandler.cs index 995a238c..7ae32a59 100644 --- a/Step/WebApiUnhandledExceptionHandler.cs +++ b/Step/WebApiUnhandledExceptionHandler.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; using System.Web.Http; using System.Web.Http.ExceptionHandling; -namespace Step +namespace Termo.Active { public class WebApiUnhandledExceptionHandler : ExceptionHandler { diff --git a/Step/program.cs b/Step/program.cs index 7180560e..a103665e 100644 --- a/Step/program.cs +++ b/Step/program.cs @@ -1,12 +1,12 @@ using Microsoft.Owin.Hosting; -using Step.Config; -using Step.Core; -using Step.Database; -using Step.Listeners; -using Step.Model; -using Step.NC; -using Step.UI; -using Step.Utils; +using Termo.Active.Config; +using Termo.Active.Core; +using Termo.Active.Database; +using Termo.Active.Listeners; +using Termo.Active.Model; +using Termo.Active.NC; +using Termo.Active.UI; +using Termo.Active.Utils; using System; using System.IO; using System.Net; @@ -14,12 +14,12 @@ using System.Net.Sockets; using System.Threading; using System.Windows.Forms; using TeamDev.SDK.MVVM; -using static Step.Config.ServerConfig; -using static Step.Model.Constants; -using static Step.Utils.StepLogger; -using static Step.Utils.ExceptionManager; +using static Termo.Active.Config.ServerConfig; +using static Termo.Active.Model.Constants; +using static Termo.Active.Utils.StepLogger; +using static Termo.Active.Utils.ExceptionManager; -namespace Step +namespace Termo.Active { public class Application {