aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/Web/Tango.MachineService
diff options
context:
space:
mode:
authorAvi Levkovich <avi@twine-s.com>2020-09-30 12:02:45 +0300
committerAvi Levkovich <avi@twine-s.com>2020-09-30 12:02:45 +0300
commit5ba1c2b05033d2ffddf394dd1ed7067eaff1c5bc (patch)
tree8f32c9ab05518429e3b6a52e78b82229f276397f /Software/Visual_Studio/Web/Tango.MachineService
parentb2420e1b64c155020bd8b9355ea1135f6e4a9b36 (diff)
parent4748b626794f346d6c7989413fe76d609966cdf9 (diff)
downloadTango-5ba1c2b05033d2ffddf394dd1ed7067eaff1c5bc.tar.gz
Tango-5ba1c2b05033d2ffddf394dd1ed7067eaff1c5bc.zip
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/Web/Tango.MachineService')
-rw-r--r--Software/Visual_Studio/Web/Tango.MachineService/Global.asax.cs15
-rw-r--r--Software/Visual_Studio/Web/Tango.MachineService/Properties/AssemblyInfo.cs2
2 files changed, 16 insertions, 1 deletions
diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Global.asax.cs b/Software/Visual_Studio/Web/Tango.MachineService/Global.asax.cs
index 47ef6cc10..9a768eb1d 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Global.asax.cs
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Global.asax.cs
@@ -25,6 +25,21 @@ namespace Tango.MachineService
BundleConfig.RegisterBundles(BundleTable.Bundles);
GlobalConfiguration.Configuration.IncludeErrorDetailPolicy = IncludeErrorDetailPolicy.Always;
+
+ 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.Default.Log(ex, "Error performing EF extensions license setup.");
+ }
}
}
}
diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Web/Tango.MachineService/Properties/AssemblyInfo.cs
index 80b01d98e..efa53fcdd 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Properties/AssemblyInfo.cs
@@ -24,4 +24,4 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("3.0.3.0")]
+[assembly: AssemblyVersion("3.0.4.0")]