From bfcc978160dfdc00256cbbe11551cd32be459dda Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Tue, 4 May 2021 05:54:03 +0300 Subject: Machine Manager Module !! --- .../MachineStudio/Tango.MachineStudio.UI/App.xaml.cs | 15 +++++++++++++++ .../Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj | 16 ++++++++++++++-- .../MachineStudio/Tango.MachineStudio.UI/packages.config | 3 +++ 3 files changed, 32 insertions(+), 2 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI') diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs index 7eab5066a..9f98b1897 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs @@ -93,6 +93,21 @@ namespace Tango.MachineStudio.UI //add current theme MachineStudioTheme wTheme = settings.Theme; + try + { + Z.EntityFramework.Extensions.LicenseManager.AddLicense("4578;101-twine-s.com", "9d23b66f-1101-b253-7f8a-59ae011b2ee8"); + + string licenseErrorMessage; + if (!Z.EntityFramework.Extensions.LicenseManager.ValidateLicense(out licenseErrorMessage)) + { + throw new Exception(licenseErrorMessage); + } + } + catch (Exception ex) + { + LogManager.Log(ex, "Error performing EF extensions license setup."); + } + base.OnStartup(e); exceptionTrapper = new WpfGlobalExceptionTrapper(); diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj index cd4eb4dd3..6764a34b4 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj @@ -127,6 +127,15 @@ + + ..\..\packages\Z.EntityFramework.Extensions.5.1.6\lib\net45\Z.EntityFramework.Extensions.dll + + + ..\..\packages\Z.EntityFramework.Plus.EF6.5.1.6\lib\net45\Z.EntityFramework.Plus.EF6.dll + + + ..\..\packages\Z.Expressions.Eval.4.0.27\lib\net45\Z.Expressions.Eval.dll + @@ -494,6 +503,10 @@ {d0ce8122-077d-42a2-9490-028ae4769b52} Tango.MachineStudio.MachineDesigner + + {6c784296-ccf9-469c-a7c1-4c13305e1203} + Tango.MachineStudio.MachineManager + {d0186ac0-0fcf-4d3b-9619-54812b6e524b} Tango.MachineStudio.RML @@ -526,7 +539,6 @@ {cb0b0aa2-bb24-4bca-a720-45e397684e12} Tango.MachineStudio.Common - {E9528353-7D41-4AA8-BBAC-D65B7FE3A0D6} @@ -696,7 +708,7 @@ if $(ConfigurationName) == Release RD /S /Q "$(TargetDir)lib\" - + \ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/packages.config b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/packages.config index 693812850..6e38532a5 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/packages.config +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/packages.config @@ -22,4 +22,7 @@ + + + \ No newline at end of file -- cgit v1.3.1