From 8b650b590224b4c922aab831307c7bcb29fa9fdc Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Tue, 21 May 2019 08:37:45 +0300 Subject: Fixed issue with PPC update TEMP_USER not having VIEW_DEFINITION permissions. --- .../Visual_Studio/Tango.UnitTesting/SMO/SMO_TST.cs | 22 ++++++++++++++++++++++ .../Tango.UnitTesting/Tango.UnitTesting.csproj | 3 ++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 Software/Visual_Studio/Tango.UnitTesting/SMO/SMO_TST.cs (limited to 'Software/Visual_Studio/Tango.UnitTesting') diff --git a/Software/Visual_Studio/Tango.UnitTesting/SMO/SMO_TST.cs b/Software/Visual_Studio/Tango.UnitTesting/SMO/SMO_TST.cs new file mode 100644 index 000000000..f258c4e17 --- /dev/null +++ b/Software/Visual_Studio/Tango.UnitTesting/SMO/SMO_TST.cs @@ -0,0 +1,22 @@ +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.Web.SMO; + +namespace Tango.UnitTesting.SMO +{ + [TestClass] + [TestCategory("SMO")] + public class SMO_TST + { + [TestMethod] + public void Create_Temp_User_And_Grant_Read_And_View_Defaults() + { + SmoManager smo = new SmoManager(); + var user = smo.CreateRandomLoginAndUser(); + } + } +} diff --git a/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj b/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj index c7a2cc451..28144e010 100644 --- a/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj +++ b/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj @@ -144,6 +144,7 @@ + @@ -307,7 +308,7 @@ - + \ No newline at end of file -- cgit v1.3.1 From 0b9b136140b224a0b885942ee5aef674744aef4f Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Wed, 5 Jun 2019 11:43:03 +0300 Subject: Redundant. --- Software/DB/PPC/Tango.mdf | Bin 75497472 -> 75497472 bytes Software/DB/PPC/Tango_log.ldf | Bin 53673984 -> 53673984 bytes .../PPC Installer-cache/cacheIndex.txt | Bin 52 -> 52 bytes .../Advanced Installer Projects/PPC Installer.aip | 108 +++++++++++++++++++-- .../PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs | 2 +- .../Visual_Studio/PPC/Tango.PPC.UI/app.manifest | 2 +- .../Resources/Pulse/New twine gradients.TWN | Bin 0 -> 752449 bytes .../Tango.UnitTesting/Pulse/Pulse_TST.cs | 2 +- 8 files changed, 102 insertions(+), 12 deletions(-) create mode 100644 Software/Visual_Studio/Resources/Pulse/New twine gradients.TWN (limited to 'Software/Visual_Studio/Tango.UnitTesting') diff --git a/Software/DB/PPC/Tango.mdf b/Software/DB/PPC/Tango.mdf index 81bb0ea10..f4cf8629e 100644 Binary files a/Software/DB/PPC/Tango.mdf and b/Software/DB/PPC/Tango.mdf differ diff --git a/Software/DB/PPC/Tango_log.ldf b/Software/DB/PPC/Tango_log.ldf index 4aadf5dee..33d3cb5a5 100644 Binary files a/Software/DB/PPC/Tango_log.ldf and b/Software/DB/PPC/Tango_log.ldf differ diff --git a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt index 6d87e9201..a603ff06b 100644 Binary files a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt and b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt differ diff --git a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip index ef999f972..05d049030 100644 --- a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip +++ b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip @@ -18,10 +18,10 @@ - + - + @@ -73,9 +73,17 @@ + + + + + + + + @@ -102,11 +110,11 @@ + - @@ -121,20 +129,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -171,15 +205,22 @@ + + + + - + + + + - + @@ -214,12 +255,21 @@ + + + + + + + + + @@ -263,12 +313,14 @@ + + @@ -288,12 +340,23 @@ + + + + + + + + + + + @@ -307,13 +370,28 @@ + + + + + + + + + + + + + + + @@ -380,7 +458,7 @@ - + @@ -409,9 +487,23 @@ + + + + + + + + + + + + + + @@ -423,7 +515,7 @@ - + @@ -490,8 +582,6 @@ - - diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs index 3814fae20..672b13a12 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs @@ -8,4 +8,4 @@ using System.Windows; // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("Tango PPC Application")] -[assembly: AssemblyVersion("1.0.31.0")] +[assembly: AssemblyVersion("1.0.32.0")] diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest index efc5f8179..d72e75011 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest @@ -16,7 +16,7 @@ Remove this element if your application requires this virtualization for backwards compatibility. --> - + diff --git a/Software/Visual_Studio/Resources/Pulse/New twine gradients.TWN b/Software/Visual_Studio/Resources/Pulse/New twine gradients.TWN new file mode 100644 index 000000000..067b0351f Binary files /dev/null and b/Software/Visual_Studio/Resources/Pulse/New twine gradients.TWN differ diff --git a/Software/Visual_Studio/Tango.UnitTesting/Pulse/Pulse_TST.cs b/Software/Visual_Studio/Tango.UnitTesting/Pulse/Pulse_TST.cs index 9951d8d10..c20994198 100644 --- a/Software/Visual_Studio/Tango.UnitTesting/Pulse/Pulse_TST.cs +++ b/Software/Visual_Studio/Tango.UnitTesting/Pulse/Pulse_TST.cs @@ -72,7 +72,7 @@ namespace Tango.UnitTesting.Pulse [TestMethod] public void Read_Pulse_Sample_File() { - String sampleFile = Path.Combine(Helper.GetResourcePath(), "Pulse", "test.twn"); + String sampleFile = Path.Combine(Helper.GetResourcePath(), "Pulse", "New twine gradients.TWN"); TwnFile twnFile = TwnFile.FromFile(sampleFile); var imgFile = TemporaryManager.Default.CreateFile(".png"); -- cgit v1.3.1 From 081d332a0494d309c2762f76f9dc5032a673ea0d Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Sun, 7 Jul 2019 15:05:28 +0300 Subject: Removed Object extension methods from global namespace. --- .../ViewModels/MainViewVM.cs | 1 + .../ViewModels/DbTableViewModel.cs | 1 + .../ViewModels/MainViewVM.cs | 1 + .../ViewModels/MainViewVM.cs | 1 + .../Converters/LogItemToMessageConverter.cs | 1 + .../TechItems/ProcessParametersItem.cs | 1 + .../ViewModels/MachineTechViewVM.cs | 1 + .../EventLogging/DefaultEventLogger.cs | 1 + .../TFS/TeamFoundationServiceExtendedClient.cs | 1 + .../Tango.PPC.Jobs/ViewModels/JobsViewVM.cs | 1 + .../ViewModels/MainViewVM.cs | 1 + .../Connection/DefaultMachineProvider.cs | 1 + .../MachineSetup/MachineSetupManager.cs | 1 + .../MachineUpdate/MachineUpdateManager.cs | 1 + .../PPCApplication/DefaultPPCApplicationManager.cs | 1 + .../ViewModels/ExternalBridgeViewVM.cs | 1 + .../ColorConversion/TangoColorConverter.cs | 1 + Software/Visual_Studio/Tango.BL/Entities/Job.cs | 31 +- .../Visual_Studio/Tango.ColorConversion/Class1.cs | 12 + .../Properties/AssemblyInfo.cs | 9 + .../Tango.ColorConversion.csproj | 71 +++++ .../Tango.ColorConversion/packages.config | 4 + .../ExtensionMethods/ObjectExtensions.cs | 333 +++++++++++---------- .../Tango.Emulations/Emulators/MachineEmulator.cs | 1 + .../ExternalBridge/ExternalBridgeService.cs | 1 + .../DefaultGradientGenerationConfiguration.cs | 1 + .../Tango.Integration/Operation/MachineOperator.cs | 1 + .../Tango.Integration/Storage/StorageManager.cs | 1 + .../Converters/DisplayMemberPathConverter.cs | 1 + .../Tango.Touch/Controls/LightTouchDataGrid.cs | 1 + .../Tango.Touch/Controls/TouchAutoComplete.cs | 1 + .../Tango.Touch/Controls/TouchListBox.cs | 1 + .../Tango.Touch/Controls/TouchNativeListBox.cs | 1 + .../Tango.Touch/Controls/TouchNotificationBar.cs | 1 + .../Tango.UnitTesting/Pulse/Pulse_TST.cs | 1 + Software/Visual_Studio/Tango.sln | 54 +++- .../Tango.AlarmParametersGenerator/Program.cs | 1 + .../Tango.EventsTypesGenerator/Program.cs | 1 + 38 files changed, 364 insertions(+), 181 deletions(-) create mode 100644 Software/Visual_Studio/Tango.ColorConversion/Class1.cs create mode 100644 Software/Visual_Studio/Tango.ColorConversion/Properties/AssemblyInfo.cs create mode 100644 Software/Visual_Studio/Tango.ColorConversion/Tango.ColorConversion.csproj create mode 100644 Software/Visual_Studio/Tango.ColorConversion/packages.config (limited to 'Software/Visual_Studio/Tango.UnitTesting') diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/ViewModels/MainViewVM.cs index 88882afdd..3be6bf8e2 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/ViewModels/MainViewVM.cs @@ -20,6 +20,7 @@ using System.Windows.Media.Imaging; using System.Windows.Threading; using Tango.Core; using Tango.Core.Commands; +using Tango.Core.ExtensionMethods; using Tango.Core.Threading; using Tango.CSV; using Tango.Logging; diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DbTableViewModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DbTableViewModel.cs index e343313b4..83be6c3b4 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DbTableViewModel.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DbTableViewModel.cs @@ -17,6 +17,7 @@ using System.ComponentModel; using System.ComponentModel.DataAnnotations.Schema; using Tango.BL; using Tango.Core.DI; +using Tango.Core.ExtensionMethods; namespace Tango.MachineStudio.DB.ViewModels { diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs index 3811453cb..b0b6cfcb3 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs @@ -47,6 +47,7 @@ using System.Runtime.ExceptionServices; using Tango.BL.Builders; using Tango.MachineStudio.Common.Navigation; using System.Diagnostics; +using Tango.Core.ExtensionMethods; namespace Tango.MachineStudio.Developer.ViewModels { diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/MainViewVM.cs index 73ba02435..6cc8289f4 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/MainViewVM.cs @@ -12,6 +12,7 @@ using Tango.BL; using Tango.SharedUI.Components; using System.Runtime.CompilerServices; using Tango.MachineStudio.Common; +using Tango.Core.ExtensionMethods; namespace Tango.MachineStudio.HardwareDesigner.ViewModels { diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Converters/LogItemToMessageConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Converters/LogItemToMessageConverter.cs index 7136b22ea..7890d055b 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Converters/LogItemToMessageConverter.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Converters/LogItemToMessageConverter.cs @@ -5,6 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Data; +using Tango.Core.ExtensionMethods; using Tango.Logging; using Tango.PMR.Common; diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/ProcessParametersItem.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/ProcessParametersItem.cs index 4aedf8bc7..5e6bffa82 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/ProcessParametersItem.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/ProcessParametersItem.cs @@ -9,6 +9,7 @@ using System.Xml.Serialization; using Tango.BL; using Tango.BL.Entities; using Tango.Core.Commands; +using Tango.Core.ExtensionMethods; using Tango.SharedUI.Helpers; namespace Tango.MachineStudio.Technician.TechItems diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs index ab5d2ebb1..1a1832120 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs @@ -38,6 +38,7 @@ using RealTimeGraphX; using RealTimeGraphX.DataPoints; using Tango.MachineStudio.Technician.Views; using RealTimeGraphX.WPF; +using Tango.Core.ExtensionMethods; namespace Tango.MachineStudio.Technician.ViewModels { diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/EventLogging/DefaultEventLogger.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/EventLogging/DefaultEventLogger.cs index 79c032967..11d156292 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/EventLogging/DefaultEventLogger.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/EventLogging/DefaultEventLogger.cs @@ -17,6 +17,7 @@ using Tango.MachineStudio.Common.Diagnostics; using Tango.MachineStudio.Common.StudioApplication; using Tango.PMR.Diagnostics; using Tango.Integration.Operation; +using Tango.Core.ExtensionMethods; namespace Tango.MachineStudio.Common.EventLogging { diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamFoundationServiceExtendedClient.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamFoundationServiceExtendedClient.cs index df831afb9..fba037a6e 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamFoundationServiceExtendedClient.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamFoundationServiceExtendedClient.cs @@ -10,6 +10,7 @@ using System.Threading.Tasks; using System.Windows; using Tango.BL.Entities; using Tango.Core.DI; +using Tango.Core.ExtensionMethods; using Tango.Core.Helpers; using Tango.Core.IO; using Tango.Integration.Operation; diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs index 9862a4afb..248003b30 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs @@ -35,6 +35,7 @@ using Tango.Pulse; using System.Windows.Media.Imaging; using Tango.Touch.Components; using Tango.PPC.Jobs.ViewContracts; +using Tango.Core.ExtensionMethods; namespace Tango.PPC.Jobs.ViewModels { diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs index b413fee0d..8ed512670 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs @@ -13,6 +13,7 @@ using Tango.BL.Entities; using Tango.BL.Enumerations; using Tango.Core.Commands; using Tango.Core.DI; +using Tango.Core.ExtensionMethods; using Tango.PPC.Common; using Tango.PPC.Common.Connection; using Tango.PPC.Common.ExternalBridge; diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs index 04f64bd9c..7b3d85b75 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs @@ -20,6 +20,7 @@ using Tango.Transport.Transporters; using Tango.Integration; using Tango.Transport; using System.Threading; +using Tango.Core.ExtensionMethods; namespace Tango.PPC.Common.Connection { diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs index 39ff7e54d..05cf15a38 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs @@ -13,6 +13,7 @@ using System.Threading; using System.Threading.Tasks; using Tango.Core; using Tango.Core.DB; +using Tango.Core.ExtensionMethods; using Tango.Core.Helpers; using Tango.Core.IO; using Tango.Integration.Operation; diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs index 31b2f5534..64123acca 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs @@ -11,6 +11,7 @@ using System.Threading; using System.Threading.Tasks; using Tango.Core; using Tango.Core.DB; +using Tango.Core.ExtensionMethods; using Tango.Core.Helpers; using Tango.Core.IO; using Tango.Integration.Operation; diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs index 7aeb6760e..d4adc30a0 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs @@ -31,6 +31,7 @@ using Tango.PPC.Common.WatchDog; using Tango.PPC.UI.Dialogs; using Tango.Core.Threading; using Tango.PPC.Common.Messages; +using Tango.Core.ExtensionMethods; namespace Tango.PPC.UI.PPCApplication { diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/ExternalBridgeViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/ExternalBridgeViewVM.cs index 80a95d1bf..f1127ebfe 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/ExternalBridgeViewVM.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/ExternalBridgeViewVM.cs @@ -6,6 +6,7 @@ using System.Threading.Tasks; using Tango.BL.Entities; using Tango.Core.Commands; using Tango.Core.DI; +using Tango.Core.ExtensionMethods; using Tango.Integration.ExternalBridge; using Tango.PMR.Integration; using Tango.PPC.Common; diff --git a/Software/Visual_Studio/Tango.BL/ColorConversion/TangoColorConverter.cs b/Software/Visual_Studio/Tango.BL/ColorConversion/TangoColorConverter.cs index d5ec5ab15..e6a305677 100644 --- a/Software/Visual_Studio/Tango.BL/ColorConversion/TangoColorConverter.cs +++ b/Software/Visual_Studio/Tango.BL/ColorConversion/TangoColorConverter.cs @@ -10,6 +10,7 @@ using System.Threading.Tasks; using System.Windows.Media; using Tango.BL.Entities; using Tango.BL.Enumerations; +using Tango.Core.ExtensionMethods; using Tango.Logging; using Tango.PMR; using Tango.PMR.ColorLab; diff --git a/Software/Visual_Studio/Tango.BL/Entities/Job.cs b/Software/Visual_Studio/Tango.BL/Entities/Job.cs index 0780e6787..6e6ffcf48 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/Job.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/Job.cs @@ -13,6 +13,7 @@ using System.Windows.Media.Imaging; using Tango.BL.Builders; using Tango.BL.Enumerations; using Tango.Core; +using Tango.Core.ExtensionMethods; using Tango.Logging; using Tango.PMR.Exports; @@ -22,14 +23,26 @@ namespace Tango.BL.Entities { private double _lastLength; + #region Constructors + + /// + /// Initializes a new instance of the class. + /// + public Job() : base() + { + + } + /// /// Initializes a new instance of the class. /// - public Job(DateTime creationDate) + public Job(DateTime creationDate) : this() { CreationDate = creationDate; } + #endregion + #region Events /// @@ -183,6 +196,9 @@ namespace Tango.BL.Entities } private JobDesignations _designation; + /// + /// Gets or sets the designation. + /// [NotMapped] [JsonIgnore] public JobDesignations Designation @@ -191,6 +207,9 @@ namespace Tango.BL.Entities set { _designation = value; RaisePropertyChangedAuto(); } } + /// + /// Gets or sets the state of the job editing. + /// [NotMapped] [JsonIgnore] public EditingStates JobEditingState @@ -478,7 +497,7 @@ namespace Tango.BL.Entities /// public Task GetEstimatedDuration() { - return Task.Factory.StartNew(() => + return Task.Factory.StartNew(() => { var process = GetRecommendedProcessParameters().Result; return GetEstimatedDuration(process); @@ -719,13 +738,5 @@ namespace Tango.BL.Entities } #endregion - - /// - /// Initializes a new instance of the class. - /// - public Job() : base() - { - - } } } diff --git a/Software/Visual_Studio/Tango.ColorConversion/Class1.cs b/Software/Visual_Studio/Tango.ColorConversion/Class1.cs new file mode 100644 index 000000000..b420411b6 --- /dev/null +++ b/Software/Visual_Studio/Tango.ColorConversion/Class1.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.ColorConversion +{ + public class Class1 + { + } +} diff --git a/Software/Visual_Studio/Tango.ColorConversion/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.ColorConversion/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..f5e12a622 --- /dev/null +++ b/Software/Visual_Studio/Tango.ColorConversion/Properties/AssemblyInfo.cs @@ -0,0 +1,9 @@ +using System.Reflection; +using System.Resources; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; +using System.Windows; + +[assembly: AssemblyTitle("Tango - Color Conversion Library")] +[assembly: AssemblyVersion("2.0.17.1657")] +[assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.ColorConversion/Tango.ColorConversion.csproj b/Software/Visual_Studio/Tango.ColorConversion/Tango.ColorConversion.csproj new file mode 100644 index 000000000..2846ca99a --- /dev/null +++ b/Software/Visual_Studio/Tango.ColorConversion/Tango.ColorConversion.csproj @@ -0,0 +1,71 @@ + + + + + Debug + AnyCPU + {B4FE6485-4161-4B36-BC08-67E0B53D01B7} + Library + Properties + Tango.ColorConversion + Tango.ColorConversion + v4.6.1 + 512 + true + + + true + full + false + ..\Build\Core\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + ..\Build\Core\Release\ + TRACE + prompt + 4 + + + + ..\packages\Google.Protobuf.3.4.1\lib\net45\Google.Protobuf.dll + + + + + + + + + + + + + GlobalVersionInfo.cs + + + + + + + + + + {f441feee-322a-4943-b566-110e12fd3b72} + Tango.BL + + + {a34ee0f0-649d-41c8-8489-b6f1cc6924ee} + Tango.Core + + + {e4927038-348d-4295-aaf4-861c58cb3943} + Tango.PMR + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.ColorConversion/packages.config b/Software/Visual_Studio/Tango.ColorConversion/packages.config new file mode 100644 index 000000000..fa3c0d58d --- /dev/null +++ b/Software/Visual_Studio/Tango.ColorConversion/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Core/ExtensionMethods/ObjectExtensions.cs b/Software/Visual_Studio/Tango.Core/ExtensionMethods/ObjectExtensions.cs index ce907b57b..b5e430829 100644 --- a/Software/Visual_Studio/Tango.Core/ExtensionMethods/ObjectExtensions.cs +++ b/Software/Visual_Studio/Tango.Core/ExtensionMethods/ObjectExtensions.cs @@ -10,226 +10,229 @@ using System.Threading.Tasks; using Tango.Core.Json; using Tango.Serialization; -/// -/// Contains extension methods. -/// -public static class ObjectExtensions +namespace Tango.Core.ExtensionMethods { - private static bool _jsonSettingsSet; - /// - /// Performs shallow cloning of the object excluding generic properties.. + /// Contains extension methods. /// - /// - /// The object. - /// - public static T ShallowClone(this T obj) + public static class ObjectExtensions { - var cloned = Activator.CreateInstance(); - - foreach (var prop in typeof(T).GetProperties(BindingFlags.Public | BindingFlags.Instance).Where(x => x.SetMethod != null)) + private static bool _jsonSettingsSet; + + /// + /// Performs shallow cloning of the object excluding generic properties.. + /// + /// + /// The object. + /// + public static T ShallowClone(this T obj) { - if (!prop.PropertyType.IsGenericType) + var cloned = Activator.CreateInstance(); + + foreach (var prop in typeof(T).GetProperties(BindingFlags.Public | BindingFlags.Instance).Where(x => x.SetMethod != null)) { - prop.SetValue(cloned, prop.GetValue(obj)); + if (!prop.PropertyType.IsGenericType) + { + prop.SetValue(cloned, prop.GetValue(obj)); + } } - } - return cloned; - } + return cloned; + } - /// - /// Performs a shallow mapping to the specified object excluding generic properties. - /// - /// - /// The source. - /// The destination object. - public static void ShallowCopyTo(this T source, T destination) - { - foreach (var prop in typeof(T).GetProperties(BindingFlags.Public | BindingFlags.Instance).Where(x => x.SetMethod != null)) + /// + /// Performs a shallow mapping to the specified object excluding generic properties. + /// + /// + /// The source. + /// The destination object. + public static void ShallowCopyTo(this T source, T destination) { - if (!prop.PropertyType.IsGenericType) + foreach (var prop in typeof(T).GetProperties(BindingFlags.Public | BindingFlags.Instance).Where(x => x.SetMethod != null)) { - prop.SetValue(destination, prop.GetValue(source)); + if (!prop.PropertyType.IsGenericType) + { + prop.SetValue(destination, prop.GetValue(source)); + } } } - } - /// - /// Maps the object properties values to the destination object. - /// - /// The source. - /// The destination. - public static void MapPrimitivesTo(this object source, object destination) - { - foreach (var prop in source.GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance).Where(x => x.PropertyType.IsPrimitive)) + /// + /// Maps the object properties values to the destination object. + /// + /// The source. + /// The destination. + public static void MapPrimitivesTo(this object source, object destination) { - var desProp = destination.GetType().GetProperty(prop.Name, BindingFlags.Public | BindingFlags.Instance); - - if (desProp != null && desProp.PropertyType.IsPrimitive && desProp.SetMethod != null) + foreach (var prop in source.GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance).Where(x => x.PropertyType.IsPrimitive)) { - desProp.SetValue(destination, prop.GetValue(source)); + var desProp = destination.GetType().GetProperty(prop.Name, BindingFlags.Public | BindingFlags.Instance); + + if (desProp != null && desProp.PropertyType.IsPrimitive && desProp.SetMethod != null) + { + desProp.SetValue(destination, prop.GetValue(source)); + } } } - } - /// - /// Maps the object properties values to the destination object including strings and without assigning null string values from the source. - /// - /// The source. - /// The destination. - public static void MapPrimitivesWithStringsNoNullsTo(this object source, object destination) - { - foreach (var prop in source.GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance).Where(x => x.PropertyType.IsPrimitive || x.PropertyType == typeof(String))) + /// + /// Maps the object properties values to the destination object including strings and without assigning null string values from the source. + /// + /// The source. + /// The destination. + public static void MapPrimitivesWithStringsNoNullsTo(this object source, object destination) { - var desProp = destination.GetType().GetProperty(prop.Name, BindingFlags.Public | BindingFlags.Instance); - - if (desProp != null && (desProp.PropertyType.IsPrimitive || desProp.PropertyType == typeof(String)) && desProp.SetMethod != null) + foreach (var prop in source.GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance).Where(x => x.PropertyType.IsPrimitive || x.PropertyType == typeof(String))) { - var value = prop.GetValue(source); + var desProp = destination.GetType().GetProperty(prop.Name, BindingFlags.Public | BindingFlags.Instance); - if (desProp.PropertyType != typeof(String) || !String.IsNullOrEmpty(value as String)) + if (desProp != null && (desProp.PropertyType.IsPrimitive || desProp.PropertyType == typeof(String)) && desProp.SetMethod != null) { - desProp.SetValue(destination, value); + var value = prop.GetValue(source); + + if (desProp.PropertyType != typeof(String) || !String.IsNullOrEmpty(value as String)) + { + desProp.SetValue(destination, value); + } } } } - } - /// - /// Maps the object properties values to the destination object including strings and without assigning null string values from the source. - /// - /// The source. - /// The destination. - public static void MapPrimitivesWithStrings(this object source, object destination) - { - foreach (var prop in source.GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance).Where(x => x.PropertyType.IsPrimitive || x.PropertyType == typeof(String))) + /// + /// Maps the object properties values to the destination object including strings and without assigning null string values from the source. + /// + /// The source. + /// The destination. + public static void MapPrimitivesWithStrings(this object source, object destination) { - var desProp = destination.GetType().GetProperty(prop.Name, BindingFlags.Public | BindingFlags.Instance); - - if (desProp != null && (desProp.PropertyType.IsPrimitive || desProp.PropertyType == typeof(String)) && desProp.SetMethod != null) + foreach (var prop in source.GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance).Where(x => x.PropertyType.IsPrimitive || x.PropertyType == typeof(String))) { - var value = prop.GetValue(source); + var desProp = destination.GetType().GetProperty(prop.Name, BindingFlags.Public | BindingFlags.Instance); + + if (desProp != null && (desProp.PropertyType.IsPrimitive || desProp.PropertyType == typeof(String)) && desProp.SetMethod != null) + { + var value = prop.GetValue(source); - desProp.SetValue(destination, value); + desProp.SetValue(destination, value); + } } } - } - /// - /// Maps the object properties values to the destination object. - /// - /// The source. - /// The destination. - public static void MapPrimitivesTo(this object source, object destination, Func condition) - { - foreach (var prop in source.GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance).Where(x => x.PropertyType.IsPrimitive)) + /// + /// Maps the object properties values to the destination object. + /// + /// The source. + /// The destination. + public static void MapPrimitivesTo(this object source, object destination, Func condition) { - var desProp = destination.GetType().GetProperty(prop.Name, BindingFlags.Public | BindingFlags.Instance); - - if (desProp != null && desProp.PropertyType.IsPrimitive && desProp.SetMethod != null) + foreach (var prop in source.GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance).Where(x => x.PropertyType.IsPrimitive)) { - if (condition(prop)) + var desProp = destination.GetType().GetProperty(prop.Name, BindingFlags.Public | BindingFlags.Instance); + + if (desProp != null && desProp.PropertyType.IsPrimitive && desProp.SetMethod != null) { - desProp.SetValue(destination, prop.GetValue(source)); + if (condition(prop)) + { + desProp.SetValue(destination, prop.GetValue(source)); + } } } } - } - - /// - /// Serializes the specified object to indented json string. - /// - /// The object. - /// - public static String ToJsonString(this Object obj) - { - if (obj == null) return "null"; - if (!_jsonSettingsSet) + /// + /// Serializes the specified object to indented json string. + /// + /// The object. + /// + public static String ToJsonString(this Object obj) { - JsonConvert.DefaultSettings = (() => - { - var settings = new JsonSerializerSettings(); - settings.Converters.Add(new StringEnumConverter { CamelCaseText = false }); - settings.ContractResolver = new ProtobufContractResolver(); - return settings; - }); - - _jsonSettingsSet = true; - } + if (obj == null) return "null"; - return JsonConvert.SerializeObject(obj, Formatting.Indented); - } + if (!_jsonSettingsSet) + { + JsonConvert.DefaultSettings = (() => + { + var settings = new JsonSerializerSettings(); + settings.Converters.Add(new StringEnumConverter { CamelCaseText = false }); + settings.ContractResolver = new ProtobufContractResolver(); + return settings; + }); - /// - /// Serializes the specified object to indented json string. - /// - /// The object. - /// - public static String ToJsonString(this Object obj, params String[] ignoreProperties) - { - var settings = new JsonSerializerSettings() { ContractResolver = new DynamicContractResolver(ignoreProperties) }; - settings.Converters.Add(new StringEnumConverter { CamelCaseText = false }); - return JsonConvert.SerializeObject(obj, Formatting.Indented, settings); - } + _jsonSettingsSet = true; + } - /// - /// Serializes the specified object to indented json html string. - /// - /// The object. - /// - public static String ToHtmlJsonString(this Object obj, params String[] ignoreProperties) - { - var settings = new JsonSerializerSettings() { ContractResolver = new HtmlContractResolver(ignoreProperties) }; - settings.Converters.Add(new StringEnumConverter { CamelCaseText = false }); - return JsonConvert.SerializeObject(obj, Formatting.Indented, settings); - } + return JsonConvert.SerializeObject(obj, Formatting.Indented); + } - /// - /// Gets the property value by the specified path (e.g DateTime.Date.Days). - /// - /// The object. - /// The property path. - /// - public static Object GetPropertyValueByPath(this object obj, String propertyPath) - { - if (propertyPath != null) + /// + /// Serializes the specified object to indented json string. + /// + /// The object. + /// + public static String ToJsonString(this Object obj, params String[] ignoreProperties) { - if (propertyPath.Contains('.')) - { - string[] Split = propertyPath.Split('.'); - string RemainingProperty = propertyPath.Substring(propertyPath.IndexOf('.') + 1); - return GetPropertyValueByPath(obj.GetType().GetProperty(Split[0]).GetValue(obj, null), RemainingProperty); - } - else - return obj.GetType().GetProperty(propertyPath).GetValue(obj, null); + var settings = new JsonSerializerSettings() { ContractResolver = new DynamicContractResolver(ignoreProperties) }; + settings.Converters.Add(new StringEnumConverter { CamelCaseText = false }); + return JsonConvert.SerializeObject(obj, Formatting.Indented, settings); } - else + + /// + /// Serializes the specified object to indented json html string. + /// + /// The object. + /// + public static String ToHtmlJsonString(this Object obj, params String[] ignoreProperties) { - return obj.ToString(); + var settings = new JsonSerializerSettings() { ContractResolver = new HtmlContractResolver(ignoreProperties) }; + settings.Converters.Add(new StringEnumConverter { CamelCaseText = false }); + return JsonConvert.SerializeObject(obj, Formatting.Indented, settings); } - } - /// - /// Sets the property value by the specified path (e.g DateTime.Date.Days). - /// - /// The object. - /// The property path. - /// - public static void SetPropertyValueByPath(this object obj, String propertyPath, object value) - { - if (propertyPath != null) + /// + /// Gets the property value by the specified path (e.g DateTime.Date.Days). + /// + /// The object. + /// The property path. + /// + public static Object GetPropertyValueByPath(this object obj, String propertyPath) { - if (propertyPath.Contains('.')) + if (propertyPath != null) { - string[] Split = propertyPath.Split('.'); - string RemainingProperty = propertyPath.Substring(propertyPath.IndexOf('.') + 1); - SetPropertyValueByPath(obj.GetType().GetProperty(Split[0]).GetValue(obj, null), RemainingProperty, value); + if (propertyPath.Contains('.')) + { + string[] Split = propertyPath.Split('.'); + string RemainingProperty = propertyPath.Substring(propertyPath.IndexOf('.') + 1); + return GetPropertyValueByPath(obj.GetType().GetProperty(Split[0]).GetValue(obj, null), RemainingProperty); + } + else + return obj.GetType().GetProperty(propertyPath).GetValue(obj, null); } else { - obj.GetType().GetProperty(propertyPath).SetValue(obj, value); + return obj.ToString(); + } + } + + /// + /// Sets the property value by the specified path (e.g DateTime.Date.Days). + /// + /// The object. + /// The property path. + /// + public static void SetPropertyValueByPath(this object obj, String propertyPath, object value) + { + if (propertyPath != null) + { + if (propertyPath.Contains('.')) + { + string[] Split = propertyPath.Split('.'); + string RemainingProperty = propertyPath.Substring(propertyPath.IndexOf('.') + 1); + SetPropertyValueByPath(obj.GetType().GetProperty(Split[0]).GetValue(obj, null), RemainingProperty, value); + } + else + { + obj.GetType().GetProperty(propertyPath).SetValue(obj, value); + } } } } diff --git a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs index 401123106..61cca98ce 100644 --- a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs +++ b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs @@ -30,6 +30,7 @@ using System.IO; using Tango.Integration.Operation; using Tango.PMR.FirmwareUpgrade; using System.Diagnostics; +using Tango.Core.ExtensionMethods; namespace Tango.Emulations.Emulators { diff --git a/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeService.cs b/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeService.cs index 16a143bbc..410afd7fe 100644 --- a/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeService.cs +++ b/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeService.cs @@ -19,6 +19,7 @@ using Tango.PMR.Diagnostics; using Tango.PMR.Debugging; using System.Security.Authentication; using Tango.Settings; +using Tango.Core.ExtensionMethods; namespace Tango.Integration.ExternalBridge { diff --git a/Software/Visual_Studio/Tango.Integration/Operation/DefaultGradientGenerationConfiguration.cs b/Software/Visual_Studio/Tango.Integration/Operation/DefaultGradientGenerationConfiguration.cs index c4a8518ee..59c6441d3 100644 --- a/Software/Visual_Studio/Tango.Integration/Operation/DefaultGradientGenerationConfiguration.cs +++ b/Software/Visual_Studio/Tango.Integration/Operation/DefaultGradientGenerationConfiguration.cs @@ -8,6 +8,7 @@ using Tango.BL.ColorConversion; using Tango.BL.Entities; using Tango.BL.Enumerations; using Tango.Core; +using Tango.Core.ExtensionMethods; namespace Tango.Integration.Operation { diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs index 5b6b9b3a6..766448bcc 100644 --- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs +++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs @@ -35,6 +35,7 @@ using Tango.Integration.Logging; using Tango.Integration.JobRuns; using Tango.FirmwareUpdateLib.WPF; using Tango.FirmwareUpdateLib; +using Tango.Core.ExtensionMethods; namespace Tango.Integration.Operation { diff --git a/Software/Visual_Studio/Tango.Integration/Storage/StorageManager.cs b/Software/Visual_Studio/Tango.Integration/Storage/StorageManager.cs index 623e331d0..7db7433fa 100644 --- a/Software/Visual_Studio/Tango.Integration/Storage/StorageManager.cs +++ b/Software/Visual_Studio/Tango.Integration/Storage/StorageManager.cs @@ -8,6 +8,7 @@ using System.Text; using System.Threading.Tasks; using Tango.Core; using Tango.Core.Commands; +using Tango.Core.ExtensionMethods; using Tango.Core.Threading; using Tango.Logging; using Tango.PMR.IO; diff --git a/Software/Visual_Studio/Tango.SharedUI/Converters/DisplayMemberPathConverter.cs b/Software/Visual_Studio/Tango.SharedUI/Converters/DisplayMemberPathConverter.cs index 6e0a75df5..f195afc9c 100644 --- a/Software/Visual_Studio/Tango.SharedUI/Converters/DisplayMemberPathConverter.cs +++ b/Software/Visual_Studio/Tango.SharedUI/Converters/DisplayMemberPathConverter.cs @@ -5,6 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Data; +using Tango.Core.ExtensionMethods; namespace Tango.SharedUI.Converters { diff --git a/Software/Visual_Studio/Tango.Touch/Controls/LightTouchDataGrid.cs b/Software/Visual_Studio/Tango.Touch/Controls/LightTouchDataGrid.cs index 60ef8a49e..79e6739af 100644 --- a/Software/Visual_Studio/Tango.Touch/Controls/LightTouchDataGrid.cs +++ b/Software/Visual_Studio/Tango.Touch/Controls/LightTouchDataGrid.cs @@ -17,6 +17,7 @@ using System.Windows.Media; using System.Windows.Media.Animation; using Tango.Core.Commands; using Tango.Core.EventArguments; +using Tango.Core.ExtensionMethods; using Tango.DragAndDrop; using Tango.SharedUI.Helpers; using Tango.Touch.Components; diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchAutoComplete.cs b/Software/Visual_Studio/Tango.Touch/Controls/TouchAutoComplete.cs index 4e1ced33b..986cc55f4 100644 --- a/Software/Visual_Studio/Tango.Touch/Controls/TouchAutoComplete.cs +++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchAutoComplete.cs @@ -16,6 +16,7 @@ using System.Windows.Navigation; using System.Windows.Shapes; using Tango.Core.Commands; using Tango.Core.EventArguments; +using Tango.Core.ExtensionMethods; namespace Tango.Touch.Controls { diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchListBox.cs b/Software/Visual_Studio/Tango.Touch/Controls/TouchListBox.cs index 57afcb943..87e7717be 100644 --- a/Software/Visual_Studio/Tango.Touch/Controls/TouchListBox.cs +++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchListBox.cs @@ -17,6 +17,7 @@ using System.Windows.Navigation; using System.Windows.Shapes; using Tango.Core.Commands; using Tango.Core.EventArguments; +using Tango.Core.ExtensionMethods; namespace Tango.Touch.Controls { diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchNativeListBox.cs b/Software/Visual_Studio/Tango.Touch/Controls/TouchNativeListBox.cs index aab20778e..f05e98ccc 100644 --- a/Software/Visual_Studio/Tango.Touch/Controls/TouchNativeListBox.cs +++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchNativeListBox.cs @@ -12,6 +12,7 @@ using System.Windows.Media; using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; +using Tango.Core.ExtensionMethods; namespace Tango.Touch.Controls { diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchNotificationBar.cs b/Software/Visual_Studio/Tango.Touch/Controls/TouchNotificationBar.cs index 0f7468011..9f18ec8d4 100644 --- a/Software/Visual_Studio/Tango.Touch/Controls/TouchNotificationBar.cs +++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchNotificationBar.cs @@ -20,6 +20,7 @@ using System.Windows.Shapes; using System.Windows.Threading; using Tango.Core.Commands; using Tango.Core.EventArguments; +using Tango.Core.ExtensionMethods; namespace Tango.Touch.Controls { diff --git a/Software/Visual_Studio/Tango.UnitTesting/Pulse/Pulse_TST.cs b/Software/Visual_Studio/Tango.UnitTesting/Pulse/Pulse_TST.cs index c20994198..b643e71ec 100644 --- a/Software/Visual_Studio/Tango.UnitTesting/Pulse/Pulse_TST.cs +++ b/Software/Visual_Studio/Tango.UnitTesting/Pulse/Pulse_TST.cs @@ -8,6 +8,7 @@ using System.IO; using System.Linq; using System.Text; using System.Threading.Tasks; +using Tango.Core.ExtensionMethods; using Tango.Core.IO; using Tango.Pulse; diff --git a/Software/Visual_Studio/Tango.sln b/Software/Visual_Studio/Tango.sln index 163bff4f1..db1cf4634 100644 --- a/Software/Visual_Studio/Tango.sln +++ b/Software/Visual_Studio/Tango.sln @@ -297,6 +297,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.CoatsCatalogImporter" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.AlarmParametersGenerator", "Utilities\Tango.AlarmParametersGenerator\Tango.AlarmParametersGenerator.csproj", "{CC6D5193-434D-410F-B0F3-BE2017D86FCE}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.ColorConversion", "Tango.ColorConversion\Tango.ColorConversion.csproj", "{B4FE6485-4161-4B36-BC08-67E0B53D01B7}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution AppVeyor|Any CPU = AppVeyor|Any CPU @@ -5285,6 +5287,46 @@ Global {CC6D5193-434D-410F-B0F3-BE2017D86FCE}.Release|x64.Build.0 = Release|Any CPU {CC6D5193-434D-410F-B0F3-BE2017D86FCE}.Release|x86.ActiveCfg = Release|Any CPU {CC6D5193-434D-410F-B0F3-BE2017D86FCE}.Release|x86.Build.0 = Release|Any CPU + {B4FE6485-4161-4B36-BC08-67E0B53D01B7}.AppVeyor|Any CPU.ActiveCfg = Release|Any CPU + {B4FE6485-4161-4B36-BC08-67E0B53D01B7}.AppVeyor|Any CPU.Build.0 = Release|Any CPU + {B4FE6485-4161-4B36-BC08-67E0B53D01B7}.AppVeyor|ARM.ActiveCfg = Release|Any CPU + {B4FE6485-4161-4B36-BC08-67E0B53D01B7}.AppVeyor|ARM.Build.0 = Release|Any CPU + {B4FE6485-4161-4B36-BC08-67E0B53D01B7}.AppVeyor|ARM64.ActiveCfg = Release|Any CPU + {B4FE6485-4161-4B36-BC08-67E0B53D01B7}.AppVeyor|ARM64.Build.0 = Release|Any CPU + {B4FE6485-4161-4B36-BC08-67E0B53D01B7}.AppVeyor|x64.ActiveCfg = Release|Any CPU + {B4FE6485-4161-4B36-BC08-67E0B53D01B7}.AppVeyor|x64.Build.0 = Release|Any CPU + {B4FE6485-4161-4B36-BC08-67E0B53D01B7}.AppVeyor|x86.ActiveCfg = Release|Any CPU + {B4FE6485-4161-4B36-BC08-67E0B53D01B7}.AppVeyor|x86.Build.0 = Release|Any CPU + {B4FE6485-4161-4B36-BC08-67E0B53D01B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B4FE6485-4161-4B36-BC08-67E0B53D01B7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B4FE6485-4161-4B36-BC08-67E0B53D01B7}.Debug|ARM.ActiveCfg = Debug|Any CPU + {B4FE6485-4161-4B36-BC08-67E0B53D01B7}.Debug|ARM.Build.0 = Debug|Any CPU + {B4FE6485-4161-4B36-BC08-67E0B53D01B7}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {B4FE6485-4161-4B36-BC08-67E0B53D01B7}.Debug|ARM64.Build.0 = Debug|Any CPU + {B4FE6485-4161-4B36-BC08-67E0B53D01B7}.Debug|x64.ActiveCfg = Debug|Any CPU + {B4FE6485-4161-4B36-BC08-67E0B53D01B7}.Debug|x64.Build.0 = Debug|Any CPU + {B4FE6485-4161-4B36-BC08-67E0B53D01B7}.Debug|x86.ActiveCfg = Debug|Any CPU + {B4FE6485-4161-4B36-BC08-67E0B53D01B7}.Debug|x86.Build.0 = Debug|Any CPU + {B4FE6485-4161-4B36-BC08-67E0B53D01B7}.DefaultBuild|Any CPU.ActiveCfg = Debug|Any CPU + {B4FE6485-4161-4B36-BC08-67E0B53D01B7}.DefaultBuild|Any CPU.Build.0 = Debug|Any CPU + {B4FE6485-4161-4B36-BC08-67E0B53D01B7}.DefaultBuild|ARM.ActiveCfg = Debug|Any CPU + {B4FE6485-4161-4B36-BC08-67E0B53D01B7}.DefaultBuild|ARM.Build.0 = Debug|Any CPU + {B4FE6485-4161-4B36-BC08-67E0B53D01B7}.DefaultBuild|ARM64.ActiveCfg = Debug|Any CPU + {B4FE6485-4161-4B36-BC08-67E0B53D01B7}.DefaultBuild|ARM64.Build.0 = Debug|Any CPU + {B4FE6485-4161-4B36-BC08-67E0B53D01B7}.DefaultBuild|x64.ActiveCfg = Debug|Any CPU + {B4FE6485-4161-4B36-BC08-67E0B53D01B7}.DefaultBuild|x64.Build.0 = Debug|Any CPU + {B4FE6485-4161-4B36-BC08-67E0B53D01B7}.DefaultBuild|x86.ActiveCfg = Debug|Any CPU + {B4FE6485-4161-4B36-BC08-67E0B53D01B7}.DefaultBuild|x86.Build.0 = Debug|Any CPU + {B4FE6485-4161-4B36-BC08-67E0B53D01B7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B4FE6485-4161-4B36-BC08-67E0B53D01B7}.Release|Any CPU.Build.0 = Release|Any CPU + {B4FE6485-4161-4B36-BC08-67E0B53D01B7}.Release|ARM.ActiveCfg = Release|Any CPU + {B4FE6485-4161-4B36-BC08-67E0B53D01B7}.Release|ARM.Build.0 = Release|Any CPU + {B4FE6485-4161-4B36-BC08-67E0B53D01B7}.Release|ARM64.ActiveCfg = Release|Any CPU + {B4FE6485-4161-4B36-BC08-67E0B53D01B7}.Release|ARM64.Build.0 = Release|Any CPU + {B4FE6485-4161-4B36-BC08-67E0B53D01B7}.Release|x64.ActiveCfg = Release|Any CPU + {B4FE6485-4161-4B36-BC08-67E0B53D01B7}.Release|x64.Build.0 = Release|Any CPU + {B4FE6485-4161-4B36-BC08-67E0B53D01B7}.Release|x86.ActiveCfg = Release|Any CPU + {B4FE6485-4161-4B36-BC08-67E0B53D01B7}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -5382,12 +5424,12 @@ Global {CC6D5193-434D-410F-B0F3-BE2017D86FCE} = {5F6BBAA8-EAD0-4B18-97E5-55B4F56DD760} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - BuildVersion_UseGlobalSettings = False - BuildVersion_AssemblyInfoFilename = Properties\AssemblyInfo.cs - BuildVersion_StartDate = 2000/1/1 - BuildVersion_UpdateFileVersion = False - BuildVersion_UpdateAssemblyVersion = True - BuildVersion_BuildVersioningStyle = None.None.Increment.DeltaBaseYearDayOfYear SolutionGuid = {7986F7F4-A86A-4994-B1B6-0988D7F057B6} + BuildVersion_BuildVersioningStyle = None.None.Increment.DeltaBaseYearDayOfYear + BuildVersion_UpdateAssemblyVersion = True + BuildVersion_UpdateFileVersion = False + BuildVersion_StartDate = 2000/1/1 + BuildVersion_AssemblyInfoFilename = Properties\AssemblyInfo.cs + BuildVersion_UseGlobalSettings = False EndGlobalSection EndGlobal diff --git a/Software/Visual_Studio/Utilities/Tango.AlarmParametersGenerator/Program.cs b/Software/Visual_Studio/Utilities/Tango.AlarmParametersGenerator/Program.cs index 04d6acb5b..ac31cfb9c 100644 --- a/Software/Visual_Studio/Utilities/Tango.AlarmParametersGenerator/Program.cs +++ b/Software/Visual_Studio/Utilities/Tango.AlarmParametersGenerator/Program.cs @@ -4,6 +4,7 @@ using System.IO; using System.Linq; using System.Text; using System.Threading.Tasks; +using Tango.Core.ExtensionMethods; using Tango.Core.Helpers; using Tango.Documents; using Tango.PMR.Debugging; diff --git a/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Program.cs b/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Program.cs index 6797ac085..20b27d7d5 100644 --- a/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Program.cs +++ b/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Program.cs @@ -10,6 +10,7 @@ using Tango.Core.Helpers; using Tango.Documents; using System.Data.Entity; using System.Collections.ObjectModel; +using Tango.Core.ExtensionMethods; namespace Tango.EventsTypesGenerator { -- cgit v1.3.1 From ff09af0e3338a55c89d2846454d360e702d4e742 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Tue, 6 Aug 2019 07:43:07 +0300 Subject: Added Alpha/Beta ENV. --- .../Resources/Pulse/Sankelloff_Rol.twn | Bin 0 -> 2720855 bytes .../Tango.UnitTesting/Pulse/Pulse_TST.cs | 2 +- Software/Visual_Studio/Tango.Web/DeploymentSlot.cs | 6 +++++ .../Properties/PublishProfiles/Alpha.pubxml | 28 +++++++++++++++++++++ .../Properties/PublishProfiles/Beta.pubxml | 28 +++++++++++++++++++++ .../Publish Machine Service via FTP.pubxml | 21 ---------------- .../Tango.MachineService.csproj | 5 ++-- 7 files changed, 66 insertions(+), 24 deletions(-) create mode 100644 Software/Visual_Studio/Resources/Pulse/Sankelloff_Rol.twn create mode 100644 Software/Visual_Studio/Web/Tango.MachineService/Properties/PublishProfiles/Alpha.pubxml create mode 100644 Software/Visual_Studio/Web/Tango.MachineService/Properties/PublishProfiles/Beta.pubxml delete mode 100644 Software/Visual_Studio/Web/Tango.MachineService/Properties/PublishProfiles/Publish Machine Service via FTP.pubxml (limited to 'Software/Visual_Studio/Tango.UnitTesting') diff --git a/Software/Visual_Studio/Resources/Pulse/Sankelloff_Rol.twn b/Software/Visual_Studio/Resources/Pulse/Sankelloff_Rol.twn new file mode 100644 index 000000000..e3c96d449 Binary files /dev/null and b/Software/Visual_Studio/Resources/Pulse/Sankelloff_Rol.twn differ diff --git a/Software/Visual_Studio/Tango.UnitTesting/Pulse/Pulse_TST.cs b/Software/Visual_Studio/Tango.UnitTesting/Pulse/Pulse_TST.cs index b643e71ec..19afb93d4 100644 --- a/Software/Visual_Studio/Tango.UnitTesting/Pulse/Pulse_TST.cs +++ b/Software/Visual_Studio/Tango.UnitTesting/Pulse/Pulse_TST.cs @@ -73,7 +73,7 @@ namespace Tango.UnitTesting.Pulse [TestMethod] public void Read_Pulse_Sample_File() { - String sampleFile = Path.Combine(Helper.GetResourcePath(), "Pulse", "New twine gradients.TWN"); + String sampleFile = Path.Combine(Helper.GetResourcePath(), "Pulse", "Sankelloff_Rol.twn"); TwnFile twnFile = TwnFile.FromFile(sampleFile); var imgFile = TemporaryManager.Default.CreateFile(".png"); diff --git a/Software/Visual_Studio/Tango.Web/DeploymentSlot.cs b/Software/Visual_Studio/Tango.Web/DeploymentSlot.cs index 6531adb64..0e470a735 100644 --- a/Software/Visual_Studio/Tango.Web/DeploymentSlot.cs +++ b/Software/Visual_Studio/Tango.Web/DeploymentSlot.cs @@ -18,6 +18,12 @@ namespace Tango.Web [Description("Process")] [DeploymentSlotAddress("https://machineservice-process.twine-srv.com")] PROCESS, + [Description("Alpha")] + [DeploymentSlotAddress("https://machineservice-alpha.twine-srv.com")] + ALPHA, + [Description("Beta")] + [DeploymentSlotAddress("https://machineservice-beta.twine-srv.com")] + BETA, [Description("Staging")] [DeploymentSlotAddress("https://machineservice-stage.twine-srv.com")] STAGE, diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Properties/PublishProfiles/Alpha.pubxml b/Software/Visual_Studio/Web/Tango.MachineService/Properties/PublishProfiles/Alpha.pubxml new file mode 100644 index 000000000..3632deaac --- /dev/null +++ b/Software/Visual_Studio/Web/Tango.MachineService/Properties/PublishProfiles/Alpha.pubxml @@ -0,0 +1,28 @@ + + + + + MSDeploy + /subscriptions/10c8aa60-3b15-4e0d-b412-6aeef90e5e91/resourceGroups/Tango/providers/Microsoft.Web/sites/machineservice-alpha-beta/slots/MachineService-ALPHA + Tango + AzureWebSite + Release + Any CPU + http://machineservice-alpha-beta-machineservice-alpha.azurewebsites.net + True + False + machineservice-alpha-beta-machineservice-alpha.scm.azurewebsites.net:443 + machineservice-alpha-beta__MachineService-ALPHA + + True + False + WMSVC + True + $machineservice-alpha-beta__MachineService-ALPHA + <_SavePWD>True + <_DestinationType>AzureWebSite + + \ No newline at end of file diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Properties/PublishProfiles/Beta.pubxml b/Software/Visual_Studio/Web/Tango.MachineService/Properties/PublishProfiles/Beta.pubxml new file mode 100644 index 000000000..e02abdacc --- /dev/null +++ b/Software/Visual_Studio/Web/Tango.MachineService/Properties/PublishProfiles/Beta.pubxml @@ -0,0 +1,28 @@ + + + + + MSDeploy + /subscriptions/10c8aa60-3b15-4e0d-b412-6aeef90e5e91/resourceGroups/Tango/providers/Microsoft.Web/sites/machineservice-alpha-beta/slots/MachineService-BETA + Tango + AzureWebSite + Release + Any CPU + http://machineservice-alpha-beta-machineservice-beta.azurewebsites.net + True + False + machineservice-alpha-beta-machineservice-beta.scm.azurewebsites.net:443 + machineservice-alpha-beta__MachineService-BETA + + True + False + WMSVC + True + $machineservice-alpha-beta__MachineService-BETA + <_SavePWD>True + <_DestinationType>AzureWebSite + + \ No newline at end of file diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Properties/PublishProfiles/Publish Machine Service via FTP.pubxml b/Software/Visual_Studio/Web/Tango.MachineService/Properties/PublishProfiles/Publish Machine Service via FTP.pubxml deleted file mode 100644 index bd9a693e0..000000000 --- a/Software/Visual_Studio/Web/Tango.MachineService/Properties/PublishProfiles/Publish Machine Service via FTP.pubxml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - FTP - Release - Any CPU - - True - False - twine01 - True - True - MachineService - PublishFTP|Roy - <_SavePWD>False - - \ No newline at end of file diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj b/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj index 52ecba507..f6040c5b1 100644 --- a/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj +++ b/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj @@ -313,6 +313,8 @@ + + @@ -381,7 +383,6 @@ - @@ -417,7 +418,7 @@ False - + -- cgit v1.3.1