diff --git a/Jumoo.uSync.BackOffice/Controllers/uSyncBackOfficeApiController.cs b/Jumoo.uSync.BackOffice/Controllers/uSyncBackOfficeApiController.cs index bbcfdb24..7af13834 100644 --- a/Jumoo.uSync.BackOffice/Controllers/uSyncBackOfficeApiController.cs +++ b/Jumoo.uSync.BackOffice/Controllers/uSyncBackOfficeApiController.cs @@ -5,6 +5,8 @@ using System.Text; using System.Threading.Tasks; using System.Web.Http; +using Umbraco.Core; +using Umbraco.Core.Logging; using Umbraco.Web.Editors; using Umbraco.Web.Mvc; using Umbraco.Web.WebApi; @@ -47,10 +49,25 @@ public IEnumerable Import(bool force) [HttpGet] public BackOfficeSettings GetSettings() { + string addOnString = ""; + + var types = TypeFinder.FindClassesOfType(); + foreach (var t in types) + { + var typeInstance = Activator.CreateInstance(t) as IuSyncAddOn; + if (typeInstance != null) + { + LogHelper.Debug("Loading AddOn Versions: {0}", () => typeInstance.GetVersionInfo()); + addOnString = string.Format("{0} [{1}]", addOnString, typeInstance.GetVersionInfo()); + } + } + + var settings = new BackOfficeSettings() { backOfficeVersion = uSyncBackOfficeContext.Instance.Version, coreVersion = uSyncCoreContext.Instance.Version, + addOns = addOnString, settings = uSyncBackOfficeContext.Instance.Configuration.Settings, }; @@ -97,6 +114,12 @@ public class BackOfficeSettings { public string backOfficeVersion { get; set; } public string coreVersion { get; set; } + public string addOns { get; set; } public uSyncBackOfficeSettings settings { get; set; } } + + public interface IuSyncAddOn + { + string GetVersionInfo(); + } } diff --git a/Jumoo.uSync.Content/ContentEdition.cs b/Jumoo.uSync.Content/ContentEdition.cs new file mode 100644 index 00000000..0531eb72 --- /dev/null +++ b/Jumoo.uSync.Content/ContentEdition.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +using Jumoo.uSync.BackOffice.Controllers; + +namespace Jumoo.uSync.Content +{ + public class ContentEdition : IuSyncAddOn + { + public string GetVersionInfo() + { + return string.Format("uSync.Content: {0}", typeof(Jumoo.uSync.Content.ContentEdition) + .Assembly.GetName().Version.ToString()); + } + } +} diff --git a/Jumoo.uSync.Content/Jumoo.uSync.Content.csproj b/Jumoo.uSync.Content/Jumoo.uSync.Content.csproj index b5d9e132..df5dcda7 100644 --- a/Jumoo.uSync.Content/Jumoo.uSync.Content.csproj +++ b/Jumoo.uSync.Content/Jumoo.uSync.Content.csproj @@ -275,6 +275,7 @@ + diff --git a/Jumoo.uSync.Content/Properties/AssemblyInfo.cs b/Jumoo.uSync.Content/Properties/AssemblyInfo.cs index 12bba6d3..b0a5c634 100644 --- a/Jumoo.uSync.Content/Properties/AssemblyInfo.cs +++ b/Jumoo.uSync.Content/Properties/AssemblyInfo.cs @@ -32,4 +32,4 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.1.1.740")] +[assembly: AssemblyVersion("3.1.2.740")] diff --git a/Jumoo.uSync.Content/package.xml b/Jumoo.uSync.Content/package.xml index 0afb5612..74fe9837 100644 --- a/Jumoo.uSync.Content/package.xml +++ b/Jumoo.uSync.Content/package.xml @@ -10,7 +10,7 @@ uSync.ContentEdition - 3.1.0.740 + 3.1.2.740 MIT License http://jumoo.uk/uSync @@ -24,7 +24,7 @@ http://jumoo.uk -