From af694b7e2fe8079f52b4e8a0e6fbc73b2f55d092 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joanna=20Boro=C5=84?= Date: Mon, 22 May 2023 13:46:11 +0200 Subject: [PATCH 01/14] Update SimpleInjector to 4.2.0 --- .../Unic.Flex.SimpleInjectorIoC.csproj | 16 ++++++---------- src/Unic.Flex.SimpleInjectorIoC/Web.config | 4 ++++ src/Unic.Flex.SimpleInjectorIoC/packages.config | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/Unic.Flex.SimpleInjectorIoC/Unic.Flex.SimpleInjectorIoC.csproj b/src/Unic.Flex.SimpleInjectorIoC/Unic.Flex.SimpleInjectorIoC.csproj index 0b7d5144..ec1b04e3 100644 --- a/src/Unic.Flex.SimpleInjectorIoC/Unic.Flex.SimpleInjectorIoC.csproj +++ b/src/Unic.Flex.SimpleInjectorIoC/Unic.Flex.SimpleInjectorIoC.csproj @@ -70,15 +70,14 @@ ..\..\packages\MvcMailer.4.5\lib\45\Mvc.Mailer.dll True - - ..\..\packages\SimpleInjector.3.1.2\lib\net45\SimpleInjector.dll + + ..\..\packages\SimpleInjector.4.2.0\lib\net45\SimpleInjector.dll - - ..\..\packages\SimpleInjector.Extensions.LifetimeScoping.3.1.2\lib\net40-client\SimpleInjector.Extensions.LifetimeScoping.dll + + ..\..\packages\SimpleInjector.Extensions.LifetimeScoping.4.0.0\lib\net40\SimpleInjector.Extensions.LifetimeScoping.dll - - ..\..\packages\SimpleInjector.Integration.Web.3.1.2\lib\net40\SimpleInjector.Integration.Web.dll - True + + ..\..\packages\SimpleInjector.Integration.Web.4.2.0\lib\net40\SimpleInjector.Integration.Web.dll ..\..\packages\Sitecore.Kernel.9.2.0\lib\net471\Sitecore.Kernel.dll @@ -145,9 +144,6 @@ - - - Designer diff --git a/src/Unic.Flex.SimpleInjectorIoC/Web.config b/src/Unic.Flex.SimpleInjectorIoC/Web.config index 6e9c43d4..01a5bfe2 100644 --- a/src/Unic.Flex.SimpleInjectorIoC/Web.config +++ b/src/Unic.Flex.SimpleInjectorIoC/Web.config @@ -38,6 +38,10 @@ + + + + diff --git a/src/Unic.Flex.SimpleInjectorIoC/packages.config b/src/Unic.Flex.SimpleInjectorIoC/packages.config index 8cf5e0cc..2fa13bef 100644 --- a/src/Unic.Flex.SimpleInjectorIoC/packages.config +++ b/src/Unic.Flex.SimpleInjectorIoC/packages.config @@ -10,9 +10,9 @@ - - - + + + From ec47b039568ea080a9ecb79d789ba362b367a1f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joanna=20Boro=C5=84?= Date: Mon, 22 May 2023 13:53:08 +0200 Subject: [PATCH 02/14] Remove Analytics releated code --- .../Analytics/AnalyticsService.cs | 64 ------ .../Analytics/IAnalyticsService.cs | 18 -- .../IMarketingAutomationContactService.cs | 21 -- .../MarketingAutomationContactService.cs | 135 ------------- src/Unic.Flex.Core/Unic.Flex.Core.csproj | 18 -- .../Utilities/ITrackerWrapper.cs | 9 - .../Utilities/TrackerWrapper.cs | 17 -- src/Unic.Flex.Core/packages.config | 4 - .../Plugs/SavePlugs/RegisterGoal.cs | 61 +----- .../LoadContactEmailAddressAction.cs | 7 +- .../Rules/LoadRules/LoadContactIdAction.cs | 6 +- .../LoadRules/LoadFromContactFieldAction.cs | 7 +- .../LoadRules/LoadSimpleContactFieldAction.cs | 7 +- .../Rules/SaveRules/IdentifyContactAction.cs | 10 +- .../Rules/SaveRules/SaveContactEmailAction.cs | 12 +- .../Rules/SaveRules/SaveContactFieldAction.cs | 11 +- .../Rules/SaveRules/SaveLanguageAction.cs | 12 +- .../SaveRules/SaveSimpleContactFieldAction.cs | 11 +- .../Unic.Flex.Implementation.csproj | 9 - src/Unic.Flex.Implementation/packages.config | 3 - .../Unic.Flex.Integration.Website.csproj | 3 - .../sitecore_services/admin/FlushSession.aspx | 41 ---- .../sitecore_services/admin/Identify.aspx | 98 --------- .../sitecore_services/admin/ViewContact.aspx | 186 ------------------ src/Unic.Flex.NinjectIoC/Config.cs | 6 - src/Unic.Flex.SimpleInjectorIoC/Config.cs | 8 - 26 files changed, 14 insertions(+), 770 deletions(-) delete mode 100644 src/Unic.Flex.Core/Analytics/AnalyticsService.cs delete mode 100644 src/Unic.Flex.Core/Analytics/IAnalyticsService.cs delete mode 100644 src/Unic.Flex.Core/MarketingAutomation/IMarketingAutomationContactService.cs delete mode 100644 src/Unic.Flex.Core/MarketingAutomation/MarketingAutomationContactService.cs delete mode 100644 src/Unic.Flex.Core/Utilities/ITrackerWrapper.cs delete mode 100644 src/Unic.Flex.Core/Utilities/TrackerWrapper.cs delete mode 100644 src/Unic.Flex.Integration.Website/sitecore_services/admin/FlushSession.aspx delete mode 100644 src/Unic.Flex.Integration.Website/sitecore_services/admin/Identify.aspx delete mode 100644 src/Unic.Flex.Integration.Website/sitecore_services/admin/ViewContact.aspx diff --git a/src/Unic.Flex.Core/Analytics/AnalyticsService.cs b/src/Unic.Flex.Core/Analytics/AnalyticsService.cs deleted file mode 100644 index 3d186a33..00000000 --- a/src/Unic.Flex.Core/Analytics/AnalyticsService.cs +++ /dev/null @@ -1,64 +0,0 @@ -namespace Unic.Flex.Core.Analytics -{ - using System; - using Sitecore.Analytics; - using Sitecore.Analytics.Data; - using Unic.Flex.Core.Logging; - using Unic.Flex.Model.Analytics; - - /// - /// Analytics related actions. - /// - public class AnalyticsService : IAnalyticsService - { - /// - /// The logger - /// - private readonly ILogger logger; - - /// - /// Initializes a new instance of the class. - /// - /// The logger. - public AnalyticsService(ILogger logger) - { - this.logger = logger; - } - - /// - /// Registers the goal. - /// - /// The goal. - /// The item identifier. - public virtual void RegisterGoal(Goal goal, Guid itemId) - { - // check if analytics is enabled - if (!Tracker.IsActive) - { - this.logger.Info("Analytics is disabled, therefor the Goal has not been triggered", this); - return; - } - - // check if we have a valid page - if (Tracker.Current == null - || Tracker.Current.Session == null - || Tracker.Current.Session.Interaction == null - || Tracker.Current.Session.Interaction.CurrentPage == null) - { - this.logger.Error("No valid tracker or session available, therefor the Goal has not been triggered", this); - return; - } - - // generate the data - var pageEventData = new PageEventData("Flex", goal.InnerItem.ID.ToGuid()) - { - ItemId = itemId, - Data = "Form submit completed", - Text = goal.Description - }; - - // register the event - Tracker.Current.Session.Interaction.CurrentPage.Register(pageEventData); - } - } -} diff --git a/src/Unic.Flex.Core/Analytics/IAnalyticsService.cs b/src/Unic.Flex.Core/Analytics/IAnalyticsService.cs deleted file mode 100644 index ae06226c..00000000 --- a/src/Unic.Flex.Core/Analytics/IAnalyticsService.cs +++ /dev/null @@ -1,18 +0,0 @@ -namespace Unic.Flex.Core.Analytics -{ - using System; - using Unic.Flex.Model.Analytics; - - /// - /// Analytics specific actions. - /// - public interface IAnalyticsService - { - /// - /// Registers the goal. - /// - /// The goal. - /// The item identifier. - void RegisterGoal(Goal goal, Guid itemId); - } -} diff --git a/src/Unic.Flex.Core/MarketingAutomation/IMarketingAutomationContactService.cs b/src/Unic.Flex.Core/MarketingAutomation/IMarketingAutomationContactService.cs deleted file mode 100644 index d3a778ae..00000000 --- a/src/Unic.Flex.Core/MarketingAutomation/IMarketingAutomationContactService.cs +++ /dev/null @@ -1,21 +0,0 @@ -namespace Unic.Flex.Core.MarketingAutomation -{ - using System; - - public interface IMarketingAutomationContactService - { - object GetContactValue(Guid contactFieldDefinitionId); - - void SetContactValue(Guid contactFieldDefinitionId, object value); - - void SetContactValue(string simpleFieldName, string value); - - object GetContactValue(string simpleFieldName); - - string GetEmailAddress(string name); - - void SetEmailAddress(string name, string email); - - void IdentifyContact(string name); - } -} \ No newline at end of file diff --git a/src/Unic.Flex.Core/MarketingAutomation/MarketingAutomationContactService.cs b/src/Unic.Flex.Core/MarketingAutomation/MarketingAutomationContactService.cs deleted file mode 100644 index 3f2ade56..00000000 --- a/src/Unic.Flex.Core/MarketingAutomation/MarketingAutomationContactService.cs +++ /dev/null @@ -1,135 +0,0 @@ -namespace Unic.Flex.Core.MarketingAutomation -{ - using System; - using System.Reflection; - using Glass.Mapper.Sc; - using Glass.Mapper.Sc.Web; - using Model.MarketingAutomation; - using Sitecore.Analytics.Model.Entities; - using Sitecore.Analytics.Rules.Conditions; - using Sitecore.Analytics.Tracking; - using Sitecore.Reflection; - using Utilities; - - public class MarketingAutomationContactService : IMarketingAutomationContactService - { - private readonly IRequestContext requestContext; - private readonly ITrackerWrapper trackerWrapper; - - public MarketingAutomationContactService(IRequestContext requestContext, ITrackerWrapper trackerWrapper) - { - this.requestContext = requestContext; - this.trackerWrapper = trackerWrapper; - } - - public object GetContactValue(Guid contactFieldDefinitionId) - { - var options = new GetItemByIdOptions(contactFieldDefinitionId) - { - VersionCount = false - }; - var contactFieldDefinition = this.requestContext.SitecoreService.GetItem(options); - if (contactFieldDefinition == null) return null; - - var contactFacetDefinition = contactFieldDefinition.Facet; - if (contactFacetDefinition == null) return null; - - var facetType = ReflectionUtil.GetTypeInfo(contactFacetDefinition.Type); - var facet = this.GetFacet(facetType, contactFacetDefinition); - - var fieldProperty = facetType.GetProperty(contactFieldDefinition.FieldName, - BindingFlags.Public | BindingFlags.Instance); - if (fieldProperty == null) return null; - - return fieldProperty.GetValue(facet); - } - - public string GetEmailAddress(string name) - { - return this.GetEmailAddressEntry(name)?.SmtpAddress; - } - - private IEmailAddress GetEmailAddressEntry(string name) - { - var contact = this.trackerWrapper.GetCurrentTracker().Contact; - var entries = this.GetEmailAdresses(contact).Entries; - - if (entries.Contains(name)) - { - return entries[name]; - } - - return null; - } - - public void SetEmailAddress(string name, string email) - { - var contact = this.trackerWrapper.GetCurrentTracker().Contact; - - var entry = this.GetEmailAddressEntry(name); - if (entry == null) - { - entry = this.GetEmailAdresses(contact).Entries.Create(name); - } - entry.SmtpAddress = email; - } - - public void IdentifyContact(string identifier) - { - var hash = SecurityUtil.GenerateHash(identifier); - - var tracker = this.trackerWrapper.GetCurrentTracker(); - // Using "xDB.Tracker" as Source Identifier - tracker.Session.IdentifyAs(Sitecore.Analytics.XConnect.DataAccess.Constants.IdentifierSource, hash); - } - - private IContactEmailAddresses GetEmailAdresses(Contact contact) - { - return contact.GetFacet("Emails"); - } - - public void SetContactValue(Guid contactFieldDefinitionId, object value) - { - var options = new GetItemByIdOptions(contactFieldDefinitionId) - { - VersionCount = false - }; - var contactFieldDefinition = this.requestContext.SitecoreService.GetItem(options); - if (contactFieldDefinition == null) return; - - var contactFacetDefinition = contactFieldDefinition.Facet; - if (contactFacetDefinition == null) return; - - var facetType = ReflectionUtil.GetTypeInfo(contactFacetDefinition.Type); - var facet = this.GetFacet(facetType, contactFacetDefinition); - - var fieldProperty = facetType.GetProperty(contactFieldDefinition.FieldName, - BindingFlags.Public | BindingFlags.Instance); - if (fieldProperty == null) return; - - fieldProperty.SetValue(facet, value); - } - - public void SetContactValue(string contactFieldName, string value) - { - var contact = this.trackerWrapper.GetCurrentTracker().Contact; - contact.Extensions.SimpleValues[contactFieldName] = value; - } - - public object GetContactValue(string simpleFieldName) - { - var contact = this.trackerWrapper.GetCurrentTracker().Contact; - return contact.Extensions.SimpleValues[simpleFieldName]; - } - - private object GetFacet(Type facetType, ContactFacetDefinition contactFacetDefinition) - { - var contact = this.trackerWrapper.GetCurrentTracker().Contact; - if (contact == null) return null; - - var getFacet = typeof(Contact).GetMethod(nameof(contact.GetFacet)); - var getFacetGeneric = getFacet.MakeGenericMethod(facetType); - return getFacetGeneric.Invoke(contact, new object[] { contactFacetDefinition.FacetName }); - } - } -} \ No newline at end of file diff --git a/src/Unic.Flex.Core/Unic.Flex.Core.csproj b/src/Unic.Flex.Core/Unic.Flex.Core.csproj index 20112d5c..80c64383 100644 --- a/src/Unic.Flex.Core/Unic.Flex.Core.csproj +++ b/src/Unic.Flex.Core/Unic.Flex.Core.csproj @@ -73,18 +73,6 @@ ..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll - - ..\..\packages\Sitecore.Analytics.9.2.0\lib\net471\Sitecore.Analytics.dll - - - ..\..\packages\Sitecore.Analytics.Core.9.2.0\lib\net471\Sitecore.Analytics.Core.dll - - - ..\..\packages\Sitecore.Analytics.Model.9.2.0\lib\net471\Sitecore.Analytics.Model.dll - - - ..\..\packages\Sitecore.Analytics.XConnect.9.2.0\lib\net471\Sitecore.Analytics.XConnect.dll - ..\..\packages\Sitecore.Kernel.9.2.0\lib\net471\Sitecore.Kernel.dll @@ -143,8 +131,6 @@ - - @@ -181,8 +167,6 @@ - - @@ -210,10 +194,8 @@ - - diff --git a/src/Unic.Flex.Core/Utilities/ITrackerWrapper.cs b/src/Unic.Flex.Core/Utilities/ITrackerWrapper.cs deleted file mode 100644 index 6b650d45..00000000 --- a/src/Unic.Flex.Core/Utilities/ITrackerWrapper.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Unic.Flex.Core.Utilities -{ - using Sitecore.Analytics; - - public interface ITrackerWrapper - { - ITracker GetCurrentTracker(); - } -} diff --git a/src/Unic.Flex.Core/Utilities/TrackerWrapper.cs b/src/Unic.Flex.Core/Utilities/TrackerWrapper.cs deleted file mode 100644 index 5b82d150..00000000 --- a/src/Unic.Flex.Core/Utilities/TrackerWrapper.cs +++ /dev/null @@ -1,17 +0,0 @@ -namespace Unic.Flex.Core.Utilities -{ - using Sitecore.Analytics; - - public class TrackerWrapper : ITrackerWrapper - { - public ITracker GetCurrentTracker() - { - if (Tracker.Current == null) - { - Tracker.StartTracking(); - } - - return Tracker.Current; - } - } -} diff --git a/src/Unic.Flex.Core/packages.config b/src/Unic.Flex.Core/packages.config index 01e297dd..5461a86f 100644 --- a/src/Unic.Flex.Core/packages.config +++ b/src/Unic.Flex.Core/packages.config @@ -15,10 +15,6 @@ - - - - diff --git a/src/Unic.Flex.Implementation/Plugs/SavePlugs/RegisterGoal.cs b/src/Unic.Flex.Implementation/Plugs/SavePlugs/RegisterGoal.cs index 17454b52..4a4aad76 100644 --- a/src/Unic.Flex.Implementation/Plugs/SavePlugs/RegisterGoal.cs +++ b/src/Unic.Flex.Implementation/Plugs/SavePlugs/RegisterGoal.cs @@ -1,68 +1,17 @@ namespace Unic.Flex.Implementation.Plugs.SavePlugs { using Glass.Mapper.Sc.Configuration.Attributes; - using Sitecore.Diagnostics; - using Unic.Flex.Core.Analytics; - using Unic.Flex.Model.Analytics; - using Unic.Flex.Model.Forms; - using Unic.Flex.Model.GlassExtensions.Attributes; - using Unic.Flex.Model.Plugs; + using Model.Forms; + using Model.Plugs; + - /// - /// Save plug to register a goal in the analytics - /// [SitecoreType(TemplateId = "{9A7F5FA1-E267-4BF2-8D3C-4D487792B636}")] public class RegisterGoal : SavePlugBase { - /// - /// The analytics service - /// - private readonly IAnalyticsService analyticsService; - - /// - /// Initializes a new instance of the class. - /// - /// The analytics service. - public RegisterGoal(IAnalyticsService analyticsService) - { - this.analyticsService = analyticsService; - } - - /// - /// Gets a value indicating whether this plug should be executed asynchronous. - /// - /// - /// true if this plug should be executed asynchronous; otherwise, false. - /// - public override bool IsAsync - { - get - { - return false; - } - } - - /// - /// Gets or sets the goal. - /// - /// - /// The goal. - /// - [SitecoreSharedField("Goal")] - public virtual Goal Goal { get; set; } - - /// - /// Executes the save plug. - /// - /// The form. + public override bool IsAsync { get; } public override void Execute(IForm form) { - Assert.ArgumentNotNull(form, "form"); - - if (this.Goal != null) - { - this.analyticsService.RegisterGoal(this.Goal, Sitecore.Context.Item.ID.Guid); - } + throw new System.NotImplementedException(); } } } diff --git a/src/Unic.Flex.Implementation/Rules/LoadRules/LoadContactEmailAddressAction.cs b/src/Unic.Flex.Implementation/Rules/LoadRules/LoadContactEmailAddressAction.cs index 2f87b649..bb9cdf98 100644 --- a/src/Unic.Flex.Implementation/Rules/LoadRules/LoadContactEmailAddressAction.cs +++ b/src/Unic.Flex.Implementation/Rules/LoadRules/LoadContactEmailAddressAction.cs @@ -1,18 +1,13 @@ namespace Unic.Flex.Implementation.Rules.LoadRules { - using Core.DependencyInjection; - using Core.MarketingAutomation; using Sitecore.Rules; public class LoadContactEmailAddressAction : BaseFlexLoadAction where T : RuleContext { - public string EmailAddressName { get; set; } - protected override object GetValue() { - var marketingAutomationContactService = DependencyResolver.Resolve(); - return marketingAutomationContactService.GetEmailAddress(this.EmailAddressName); + throw new System.NotImplementedException(); } } } diff --git a/src/Unic.Flex.Implementation/Rules/LoadRules/LoadContactIdAction.cs b/src/Unic.Flex.Implementation/Rules/LoadRules/LoadContactIdAction.cs index 896c86ec..ba0f9139 100644 --- a/src/Unic.Flex.Implementation/Rules/LoadRules/LoadContactIdAction.cs +++ b/src/Unic.Flex.Implementation/Rules/LoadRules/LoadContactIdAction.cs @@ -1,7 +1,5 @@ namespace Unic.Flex.Implementation.Rules.LoadRules { - using System.Linq; - using Sitecore.Analytics; using Sitecore.Rules; public class LoadContactIdAction : BaseFlexLoadAction @@ -9,9 +7,7 @@ public class LoadContactIdAction : BaseFlexLoadAction { protected override object GetValue() { - return Tracker.Current.Contact?.Identifiers?.FirstOrDefault(x => - x.Identifier == Sitecore.Analytics.XConnect.DataAccess.Constants.IdentifierSource) - ?.Identifier; + throw new System.NotImplementedException(); } } } \ No newline at end of file diff --git a/src/Unic.Flex.Implementation/Rules/LoadRules/LoadFromContactFieldAction.cs b/src/Unic.Flex.Implementation/Rules/LoadRules/LoadFromContactFieldAction.cs index 9aab6ef4..60858bb4 100644 --- a/src/Unic.Flex.Implementation/Rules/LoadRules/LoadFromContactFieldAction.cs +++ b/src/Unic.Flex.Implementation/Rules/LoadRules/LoadFromContactFieldAction.cs @@ -1,19 +1,14 @@ namespace Unic.Flex.Implementation.Rules.LoadRules { using System; - using Core.DependencyInjection; - using Core.MarketingAutomation; using Sitecore.Rules; public class LoadFromContactFieldAction : BaseFlexLoadAction where T : RuleContext { - public Guid ContactField { get; set; } - protected override object GetValue() { - var marketingAutomationContactService = DependencyResolver.Resolve(); - return marketingAutomationContactService.GetContactValue(this.ContactField); + throw new NotImplementedException(); } } } \ No newline at end of file diff --git a/src/Unic.Flex.Implementation/Rules/LoadRules/LoadSimpleContactFieldAction.cs b/src/Unic.Flex.Implementation/Rules/LoadRules/LoadSimpleContactFieldAction.cs index 3d575a53..36027e70 100644 --- a/src/Unic.Flex.Implementation/Rules/LoadRules/LoadSimpleContactFieldAction.cs +++ b/src/Unic.Flex.Implementation/Rules/LoadRules/LoadSimpleContactFieldAction.cs @@ -1,18 +1,13 @@ namespace Unic.Flex.Implementation.Rules.LoadRules { - using Core.DependencyInjection; - using Core.MarketingAutomation; using Sitecore.Rules; public class LoadSimpleContactFieldAction : BaseFlexLoadAction where T : RuleContext { - public string ContactFieldName { get; set; } - protected override object GetValue() { - var marketingAutomationContactService = DependencyResolver.Resolve(); - return marketingAutomationContactService.GetContactValue(this.ContactFieldName?.Trim()); + throw new System.NotImplementedException(); } } } \ No newline at end of file diff --git a/src/Unic.Flex.Implementation/Rules/SaveRules/IdentifyContactAction.cs b/src/Unic.Flex.Implementation/Rules/SaveRules/IdentifyContactAction.cs index 50777e24..902717fc 100644 --- a/src/Unic.Flex.Implementation/Rules/SaveRules/IdentifyContactAction.cs +++ b/src/Unic.Flex.Implementation/Rules/SaveRules/IdentifyContactAction.cs @@ -1,21 +1,13 @@ namespace Unic.Flex.Implementation.Rules.SaveRules { - using Core.DependencyInjection; - using Core.MarketingAutomation; using Sitecore.Rules; public class IdentifyContactAction : BaseFlexSaveAction where T : RuleContext { - public override void Apply(T ruleContext) { - var marketingAutomationContactService = DependencyResolver.Resolve(); - - var value = this.GetFieldValue(ruleContext); - if (value == null) return; - - marketingAutomationContactService.IdentifyContact(value); + throw new System.NotImplementedException(); } } } \ No newline at end of file diff --git a/src/Unic.Flex.Implementation/Rules/SaveRules/SaveContactEmailAction.cs b/src/Unic.Flex.Implementation/Rules/SaveRules/SaveContactEmailAction.cs index d820d08c..6a5a9102 100644 --- a/src/Unic.Flex.Implementation/Rules/SaveRules/SaveContactEmailAction.cs +++ b/src/Unic.Flex.Implementation/Rules/SaveRules/SaveContactEmailAction.cs @@ -1,23 +1,13 @@ namespace Unic.Flex.Implementation.Rules.SaveRules { - using Core.DependencyInjection; - using Core.MarketingAutomation; using Sitecore.Rules; public class SaveContactEmailAction : BaseFlexSaveAction where T : RuleContext { - public string EmailAddressName { get; set; } - public override void Apply(T ruleContext) { - var marketingAutomationContactService = DependencyResolver.Resolve(); - - var value = this.GetFieldValue(ruleContext); - if (value == null) return; - - marketingAutomationContactService.SetEmailAddress(this.EmailAddressName, value); + throw new System.NotImplementedException(); } - } } diff --git a/src/Unic.Flex.Implementation/Rules/SaveRules/SaveContactFieldAction.cs b/src/Unic.Flex.Implementation/Rules/SaveRules/SaveContactFieldAction.cs index 204206c8..38b9118b 100644 --- a/src/Unic.Flex.Implementation/Rules/SaveRules/SaveContactFieldAction.cs +++ b/src/Unic.Flex.Implementation/Rules/SaveRules/SaveContactFieldAction.cs @@ -1,23 +1,14 @@ namespace Unic.Flex.Implementation.Rules.SaveRules { using System; - using Core.DependencyInjection; - using Core.MarketingAutomation; using Sitecore.Rules; public class SaveContactFieldAction : BaseFlexSaveAction where T : RuleContext { - public Guid ContactField { get; set; } - public override void Apply(T ruleContext) { - var marketingAutomationContactService = DependencyResolver.Resolve(); - - var value = this.GetFieldValue(ruleContext); - if (value == null) return; - - marketingAutomationContactService.SetContactValue(this.ContactField, value); + throw new NotImplementedException(); } } } \ No newline at end of file diff --git a/src/Unic.Flex.Implementation/Rules/SaveRules/SaveLanguageAction.cs b/src/Unic.Flex.Implementation/Rules/SaveRules/SaveLanguageAction.cs index 2b05dbcc..445779c5 100644 --- a/src/Unic.Flex.Implementation/Rules/SaveRules/SaveLanguageAction.cs +++ b/src/Unic.Flex.Implementation/Rules/SaveRules/SaveLanguageAction.cs @@ -1,24 +1,14 @@ namespace Unic.Flex.Implementation.Rules.SaveRules { using System; - using Core.Context; - using Core.DependencyInjection; - using Core.MarketingAutomation; using Sitecore.Rules; public class SaveLanguageAction : BaseFlexSaveAction where T : RuleContext { - private static readonly Guid LanguageField = Guid.Parse("{20076F81-D4D9-43FF-B79A-A255A3F8A9DF}"); - public override void Apply(T ruleContext) { - var marketingAutomationContactService = DependencyResolver.Resolve(); - var flexContext = DependencyResolver.Resolve(); - - var language = flexContext.LanguageName; - - marketingAutomationContactService.SetContactValue(LanguageField, language); + throw new NotImplementedException(); } } } \ No newline at end of file diff --git a/src/Unic.Flex.Implementation/Rules/SaveRules/SaveSimpleContactFieldAction.cs b/src/Unic.Flex.Implementation/Rules/SaveRules/SaveSimpleContactFieldAction.cs index 1dba5842..f83a5476 100644 --- a/src/Unic.Flex.Implementation/Rules/SaveRules/SaveSimpleContactFieldAction.cs +++ b/src/Unic.Flex.Implementation/Rules/SaveRules/SaveSimpleContactFieldAction.cs @@ -1,21 +1,12 @@ namespace Unic.Flex.Implementation.Rules.SaveRules { - using Core.DependencyInjection; - using Core.MarketingAutomation; using Sitecore.Rules; public class SaveSimpleContactFieldAction : BaseFlexSaveAction where T : RuleContext { - public string ContactFieldName { get; set; } - public override void Apply(T ruleContext) { - var value = this.GetFieldValue(ruleContext); - - if (value == null) return; - - var marketingAutomationContactService = DependencyResolver.Resolve(); - marketingAutomationContactService.SetContactValue(this.ContactFieldName?.Trim(), value); + throw new System.NotImplementedException(); } } } \ No newline at end of file diff --git a/src/Unic.Flex.Implementation/Unic.Flex.Implementation.csproj b/src/Unic.Flex.Implementation/Unic.Flex.Implementation.csproj index 88ef2f2e..8fbf9a62 100644 --- a/src/Unic.Flex.Implementation/Unic.Flex.Implementation.csproj +++ b/src/Unic.Flex.Implementation/Unic.Flex.Implementation.csproj @@ -66,15 +66,6 @@ ..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll - - ..\..\packages\Sitecore.Analytics.9.2.0\lib\net471\Sitecore.Analytics.dll - - - ..\..\packages\Sitecore.Analytics.Model.9.2.0\lib\net471\Sitecore.Analytics.Model.dll - - - ..\..\packages\Sitecore.Analytics.XConnect.9.2.0\lib\net471\Sitecore.Analytics.XConnect.dll - ..\..\packages\Sitecore.Kernel.9.2.0\lib\net471\Sitecore.Kernel.dll diff --git a/src/Unic.Flex.Implementation/packages.config b/src/Unic.Flex.Implementation/packages.config index f336932d..e2d7a20a 100644 --- a/src/Unic.Flex.Implementation/packages.config +++ b/src/Unic.Flex.Implementation/packages.config @@ -13,9 +13,6 @@ - - - diff --git a/src/Unic.Flex.Integration.Website/Unic.Flex.Integration.Website.csproj b/src/Unic.Flex.Integration.Website/Unic.Flex.Integration.Website.csproj index 71132a82..fb6f65d4 100644 --- a/src/Unic.Flex.Integration.Website/Unic.Flex.Integration.Website.csproj +++ b/src/Unic.Flex.Integration.Website/Unic.Flex.Integration.Website.csproj @@ -144,12 +144,9 @@ Designer - - - diff --git a/src/Unic.Flex.Integration.Website/sitecore_services/admin/FlushSession.aspx b/src/Unic.Flex.Integration.Website/sitecore_services/admin/FlushSession.aspx deleted file mode 100644 index fd198cdf..00000000 --- a/src/Unic.Flex.Integration.Website/sitecore_services/admin/FlushSession.aspx +++ /dev/null @@ -1,41 +0,0 @@ -<%@ Page Language="C#" AutoEventWireup="true" Inherits="System.Web.UI.Page" Debug="true" %> -<%@ Import Namespace="Sitecore.Sites" %> - - - - Flush session - - - -
- - - - \ No newline at end of file diff --git a/src/Unic.Flex.Integration.Website/sitecore_services/admin/Identify.aspx b/src/Unic.Flex.Integration.Website/sitecore_services/admin/Identify.aspx deleted file mode 100644 index a11dec45..00000000 --- a/src/Unic.Flex.Integration.Website/sitecore_services/admin/Identify.aspx +++ /dev/null @@ -1,98 +0,0 @@ -<%@ Page Language="C#" AutoEventWireup="true" Inherits="System.Web.UI.Page" Debug="true" %> -<%@ Import Namespace="Sitecore.Sites" %> -<%@ Import Namespace="Sitecore.Analytics" %> -<%@ Import Namespace="Sitecore.Analytics.Model.Entities" %> - - - - Identify - - - -
-

Identify

- - - -

Contact Data

-
- Firstname: - -
- Lastname: - -
- Email: - -
- Gender: - -
- - - - - \ No newline at end of file diff --git a/src/Unic.Flex.Integration.Website/sitecore_services/admin/ViewContact.aspx b/src/Unic.Flex.Integration.Website/sitecore_services/admin/ViewContact.aspx deleted file mode 100644 index 71246f4c..00000000 --- a/src/Unic.Flex.Integration.Website/sitecore_services/admin/ViewContact.aspx +++ /dev/null @@ -1,186 +0,0 @@ -<%@ Page Language="C#" AutoEventWireup="true" Inherits="System.Web.UI.Page" Debug="true" %> -<%@ Import Namespace="Sitecore.Sites" %> -<%@ Import Namespace="Sitecore.Analytics" %> -<%@ Import Namespace="Sitecore.Analytics.Tracking" %> -<%@ Import Namespace="Newtonsoft.Json" %> -<%@ Import Namespace="Newtonsoft.Json.Linq" %> -<%@ Import Namespace="Sitecore.Analytics.Model.Framework" %> -<%@ Import Namespace="Sitecore.Analytics.Automation.Data" %> - - - - View Contact - - - - - -
-

Current Interaction

- 

-        
-    
Contact

-    

-    
Key Bahaviour Cache

-    

-

-
-
-
-
-
\ No newline at end of file
diff --git a/src/Unic.Flex.NinjectIoC/Config.cs b/src/Unic.Flex.NinjectIoC/Config.cs
index 94eda369..d0c3f031 100644
--- a/src/Unic.Flex.NinjectIoC/Config.cs
+++ b/src/Unic.Flex.NinjectIoC/Config.cs
@@ -1,12 +1,10 @@
 namespace Unic.Flex.NinjectIoC
 {
-    using Core.MarketingAutomation;
     using Glass.Mapper.Sc;
     using Implementation.Services;
     using Ninject.Modules;
     using Ninject.Web.Common;
     using Unic.Configuration.Core;
-    using Unic.Flex.Core.Analytics;
     using Unic.Flex.Core.Context;
     using Unic.Flex.Core.Database;
     using Unic.Flex.Core.Definitions;
@@ -38,7 +36,6 @@ public override void Load()
             this.Bind().To();
             this.Bind().To();
             this.Bind().To();
-            this.Bind().To();
             this.Bind().To();
 
             // data access
@@ -74,9 +71,6 @@ public override void Load()
             this.Bind().To();
             this.Bind().To();
             this.Bind().To();
-            
-            // Marketing Automation
-            this.Bind();
 
             // third party classes
             this.Bind().To().InSingletonScope();
diff --git a/src/Unic.Flex.SimpleInjectorIoC/Config.cs b/src/Unic.Flex.SimpleInjectorIoC/Config.cs
index 377c7f75..61a78994 100644
--- a/src/Unic.Flex.SimpleInjectorIoC/Config.cs
+++ b/src/Unic.Flex.SimpleInjectorIoC/Config.cs
@@ -1,7 +1,5 @@
 namespace Unic.Flex.SimpleInjectorIoC
 {
-    using Core.MarketingAutomation;
-    using Core.Utilities;
     using Glass.Mapper.Sc;
     using Glass.Mapper.Sc.Web;
     using Glass.Mapper.Sc.Web.Mvc;
@@ -9,7 +7,6 @@
     using SimpleInjector;
     using SimpleInjector.Diagnostics;
     using Unic.Configuration.Core;
-    using Unic.Flex.Core.Analytics;
     using Unic.Flex.Core.Context;
     using Unic.Flex.Core.Database;
     using Unic.Flex.Core.Definitions;
@@ -42,7 +39,6 @@ public static void Initialize(Container container)
             container.Register();
             container.Register();
             container.Register();
-            container.Register();
             container.Register();
             container.Register();
             container.Register();
@@ -73,7 +69,6 @@ public static void Initialize(Container container)
 
             // helpers
             container.Register(Lifestyle.Singleton);
-            container.Register();
 
             // implementation classes
             container.Register();
@@ -82,9 +77,6 @@ public static void Initialize(Container container)
             container.Register();
             container.Register();
 
-            // Marketing Automation
-            container.Register();
-
             // third party classes
             container.Register(() => new ConfigurationManager(), Lifestyle.Singleton);
             container.Register(GetService, Lifestyle.Scoped);

From 350822fb2dd663a403c82a5bce22674ab84cd512 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joanna=20Boro=C5=84?= 
Date: Mon, 22 May 2023 15:31:40 +0200
Subject: [PATCH 03/14] Remove RegisterGoal plug

---
 .../Save Plugs Folder/__Standard Values.yml   |  1 -
 .../Double Optin/__Standard Values.yml        |  4 +-
 .../Register Goal/Form Configuration.yml      | 17 -------
 .../Register Goal/Form Configuration/Goal.yml | 44 -------------------
 .../Register Goal/__Standard Values.yml       | 14 ------
 .../Plugs/SavePlugs/RegisterGoal.cs           | 17 -------
 .../Unic.Flex.Implementation.csproj           |  1 -
 7 files changed, 1 insertion(+), 97 deletions(-)
 delete mode 100644 serialization/modules/flex/Templates/Flex/Plugs/Save Plugs/Register Goal/Form Configuration.yml
 delete mode 100644 serialization/modules/flex/Templates/Flex/Plugs/Save Plugs/Register Goal/Form Configuration/Goal.yml
 delete mode 100644 serialization/modules/flex/Templates/Flex/Plugs/Save Plugs/Register Goal/__Standard Values.yml
 delete mode 100644 src/Unic.Flex.Implementation/Plugs/SavePlugs/RegisterGoal.cs

diff --git a/serialization/modules/flex/Templates/Flex/Plugs/Save Plugs Folder/__Standard Values.yml b/serialization/modules/flex/Templates/Flex/Plugs/Save Plugs Folder/__Standard Values.yml
index 99e4e828..9cd1c693 100644
--- a/serialization/modules/flex/Templates/Flex/Plugs/Save Plugs Folder/__Standard Values.yml	
+++ b/serialization/modules/flex/Templates/Flex/Plugs/Save Plugs Folder/__Standard Values.yml	
@@ -12,7 +12,6 @@ SharedFields:
     {DF5C2C2F-4A48-4206-9DFB-0DCDE27E2233}
     {A63884CE-54F1-4134-8A29-05017D5317F6}
     {77613F9B-AC9A-4229-B97A-ACD6FBFCB252}
-    {9A7F5FA1-E267-4BF2-8D3C-4D487792B636}
     {03B67200-F3F4-49C9-ADC5-31512371825D}
     {F8239638-A672-491F-BBD4-A59CD3090C8B}
 Languages:
diff --git a/serialization/modules/flex/Templates/Flex/Plugs/Save Plugs/Double Optin/__Standard Values.yml b/serialization/modules/flex/Templates/Flex/Plugs/Save Plugs/Double Optin/__Standard Values.yml
index e7e2fbd2..7cdcd3b2 100644
--- a/serialization/modules/flex/Templates/Flex/Plugs/Save Plugs/Double Optin/__Standard Values.yml	
+++ b/serialization/modules/flex/Templates/Flex/Plugs/Save Plugs/Double Optin/__Standard Values.yml	
@@ -8,9 +8,7 @@ SharedFields:
 - ID: "1172f251-dad4-4efb-a329-0c63500e4f1e"
   Hint: __Masters
   Type: TreelistEx
-  Value: |
-    {9A7F5FA1-E267-4BF2-8D3C-4D487792B636}
-    {DF5C2C2F-4A48-4206-9DFB-0DCDE27E2233}
+  Value: "{DF5C2C2F-4A48-4206-9DFB-0DCDE27E2233}"
 Languages:
 - Language: en
   Versions:
diff --git a/serialization/modules/flex/Templates/Flex/Plugs/Save Plugs/Register Goal/Form Configuration.yml b/serialization/modules/flex/Templates/Flex/Plugs/Save Plugs/Register Goal/Form Configuration.yml
deleted file mode 100644
index e84cbd7e..00000000
--- a/serialization/modules/flex/Templates/Flex/Plugs/Save Plugs/Register Goal/Form Configuration.yml	
+++ /dev/null
@@ -1,17 +0,0 @@
----
-ID: "a8a8ea7c-0db2-42c0-9a88-1c2073cb7db3"
-Parent: "9a7f5fa1-e267-4bf2-8d3c-4d487792b636"
-Template: "e269fbb5-3750-427a-9149-7aa950b49301"
-Path: /sitecore/templates/Flex/Plugs/Save Plugs/Register Goal/Form Configuration
-DB: master
-Languages:
-- Language: en
-  Versions:
-  - Version: 1
-    Fields:
-    - ID: "25bed78c-4957-4165-998a-ca1b52f67497"
-      Hint: __Created
-      Value: 20141024T090346
-    - ID: "5dd74568-4d4b-44c1-b513-0af5f4cda34f"
-      Hint: __Created by
-      Value: sitecore\admin
diff --git a/serialization/modules/flex/Templates/Flex/Plugs/Save Plugs/Register Goal/Form Configuration/Goal.yml b/serialization/modules/flex/Templates/Flex/Plugs/Save Plugs/Register Goal/Form Configuration/Goal.yml
deleted file mode 100644
index d1b21ffc..00000000
--- a/serialization/modules/flex/Templates/Flex/Plugs/Save Plugs/Register Goal/Form Configuration/Goal.yml	
+++ /dev/null
@@ -1,44 +0,0 @@
----
-ID: "1d858478-2d47-4a6e-9fca-62f6dfd73fe1"
-Parent: "a8a8ea7c-0db2-42c0-9a88-1c2073cb7db3"
-Template: "455a3e98-a627-4b40-8035-e683a0331ac7"
-Path: /sitecore/templates/Flex/Plugs/Save Plugs/Register Goal/Form Configuration/Goal
-DB: master
-SharedFields:
-- ID: "1eb8ae32-e190-44a6-968d-ed904c794ebf"
-  Hint: Source
-  Value: /sitecore/system/Marketing Center/Goals
-- ID: "21828437-ea4b-40a1-8c61-4ce60ea41db6"
-  Hint: Validate Button
-  Type: tree list
-  Value: "{59D4EE10-627C-4FD3-A964-61A88B092CBC}"
-- ID: "337e20e1-999a-4eea-85ad-b58a03ae75cc"
-  Hint: Quick Action Bar
-  Type: tree list
-  Value: "{59D4EE10-627C-4FD3-A964-61A88B092CBC}"
-- ID: "53c432c4-7122-4e2d-8296-db4184fd1735"
-  Hint: Workflow
-  Type: tree list
-  Value: "{59D4EE10-627C-4FD3-A964-61A88B092CBC}"
-- ID: "9c903e29-650d-4af2-b9bd-526d5c14a1a5"
-  Hint: Validator Bar
-  Type: tree list
-  Value: "{59D4EE10-627C-4FD3-A964-61A88B092CBC}"
-- ID: "ab162cc0-dc80-4abf-8871-998ee5d7ba32"
-  Hint: Type
-  Value: Droptree
-- ID: "ba3f86a2-4a1c-4d78-b63d-91c2779c1b5e"
-  Hint: __Sortorder
-  Value: 100
-- ID: "be351a73-fcb0-4213-93fa-c302d8ab4f51"
-  Hint: Shared
-  Type: Checkbox
-  Value: 1
-Languages:
-- Language: en
-  Versions:
-  - Version: 1
-    Fields:
-    - ID: "25bed78c-4957-4165-998a-ca1b52f67497"
-      Hint: __Created
-      Value: 20141024T090346
diff --git a/serialization/modules/flex/Templates/Flex/Plugs/Save Plugs/Register Goal/__Standard Values.yml b/serialization/modules/flex/Templates/Flex/Plugs/Save Plugs/Register Goal/__Standard Values.yml
deleted file mode 100644
index b3a7306d..00000000
--- a/serialization/modules/flex/Templates/Flex/Plugs/Save Plugs/Register Goal/__Standard Values.yml	
+++ /dev/null
@@ -1,14 +0,0 @@
----
-ID: "ca704184-a1db-4691-b0fb-faa17058aa75"
-Parent: "9a7f5fa1-e267-4bf2-8d3c-4d487792b636"
-Template: "9a7f5fa1-e267-4bf2-8d3c-4d487792b636"
-Path: /sitecore/templates/Flex/Plugs/Save Plugs/Register Goal/__Standard Values
-DB: master
-Languages:
-- Language: en
-  Versions:
-  - Version: 1
-    Fields:
-    - ID: "25bed78c-4957-4165-998a-ca1b52f67497"
-      Hint: __Created
-      Value: 20141024T090332
diff --git a/src/Unic.Flex.Implementation/Plugs/SavePlugs/RegisterGoal.cs b/src/Unic.Flex.Implementation/Plugs/SavePlugs/RegisterGoal.cs
deleted file mode 100644
index 4a4aad76..00000000
--- a/src/Unic.Flex.Implementation/Plugs/SavePlugs/RegisterGoal.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace Unic.Flex.Implementation.Plugs.SavePlugs
-{
-    using Glass.Mapper.Sc.Configuration.Attributes;
-    using Model.Forms;
-    using Model.Plugs;
-
-
-    [SitecoreType(TemplateId = "{9A7F5FA1-E267-4BF2-8D3C-4D487792B636}")]
-    public class RegisterGoal : SavePlugBase
-    {
-        public override bool IsAsync { get; }
-        public override void Execute(IForm form)
-        {
-            throw new System.NotImplementedException();
-        }
-    }
-}
diff --git a/src/Unic.Flex.Implementation/Unic.Flex.Implementation.csproj b/src/Unic.Flex.Implementation/Unic.Flex.Implementation.csproj
index 8fbf9a62..8fb99304 100644
--- a/src/Unic.Flex.Implementation/Unic.Flex.Implementation.csproj
+++ b/src/Unic.Flex.Implementation/Unic.Flex.Implementation.csproj
@@ -152,7 +152,6 @@
     
     
     
-    
     
     
     

From ed683d89ac4ca7b606865d399fdb219de3876d43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joanna=20Boro=C5=84?= 
Date: Mon, 22 May 2023 15:32:38 +0200
Subject: [PATCH 04/14] Remove LoadContact actions

---
 ...__aaa50e12-ea98-4e8b-b7eb-d2e3aa59cf2b.yml | 24 -------------------
 .../Load Field Value from Contact_.yml        | 24 -------------------
 ...__b323c8cc-daa3-4bef-a766-96587b7e52b6.yml | 24 -------------------
 .../Load Field Value from Simple C.yml        | 24 -------------------
 .../LoadContactEmailAddressAction.cs          | 13 ----------
 .../Rules/LoadRules/LoadContactIdAction.cs    | 13 ----------
 .../LoadRules/LoadFromContactFieldAction.cs   | 14 -----------
 .../LoadRules/LoadSimpleContactFieldAction.cs | 13 ----------
 .../Unic.Flex.Implementation.csproj           |  4 ----
 9 files changed, 153 deletions(-)
 delete mode 100644 serialization/modules/flex/Rules.Elements.Load/Flex Load Rules/Load Field Value From Contact__aaa50e12-ea98-4e8b-b7eb-d2e3aa59cf2b.yml
 delete mode 100644 serialization/modules/flex/Rules.Elements.Load/Flex Load Rules/Load Field Value from Contact_.yml
 delete mode 100644 serialization/modules/flex/Rules.Elements.Load/Flex Load Rules/Load Field Value from Contact__b323c8cc-daa3-4bef-a766-96587b7e52b6.yml
 delete mode 100644 serialization/modules/flex/Rules.Elements.Load/Flex Load Rules/Load Field Value from Simple C.yml
 delete mode 100644 src/Unic.Flex.Implementation/Rules/LoadRules/LoadContactEmailAddressAction.cs
 delete mode 100644 src/Unic.Flex.Implementation/Rules/LoadRules/LoadContactIdAction.cs
 delete mode 100644 src/Unic.Flex.Implementation/Rules/LoadRules/LoadFromContactFieldAction.cs
 delete mode 100644 src/Unic.Flex.Implementation/Rules/LoadRules/LoadSimpleContactFieldAction.cs

diff --git a/serialization/modules/flex/Rules.Elements.Load/Flex Load Rules/Load Field Value From Contact__aaa50e12-ea98-4e8b-b7eb-d2e3aa59cf2b.yml b/serialization/modules/flex/Rules.Elements.Load/Flex Load Rules/Load Field Value From Contact__aaa50e12-ea98-4e8b-b7eb-d2e3aa59cf2b.yml
deleted file mode 100644
index bfa05ae5..00000000
--- a/serialization/modules/flex/Rules.Elements.Load/Flex Load Rules/Load Field Value From Contact__aaa50e12-ea98-4e8b-b7eb-d2e3aa59cf2b.yml	
+++ /dev/null
@@ -1,24 +0,0 @@
----
-ID: "aaa50e12-ea98-4e8b-b7eb-d2e3aa59cf2b"
-Parent: "4281c8f6-bc60-4780-9e11-18f62fc331ca"
-Template: "f90052a5-b4e6-4e6d-9812-1e1b88a6fcea"
-Path: /sitecore/system/Settings/Rules/Definitions/Elements/Flex Load Rules/Load Field Value From Contact Field
-DB: master
-SharedFields:
-- ID: "ff55d5a7-6d4b-4cd1-83e0-bac268073f66"
-  Hint: Type
-  Value: Unic.Flex.Implementation.Rules.LoadRules.LoadFromContactFieldAction, Unic.Flex.Implementation
-Languages:
-- Language: en
-  Versions:
-  - Version: 1
-    Fields:
-    - ID: "25bed78c-4957-4165-998a-ca1b52f67497"
-      Hint: __Created
-      Value: 20171121T135719Z
-    - ID: "5dd74568-4d4b-44c1-b513-0af5f4cda34f"
-      Hint: __Created by
-      Value: sitecore\admin
-    - ID: "eeb36a3b-40d9-4af5-862a-de257b84dca3"
-      Hint: Text
-      Value: "load the field value of the Flex field with the key [FieldKey,,,key] from the contacts field [ContactField,Tree,root=/sitecore/system/Modules/Flex/Contact Fields,contact field]"
diff --git a/serialization/modules/flex/Rules.Elements.Load/Flex Load Rules/Load Field Value from Contact_.yml b/serialization/modules/flex/Rules.Elements.Load/Flex Load Rules/Load Field Value from Contact_.yml
deleted file mode 100644
index 6aff7cc3..00000000
--- a/serialization/modules/flex/Rules.Elements.Load/Flex Load Rules/Load Field Value from Contact_.yml	
+++ /dev/null
@@ -1,24 +0,0 @@
----
-ID: "4aafdfc8-5013-461c-9f7e-c76a89c49ed2"
-Parent: "4281c8f6-bc60-4780-9e11-18f62fc331ca"
-Template: "f90052a5-b4e6-4e6d-9812-1e1b88a6fcea"
-Path: /sitecore/system/Settings/Rules/Definitions/Elements/Flex Load Rules/Load Field Value from Contact Email Address
-DB: master
-SharedFields:
-- ID: "ff55d5a7-6d4b-4cd1-83e0-bac268073f66"
-  Hint: Type
-  Value: Unic.Flex.Implementation.Rules.LoadRules.LoadContactEmailAddressAction, Unic.Flex.Implementation
-Languages:
-- Language: en
-  Versions:
-  - Version: 1
-    Fields:
-    - ID: "25bed78c-4957-4165-998a-ca1b52f67497"
-      Hint: __Created
-      Value: 20171121T172810Z
-    - ID: "5dd74568-4d4b-44c1-b513-0af5f4cda34f"
-      Hint: __Created by
-      Value: sitecore\admin
-    - ID: "eeb36a3b-40d9-4af5-862a-de257b84dca3"
-      Hint: Text
-      Value: "load the field value of the Flex field with the key [FieldKey,,,key] from the contacts email address with the name [EmailAddressName,,,email address name]"
diff --git a/serialization/modules/flex/Rules.Elements.Load/Flex Load Rules/Load Field Value from Contact__b323c8cc-daa3-4bef-a766-96587b7e52b6.yml b/serialization/modules/flex/Rules.Elements.Load/Flex Load Rules/Load Field Value from Contact__b323c8cc-daa3-4bef-a766-96587b7e52b6.yml
deleted file mode 100644
index fd0e69fd..00000000
--- a/serialization/modules/flex/Rules.Elements.Load/Flex Load Rules/Load Field Value from Contact__b323c8cc-daa3-4bef-a766-96587b7e52b6.yml	
+++ /dev/null
@@ -1,24 +0,0 @@
----
-ID: "b323c8cc-daa3-4bef-a766-96587b7e52b6"
-Parent: "4281c8f6-bc60-4780-9e11-18f62fc331ca"
-Template: "f90052a5-b4e6-4e6d-9812-1e1b88a6fcea"
-Path: /sitecore/system/Settings/Rules/Definitions/Elements/Flex Load Rules/Load Field Value from Contact identifier
-DB: master
-SharedFields:
-- ID: "ff55d5a7-6d4b-4cd1-83e0-bac268073f66"
-  Hint: Type
-  Value: Unic.Flex.Implementation.Rules.LoadRules.LoadContactIdAction, Unic.Flex.Implementation
-Languages:
-- Language: en
-  Versions:
-  - Version: 1
-    Fields:
-    - ID: "25bed78c-4957-4165-998a-ca1b52f67497"
-      Hint: __Created
-      Value: 20171121T164452Z
-    - ID: "5dd74568-4d4b-44c1-b513-0af5f4cda34f"
-      Hint: __Created by
-      Value: sitecore\admin
-    - ID: "eeb36a3b-40d9-4af5-862a-de257b84dca3"
-      Hint: Text
-      Value: "load the field value for the Flex field with the key [FieldKey,,,key] from the contacts identifier"
diff --git a/serialization/modules/flex/Rules.Elements.Load/Flex Load Rules/Load Field Value from Simple C.yml b/serialization/modules/flex/Rules.Elements.Load/Flex Load Rules/Load Field Value from Simple C.yml
deleted file mode 100644
index 1d69a421..00000000
--- a/serialization/modules/flex/Rules.Elements.Load/Flex Load Rules/Load Field Value from Simple C.yml	
+++ /dev/null
@@ -1,24 +0,0 @@
----
-ID: "fd9a67b1-be5d-444f-aa1f-fdc0f8ea3bf5"
-Parent: "4281c8f6-bc60-4780-9e11-18f62fc331ca"
-Template: "f90052a5-b4e6-4e6d-9812-1e1b88a6fcea"
-Path: /sitecore/system/Settings/Rules/Definitions/Elements/Flex Load Rules/Load Field Value from Simple Contact Field
-DB: master
-SharedFields:
-- ID: "ff55d5a7-6d4b-4cd1-83e0-bac268073f66"
-  Hint: Type
-  Value: Unic.Flex.Implementation.Rules.LoadRules.LoadSimpleContactFieldAction, Unic.Flex.Implementation
-Languages:
-- Language: en
-  Versions:
-  - Version: 1
-    Fields:
-    - ID: "25bed78c-4957-4165-998a-ca1b52f67497"
-      Hint: __Created
-      Value: 20171121T145805Z
-    - ID: "5dd74568-4d4b-44c1-b513-0af5f4cda34f"
-      Hint: __Created by
-      Value: sitecore\admin
-    - ID: "eeb36a3b-40d9-4af5-862a-de257b84dca3"
-      Hint: Text
-      Value: "load the field value for the Flex field with the key [FieldKey,,,key] from the contacts simple field [ContactFieldName,,,contact field]"
diff --git a/src/Unic.Flex.Implementation/Rules/LoadRules/LoadContactEmailAddressAction.cs b/src/Unic.Flex.Implementation/Rules/LoadRules/LoadContactEmailAddressAction.cs
deleted file mode 100644
index bb9cdf98..00000000
--- a/src/Unic.Flex.Implementation/Rules/LoadRules/LoadContactEmailAddressAction.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace Unic.Flex.Implementation.Rules.LoadRules
-{
-    using Sitecore.Rules;
-
-    public class LoadContactEmailAddressAction : BaseFlexLoadAction
-        where T : RuleContext
-    {
-        protected override object GetValue()
-        {
-            throw new System.NotImplementedException();
-        }
-    }
-}
diff --git a/src/Unic.Flex.Implementation/Rules/LoadRules/LoadContactIdAction.cs b/src/Unic.Flex.Implementation/Rules/LoadRules/LoadContactIdAction.cs
deleted file mode 100644
index ba0f9139..00000000
--- a/src/Unic.Flex.Implementation/Rules/LoadRules/LoadContactIdAction.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace Unic.Flex.Implementation.Rules.LoadRules
-{
-    using Sitecore.Rules;
-
-    public class LoadContactIdAction : BaseFlexLoadAction
-        where T : RuleContext
-    {
-        protected override object GetValue()
-        {
-            throw new System.NotImplementedException();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Unic.Flex.Implementation/Rules/LoadRules/LoadFromContactFieldAction.cs b/src/Unic.Flex.Implementation/Rules/LoadRules/LoadFromContactFieldAction.cs
deleted file mode 100644
index 60858bb4..00000000
--- a/src/Unic.Flex.Implementation/Rules/LoadRules/LoadFromContactFieldAction.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace Unic.Flex.Implementation.Rules.LoadRules
-{
-    using System;
-    using Sitecore.Rules;
-
-    public class LoadFromContactFieldAction : BaseFlexLoadAction
-        where T : RuleContext
-    {
-        protected override object GetValue()
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Unic.Flex.Implementation/Rules/LoadRules/LoadSimpleContactFieldAction.cs b/src/Unic.Flex.Implementation/Rules/LoadRules/LoadSimpleContactFieldAction.cs
deleted file mode 100644
index 36027e70..00000000
--- a/src/Unic.Flex.Implementation/Rules/LoadRules/LoadSimpleContactFieldAction.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace Unic.Flex.Implementation.Rules.LoadRules
-{
-    using Sitecore.Rules;
-
-    public class LoadSimpleContactFieldAction : BaseFlexLoadAction
-        where T : RuleContext
-    {
-        protected override object GetValue()
-        {
-            throw new System.NotImplementedException();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Unic.Flex.Implementation/Unic.Flex.Implementation.csproj b/src/Unic.Flex.Implementation/Unic.Flex.Implementation.csproj
index 8fb99304..e6d19840 100644
--- a/src/Unic.Flex.Implementation/Unic.Flex.Implementation.csproj
+++ b/src/Unic.Flex.Implementation/Unic.Flex.Implementation.csproj
@@ -159,10 +159,6 @@
     
     
     
-    
-    
-    
-    
     
     
     

From 42357fd339a43c29d7cf941f570e94ec596f0796 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joanna=20Boro=C5=84?= 
Date: Mon, 22 May 2023 15:35:56 +0200
Subject: [PATCH 05/14] Remove Contact save actions

---
 .../Flex Save Rules/Identify Contact.yml      | 24 -------------------
 .../Save Contact Email Address fro.yml        | 24 -------------------
 .../Save Contact Field from Field_.yml        | 24 -------------------
 .../Save Contact Language from Cur.yml        | 24 -------------------
 .../Save Simple Contact Field from.yml        | 24 -------------------
 .../Rules/SaveRules/IdentifyContactAction.cs  | 13 ----------
 .../Rules/SaveRules/SaveContactEmailAction.cs | 13 ----------
 .../Rules/SaveRules/SaveContactFieldAction.cs | 14 -----------
 .../Rules/SaveRules/SaveLanguageAction.cs     | 14 -----------
 .../SaveRules/SaveSimpleContactFieldAction.cs | 12 ----------
 .../Unic.Flex.Implementation.csproj           |  5 ----
 11 files changed, 191 deletions(-)
 delete mode 100644 serialization/modules/flex/Rules.Elements.Save/Flex Save Rules/Identify Contact.yml
 delete mode 100644 serialization/modules/flex/Rules.Elements.Save/Flex Save Rules/Save Contact Email Address fro.yml
 delete mode 100644 serialization/modules/flex/Rules.Elements.Save/Flex Save Rules/Save Contact Field from Field_.yml
 delete mode 100644 serialization/modules/flex/Rules.Elements.Save/Flex Save Rules/Save Contact Language from Cur.yml
 delete mode 100644 serialization/modules/flex/Rules.Elements.Save/Flex Save Rules/Save Simple Contact Field from.yml
 delete mode 100644 src/Unic.Flex.Implementation/Rules/SaveRules/IdentifyContactAction.cs
 delete mode 100644 src/Unic.Flex.Implementation/Rules/SaveRules/SaveContactEmailAction.cs
 delete mode 100644 src/Unic.Flex.Implementation/Rules/SaveRules/SaveContactFieldAction.cs
 delete mode 100644 src/Unic.Flex.Implementation/Rules/SaveRules/SaveLanguageAction.cs
 delete mode 100644 src/Unic.Flex.Implementation/Rules/SaveRules/SaveSimpleContactFieldAction.cs

diff --git a/serialization/modules/flex/Rules.Elements.Save/Flex Save Rules/Identify Contact.yml b/serialization/modules/flex/Rules.Elements.Save/Flex Save Rules/Identify Contact.yml
deleted file mode 100644
index f4100183..00000000
--- a/serialization/modules/flex/Rules.Elements.Save/Flex Save Rules/Identify Contact.yml	
+++ /dev/null
@@ -1,24 +0,0 @@
----
-ID: "18480f1d-c5ce-4c54-b198-ea2e386247cd"
-Parent: "d6733a22-33d8-45d7-994e-ff3eb8daebf7"
-Template: "f90052a5-b4e6-4e6d-9812-1e1b88a6fcea"
-Path: /sitecore/system/Settings/Rules/Definitions/Elements/Flex Save Rules/Identify Contact
-DB: master
-SharedFields:
-- ID: "ff55d5a7-6d4b-4cd1-83e0-bac268073f66"
-  Hint: Type
-  Value: Unic.Flex.Implementation.Rules.SaveRules.IdentifyContactAction, Unic.Flex.Implementation
-Languages:
-- Language: en
-  Versions:
-  - Version: 1
-    Fields:
-    - ID: "25bed78c-4957-4165-998a-ca1b52f67497"
-      Hint: __Created
-      Value: 20180314T100832Z
-    - ID: "5dd74568-4d4b-44c1-b513-0af5f4cda34f"
-      Hint: __Created by
-      Value: sitecore\admin
-    - ID: "eeb36a3b-40d9-4af5-862a-de257b84dca3"
-      Hint: Text
-      Value: "Identify contact by flex field with the key [FieldKey,,,key]"
diff --git a/serialization/modules/flex/Rules.Elements.Save/Flex Save Rules/Save Contact Email Address fro.yml b/serialization/modules/flex/Rules.Elements.Save/Flex Save Rules/Save Contact Email Address fro.yml
deleted file mode 100644
index 39f402fe..00000000
--- a/serialization/modules/flex/Rules.Elements.Save/Flex Save Rules/Save Contact Email Address fro.yml	
+++ /dev/null
@@ -1,24 +0,0 @@
----
-ID: "093f0fd1-35df-43fd-b3a6-af3b2066a740"
-Parent: "d6733a22-33d8-45d7-994e-ff3eb8daebf7"
-Template: "f90052a5-b4e6-4e6d-9812-1e1b88a6fcea"
-Path: /sitecore/system/Settings/Rules/Definitions/Elements/Flex Save Rules/Save Contact Email Address from Field Value
-DB: master
-SharedFields:
-- ID: "ff55d5a7-6d4b-4cd1-83e0-bac268073f66"
-  Hint: Type
-  Value: Unic.Flex.Implementation.Rules.SaveRules.SaveContactEmailAction, Unic.Flex.Implementation
-Languages:
-- Language: en
-  Versions:
-  - Version: 1
-    Fields:
-    - ID: "25bed78c-4957-4165-998a-ca1b52f67497"
-      Hint: __Created
-      Value: 20171121T172612Z
-    - ID: "5dd74568-4d4b-44c1-b513-0af5f4cda34f"
-      Hint: __Created by
-      Value: sitecore\admin
-    - ID: "eeb36a3b-40d9-4af5-862a-de257b84dca3"
-      Hint: Text
-      Value: "save the value of the Flex field with the key [FieldKey,,,key] to the contacts email address with name [EmailAddressName,,,email address name]"
diff --git a/serialization/modules/flex/Rules.Elements.Save/Flex Save Rules/Save Contact Field from Field_.yml b/serialization/modules/flex/Rules.Elements.Save/Flex Save Rules/Save Contact Field from Field_.yml
deleted file mode 100644
index 2108fd6e..00000000
--- a/serialization/modules/flex/Rules.Elements.Save/Flex Save Rules/Save Contact Field from Field_.yml	
+++ /dev/null
@@ -1,24 +0,0 @@
----
-ID: "066753ae-6f49-44ed-8b51-eaec1959e0ea"
-Parent: "d6733a22-33d8-45d7-994e-ff3eb8daebf7"
-Template: "f90052a5-b4e6-4e6d-9812-1e1b88a6fcea"
-Path: /sitecore/system/Settings/Rules/Definitions/Elements/Flex Save Rules/Save Contact Field from Field Value
-DB: master
-SharedFields:
-- ID: "ff55d5a7-6d4b-4cd1-83e0-bac268073f66"
-  Hint: Type
-  Value: Unic.Flex.Implementation.Rules.SaveRules.SaveContactFieldAction, Unic.Flex.Implementation
-Languages:
-- Language: en
-  Versions:
-  - Version: 1
-    Fields:
-    - ID: "25bed78c-4957-4165-998a-ca1b52f67497"
-      Hint: __Created
-      Value: 20171121T141856Z
-    - ID: "5dd74568-4d4b-44c1-b513-0af5f4cda34f"
-      Hint: __Created by
-      Value: sitecore\admin
-    - ID: "eeb36a3b-40d9-4af5-862a-de257b84dca3"
-      Hint: Text
-      Value: "save the value of the Flex field with the key [FieldKey,,,key] to the contacts field [ContactField,Tree,root=/sitecore/system/Modules/Flex/Contact Fields,contact field]  "
diff --git a/serialization/modules/flex/Rules.Elements.Save/Flex Save Rules/Save Contact Language from Cur.yml b/serialization/modules/flex/Rules.Elements.Save/Flex Save Rules/Save Contact Language from Cur.yml
deleted file mode 100644
index 9a2687bb..00000000
--- a/serialization/modules/flex/Rules.Elements.Save/Flex Save Rules/Save Contact Language from Cur.yml	
+++ /dev/null
@@ -1,24 +0,0 @@
----
-ID: "207719f5-04c3-4496-bb53-5513098cdd46"
-Parent: "d6733a22-33d8-45d7-994e-ff3eb8daebf7"
-Template: "f90052a5-b4e6-4e6d-9812-1e1b88a6fcea"
-Path: /sitecore/system/Settings/Rules/Definitions/Elements/Flex Save Rules/Save Contact Language from Current Language
-DB: master
-SharedFields:
-- ID: "ff55d5a7-6d4b-4cd1-83e0-bac268073f66"
-  Hint: Type
-  Value: Unic.Flex.Implementation.Rules.SaveRules.SaveLanguageAction, Unic.Flex.Implementation
-Languages:
-- Language: en
-  Versions:
-  - Version: 1
-    Fields:
-    - ID: "25bed78c-4957-4165-998a-ca1b52f67497"
-      Hint: __Created
-      Value: 20180307T124133Z
-    - ID: "5dd74568-4d4b-44c1-b513-0af5f4cda34f"
-      Hint: __Created by
-      Value: sitecore\admin
-    - ID: "eeb36a3b-40d9-4af5-862a-de257b84dca3"
-      Hint: Text
-      Value: Save current language to contact language
diff --git a/serialization/modules/flex/Rules.Elements.Save/Flex Save Rules/Save Simple Contact Field from.yml b/serialization/modules/flex/Rules.Elements.Save/Flex Save Rules/Save Simple Contact Field from.yml
deleted file mode 100644
index 08b9dfae..00000000
--- a/serialization/modules/flex/Rules.Elements.Save/Flex Save Rules/Save Simple Contact Field from.yml	
+++ /dev/null
@@ -1,24 +0,0 @@
----
-ID: "e0b218eb-2f7a-4104-9a94-a1045470dccd"
-Parent: "d6733a22-33d8-45d7-994e-ff3eb8daebf7"
-Template: "f90052a5-b4e6-4e6d-9812-1e1b88a6fcea"
-Path: /sitecore/system/Settings/Rules/Definitions/Elements/Flex Save Rules/Save Simple Contact Field from Field Value
-DB: master
-SharedFields:
-- ID: "ff55d5a7-6d4b-4cd1-83e0-bac268073f66"
-  Hint: Type
-  Value: Unic.Flex.Implementation.Rules.SaveRules.SaveSimpleContactFieldAction, Unic.Flex.Implementation
-Languages:
-- Language: en
-  Versions:
-  - Version: 1
-    Fields:
-    - ID: "25bed78c-4957-4165-998a-ca1b52f67497"
-      Hint: __Created
-      Value: 20171121T141856Z
-    - ID: "5dd74568-4d4b-44c1-b513-0af5f4cda34f"
-      Hint: __Created by
-      Value: sitecore\admin
-    - ID: "eeb36a3b-40d9-4af5-862a-de257b84dca3"
-      Hint: Text
-      Value: "save the value of the Flex field with the key [FieldKey,,,key] to the contacts simple field [ContactFieldName,,,simple field name]  "
diff --git a/src/Unic.Flex.Implementation/Rules/SaveRules/IdentifyContactAction.cs b/src/Unic.Flex.Implementation/Rules/SaveRules/IdentifyContactAction.cs
deleted file mode 100644
index 902717fc..00000000
--- a/src/Unic.Flex.Implementation/Rules/SaveRules/IdentifyContactAction.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace Unic.Flex.Implementation.Rules.SaveRules
-{
-    using Sitecore.Rules;
-
-    public class IdentifyContactAction : BaseFlexSaveAction
-        where T : RuleContext
-    {
-        public override void Apply(T ruleContext)
-        {
-            throw new System.NotImplementedException();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Unic.Flex.Implementation/Rules/SaveRules/SaveContactEmailAction.cs b/src/Unic.Flex.Implementation/Rules/SaveRules/SaveContactEmailAction.cs
deleted file mode 100644
index 6a5a9102..00000000
--- a/src/Unic.Flex.Implementation/Rules/SaveRules/SaveContactEmailAction.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace Unic.Flex.Implementation.Rules.SaveRules
-{
-    using Sitecore.Rules;
-
-    public class SaveContactEmailAction : BaseFlexSaveAction 
-        where T : RuleContext
-    {
-        public override void Apply(T ruleContext)
-        {
-            throw new System.NotImplementedException();
-        }
-    }
-}
diff --git a/src/Unic.Flex.Implementation/Rules/SaveRules/SaveContactFieldAction.cs b/src/Unic.Flex.Implementation/Rules/SaveRules/SaveContactFieldAction.cs
deleted file mode 100644
index 38b9118b..00000000
--- a/src/Unic.Flex.Implementation/Rules/SaveRules/SaveContactFieldAction.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace Unic.Flex.Implementation.Rules.SaveRules
-{
-    using System;
-    using Sitecore.Rules;
-
-    public class SaveContactFieldAction : BaseFlexSaveAction
-        where T : RuleContext
-    {
-        public override void Apply(T ruleContext)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Unic.Flex.Implementation/Rules/SaveRules/SaveLanguageAction.cs b/src/Unic.Flex.Implementation/Rules/SaveRules/SaveLanguageAction.cs
deleted file mode 100644
index 445779c5..00000000
--- a/src/Unic.Flex.Implementation/Rules/SaveRules/SaveLanguageAction.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace Unic.Flex.Implementation.Rules.SaveRules
-{
-    using System;
-    using Sitecore.Rules;
-
-    public class SaveLanguageAction : BaseFlexSaveAction
-        where T : RuleContext
-    {
-        public override void Apply(T ruleContext)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Unic.Flex.Implementation/Rules/SaveRules/SaveSimpleContactFieldAction.cs b/src/Unic.Flex.Implementation/Rules/SaveRules/SaveSimpleContactFieldAction.cs
deleted file mode 100644
index f83a5476..00000000
--- a/src/Unic.Flex.Implementation/Rules/SaveRules/SaveSimpleContactFieldAction.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace Unic.Flex.Implementation.Rules.SaveRules
-{
-    using Sitecore.Rules;
-
-    public class SaveSimpleContactFieldAction : BaseFlexSaveAction where T : RuleContext
-    {
-        public override void Apply(T ruleContext)
-        {
-            throw new System.NotImplementedException();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Unic.Flex.Implementation/Unic.Flex.Implementation.csproj b/src/Unic.Flex.Implementation/Unic.Flex.Implementation.csproj
index e6d19840..264f914f 100644
--- a/src/Unic.Flex.Implementation/Unic.Flex.Implementation.csproj
+++ b/src/Unic.Flex.Implementation/Unic.Flex.Implementation.csproj
@@ -162,11 +162,6 @@
     
     
     
-    
-    
-    
-    
-    
     
     
     

From 78ee5d89fbc1f8a8c0dff31ef9eac3aa6927d690 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joanna=20Boro=C5=84?= 
Date: Mon, 22 May 2023 15:46:26 +0200
Subject: [PATCH 06/14] Upgrade target framework to 4.8

---
 src/Unic.Flex.Core/Unic.Flex.Core.csproj                        | 2 +-
 src/Unic.Flex.Implementation/Unic.Flex.Implementation.csproj    | 2 +-
 .../Unic.Flex.Integration.Website.csproj                        | 2 +-
 src/Unic.Flex.Model/Unic.Flex.Model.csproj                      | 2 +-
 src/Unic.Flex.NinjectIoC/Unic.Flex.NinjectIoC.csproj            | 2 +-
 .../Unic.Flex.SimpleInjectorIoC.csproj                          | 2 +-
 src/Unic.Flex.Website/Unic.Flex.Website.csproj                  | 2 +-
 tests/Unic.Flex.Core.Tests/Unic.Flex.Core.Tests.csproj          | 2 +-
 .../Unic.Flex.Implementation.Tests.csproj                       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Unic.Flex.Core/Unic.Flex.Core.csproj b/src/Unic.Flex.Core/Unic.Flex.Core.csproj
index 80c64383..b67fd837 100644
--- a/src/Unic.Flex.Core/Unic.Flex.Core.csproj
+++ b/src/Unic.Flex.Core/Unic.Flex.Core.csproj
@@ -11,7 +11,7 @@
     Properties
     Unic.Flex.Core
     Unic.Flex.Core
-    v4.7.1
+    v4.8
     512
     
     
diff --git a/src/Unic.Flex.Implementation/Unic.Flex.Implementation.csproj b/src/Unic.Flex.Implementation/Unic.Flex.Implementation.csproj
index 264f914f..71394a29 100644
--- a/src/Unic.Flex.Implementation/Unic.Flex.Implementation.csproj
+++ b/src/Unic.Flex.Implementation/Unic.Flex.Implementation.csproj
@@ -11,7 +11,7 @@
     Properties
     Unic.Flex.Implementation
     Unic.Flex.Implementation
-    v4.7.1
+    v4.8
     512
     
     
diff --git a/src/Unic.Flex.Integration.Website/Unic.Flex.Integration.Website.csproj b/src/Unic.Flex.Integration.Website/Unic.Flex.Integration.Website.csproj
index fb6f65d4..d8e8fd1b 100644
--- a/src/Unic.Flex.Integration.Website/Unic.Flex.Integration.Website.csproj
+++ b/src/Unic.Flex.Integration.Website/Unic.Flex.Integration.Website.csproj
@@ -16,7 +16,7 @@
     Properties
     Unic.Flex.Integration.Website
     Unic.Flex.Integration.Website
-    v4.7.1
+    v4.8
     true
     
     
diff --git a/src/Unic.Flex.Model/Unic.Flex.Model.csproj b/src/Unic.Flex.Model/Unic.Flex.Model.csproj
index ede1399e..1ac776de 100644
--- a/src/Unic.Flex.Model/Unic.Flex.Model.csproj
+++ b/src/Unic.Flex.Model/Unic.Flex.Model.csproj
@@ -11,7 +11,7 @@
     Properties
     Unic.Flex.Model
     Unic.Flex.Model
-    v4.7.1
+    v4.8
     512
     
     
diff --git a/src/Unic.Flex.NinjectIoC/Unic.Flex.NinjectIoC.csproj b/src/Unic.Flex.NinjectIoC/Unic.Flex.NinjectIoC.csproj
index 15c04749..21108e74 100644
--- a/src/Unic.Flex.NinjectIoC/Unic.Flex.NinjectIoC.csproj
+++ b/src/Unic.Flex.NinjectIoC/Unic.Flex.NinjectIoC.csproj
@@ -15,7 +15,7 @@
     Properties
     Unic.Flex.NinjectIoC
     Unic.Flex.NinjectIoC
-    v4.7.1
+    v4.8
     true
     
     
diff --git a/src/Unic.Flex.SimpleInjectorIoC/Unic.Flex.SimpleInjectorIoC.csproj b/src/Unic.Flex.SimpleInjectorIoC/Unic.Flex.SimpleInjectorIoC.csproj
index ec1b04e3..2671ea79 100644
--- a/src/Unic.Flex.SimpleInjectorIoC/Unic.Flex.SimpleInjectorIoC.csproj
+++ b/src/Unic.Flex.SimpleInjectorIoC/Unic.Flex.SimpleInjectorIoC.csproj
@@ -16,7 +16,7 @@
     Properties
     Unic.Flex.SimpleInjectorIoC
     Unic.Flex.SimpleInjectorIoC
-    v4.7.1
+    v4.8
     true
     
     
diff --git a/src/Unic.Flex.Website/Unic.Flex.Website.csproj b/src/Unic.Flex.Website/Unic.Flex.Website.csproj
index d477898c..1f8e382f 100644
--- a/src/Unic.Flex.Website/Unic.Flex.Website.csproj
+++ b/src/Unic.Flex.Website/Unic.Flex.Website.csproj
@@ -16,7 +16,7 @@
     Properties
     Unic.Flex.Website
     Unic.Flex.Website
-    v4.7.1
+    v4.8
     true
     
     
diff --git a/tests/Unic.Flex.Core.Tests/Unic.Flex.Core.Tests.csproj b/tests/Unic.Flex.Core.Tests/Unic.Flex.Core.Tests.csproj
index 2e7bf4cd..5eeb975b 100644
--- a/tests/Unic.Flex.Core.Tests/Unic.Flex.Core.Tests.csproj
+++ b/tests/Unic.Flex.Core.Tests/Unic.Flex.Core.Tests.csproj
@@ -11,7 +11,7 @@
     Properties
     Unic.Flex.Core.Tests
     Unic.Flex.Core.Tests
-    v4.7.1
+    v4.8
     512
     
     
diff --git a/tests/Unic.Flex.Implementation.Tests/Unic.Flex.Implementation.Tests.csproj b/tests/Unic.Flex.Implementation.Tests/Unic.Flex.Implementation.Tests.csproj
index 755ea8f2..f162aaaa 100644
--- a/tests/Unic.Flex.Implementation.Tests/Unic.Flex.Implementation.Tests.csproj
+++ b/tests/Unic.Flex.Implementation.Tests/Unic.Flex.Implementation.Tests.csproj
@@ -11,7 +11,7 @@
     Properties
     Unic.Flex.Implementation.Tests
     Unic.Flex.Implementation.Tests
-    v4.7.1
+    v4.8
     512
     
     

From c2bd1913f8eaf9a33f78b9d53b17d7e685d6df43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joanna=20Boro=C5=84?= 
Date: Tue, 23 May 2023 11:14:54 +0200
Subject: [PATCH 07/14] Upgrade Sitecore references to 10.3

---
 src/Unic.Flex.Core/Unic.Flex.Core.csproj             | 12 ++++++------
 src/Unic.Flex.Core/app.config                        |  2 +-
 src/Unic.Flex.Core/packages.config                   |  6 +++---
 .../Unic.Flex.Implementation.csproj                  |  8 ++++----
 src/Unic.Flex.Implementation/app.config              |  2 +-
 src/Unic.Flex.Implementation/packages.config         |  4 ++--
 src/Unic.Flex.Model/Unic.Flex.Model.csproj           |  4 ++--
 src/Unic.Flex.Model/packages.config                  |  2 +-
 src/Unic.Flex.NinjectIoC/Web.config                  |  2 +-
 src/Unic.Flex.SimpleInjectorIoC/Web.config           |  2 +-
 10 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/Unic.Flex.Core/Unic.Flex.Core.csproj b/src/Unic.Flex.Core/Unic.Flex.Core.csproj
index b67fd837..13694756 100644
--- a/src/Unic.Flex.Core/Unic.Flex.Core.csproj
+++ b/src/Unic.Flex.Core/Unic.Flex.Core.csproj
@@ -70,14 +70,14 @@
       ..\..\packages\MvcMailer.4.5\lib\45\Mvc.Mailer.dll
       True
     
-    
-      ..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll
+    
+      ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll
     
-    
-      ..\..\packages\Sitecore.Kernel.9.2.0\lib\net471\Sitecore.Kernel.dll
+    
+      ..\..\packages\Sitecore.Kernel.10.3.0\lib\net48\Sitecore.Kernel.dll
     
-    
-      ..\..\packages\Sitecore.Mvc.9.2.0\lib\net471\Sitecore.Mvc.dll
+    
+      ..\..\packages\Sitecore.Mvc.10.3.0\lib\net48\Sitecore.Mvc.dll
     
     
     
diff --git a/src/Unic.Flex.Core/app.config b/src/Unic.Flex.Core/app.config
index 442da6ab..1c111dbb 100644
--- a/src/Unic.Flex.Core/app.config
+++ b/src/Unic.Flex.Core/app.config
@@ -20,7 +20,7 @@
       
       
         
-        
+        
       
     
   
diff --git a/src/Unic.Flex.Core/packages.config b/src/Unic.Flex.Core/packages.config
index 5461a86f..de8b4d00 100644
--- a/src/Unic.Flex.Core/packages.config
+++ b/src/Unic.Flex.Core/packages.config
@@ -13,10 +13,10 @@
   
   
   
-  
+  
   
-  
-  
+  
+  
   
   
   
diff --git a/src/Unic.Flex.Implementation/Unic.Flex.Implementation.csproj b/src/Unic.Flex.Implementation/Unic.Flex.Implementation.csproj
index 71394a29..d55b88ad 100644
--- a/src/Unic.Flex.Implementation/Unic.Flex.Implementation.csproj
+++ b/src/Unic.Flex.Implementation/Unic.Flex.Implementation.csproj
@@ -63,11 +63,11 @@
     
       ..\..\packages\MvcMailer.4.5\lib\45\Mvc.Mailer.dll
     
-    
-      ..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll
+    
+      ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll
     
-    
-      ..\..\packages\Sitecore.Kernel.9.2.0\lib\net471\Sitecore.Kernel.dll
+    
+      ..\..\packages\Sitecore.Kernel.10.3.0\lib\net48\Sitecore.Kernel.dll
     
     
     
diff --git a/src/Unic.Flex.Implementation/app.config b/src/Unic.Flex.Implementation/app.config
index 99f0449d..35c47966 100644
--- a/src/Unic.Flex.Implementation/app.config
+++ b/src/Unic.Flex.Implementation/app.config
@@ -16,7 +16,7 @@
       
       
         
-        
+        
       
     
   
diff --git a/src/Unic.Flex.Implementation/packages.config b/src/Unic.Flex.Implementation/packages.config
index e2d7a20a..1e5b5a5f 100644
--- a/src/Unic.Flex.Implementation/packages.config
+++ b/src/Unic.Flex.Implementation/packages.config
@@ -12,8 +12,8 @@
   
   
   
-  
-  
+  
+  
   
   
   
diff --git a/src/Unic.Flex.Model/Unic.Flex.Model.csproj b/src/Unic.Flex.Model/Unic.Flex.Model.csproj
index 1ac776de..a36b5583 100644
--- a/src/Unic.Flex.Model/Unic.Flex.Model.csproj
+++ b/src/Unic.Flex.Model/Unic.Flex.Model.csproj
@@ -51,8 +51,8 @@
       True
       ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll
     
-    
-      ..\..\packages\Sitecore.Kernel.9.2.0\lib\net471\Sitecore.Kernel.dll
+    
+      ..\..\packages\Sitecore.Kernel.10.3.0\lib\net48\Sitecore.Kernel.dll
     
     
     
diff --git a/src/Unic.Flex.Model/packages.config b/src/Unic.Flex.Model/packages.config
index 835469a3..f781d891 100644
--- a/src/Unic.Flex.Model/packages.config
+++ b/src/Unic.Flex.Model/packages.config
@@ -8,7 +8,7 @@
   
   
   
-  
+  
   
   
 
\ No newline at end of file
diff --git a/src/Unic.Flex.NinjectIoC/Web.config b/src/Unic.Flex.NinjectIoC/Web.config
index 6e9c43d4..a4bdccd0 100644
--- a/src/Unic.Flex.NinjectIoC/Web.config
+++ b/src/Unic.Flex.NinjectIoC/Web.config
@@ -36,7 +36,7 @@
       
       
         
-        
+        
       
     
   
diff --git a/src/Unic.Flex.SimpleInjectorIoC/Web.config b/src/Unic.Flex.SimpleInjectorIoC/Web.config
index 01a5bfe2..59a24509 100644
--- a/src/Unic.Flex.SimpleInjectorIoC/Web.config
+++ b/src/Unic.Flex.SimpleInjectorIoC/Web.config
@@ -36,7 +36,7 @@
       
       
         
-        
+        
       
       
         

From 7ff7ce765085437ad2084557f832059a29fa6221 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joanna=20Boro=C5=84?= 
Date: Tue, 23 May 2023 13:44:22 +0200
Subject: [PATCH 08/14] Update gitversion

---
 GitVersion.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/GitVersion.yml b/GitVersion.yml
index ced7a9fb..0bdc1923 100644
--- a/GitVersion.yml
+++ b/GitVersion.yml
@@ -1,4 +1,10 @@
 mode: ContinuousDeployment
 branches:  
    master:  
-      regex: ^master$|^main$
\ No newline at end of file
+      regex: ^master$|^main$
+   sc10xm:
+      regex: ^feature/sitecore-10-xm$
+      mode: ContinuousDelivery
+      increment: Major
+      tag: "sc10xm"
+      source-branches: []
\ No newline at end of file

From ab09eb07cb534193b7808ac0545fd9123859353a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joanna=20Boro=C5=84?= 
Date: Tue, 23 May 2023 15:13:09 +0200
Subject: [PATCH 09/14] Upgrade more Sitecore references to 10.3

---
 src/Unic.Flex.Website/Unic.Flex.Website.csproj       | 12 ++++++------
 src/Unic.Flex.Website/web.config                     |  2 +-
 .../Unic.Flex.Core.Tests/Unic.Flex.Core.Tests.csproj |  4 ++--
 tests/Unic.Flex.Core.Tests/app.config                |  2 +-
 tests/Unic.Flex.Core.Tests/packages.config           |  2 +-
 tests/Unic.Flex.Implementation.Tests/app.config      |  2 +-
 tests/Unic.Flex.Tests/Unic.Flex.Tests.csproj         |  6 +++---
 tests/Unic.Flex.Tests/app.config                     |  2 +-
 tests/Unic.Flex.Tests/packages.config                |  2 +-
 9 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/Unic.Flex.Website/Unic.Flex.Website.csproj b/src/Unic.Flex.Website/Unic.Flex.Website.csproj
index 1f8e382f..48ba70a0 100644
--- a/src/Unic.Flex.Website/Unic.Flex.Website.csproj
+++ b/src/Unic.Flex.Website/Unic.Flex.Website.csproj
@@ -64,14 +64,14 @@
       True
       ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll
     
-    
-      ..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll
+    
+      ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll
     
-    
-      ..\..\packages\Sitecore.Kernel.9.2.0\lib\net471\Sitecore.Kernel.dll
+    
+      ..\..\packages\Sitecore.Kernel.10.3.0\lib\net48\Sitecore.Kernel.dll
     
-    
-      ..\..\packages\Sitecore.Mvc.9.2.0\lib\net471\Sitecore.Mvc.dll
+    
+      ..\..\packages\Sitecore.Mvc.10.3.0\lib\net48\Sitecore.Mvc.dll
     
     
     
diff --git a/src/Unic.Flex.Website/web.config b/src/Unic.Flex.Website/web.config
index 552494d1..1890d4f3 100644
--- a/src/Unic.Flex.Website/web.config
+++ b/src/Unic.Flex.Website/web.config
@@ -44,7 +44,7 @@
       
       
         
-        
+        
       
       
         
diff --git a/tests/Unic.Flex.Core.Tests/Unic.Flex.Core.Tests.csproj b/tests/Unic.Flex.Core.Tests/Unic.Flex.Core.Tests.csproj
index 5eeb975b..c87234e1 100644
--- a/tests/Unic.Flex.Core.Tests/Unic.Flex.Core.Tests.csproj
+++ b/tests/Unic.Flex.Core.Tests/Unic.Flex.Core.Tests.csproj
@@ -54,8 +54,8 @@
     
       ..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll
     
-    
-      ..\..\packages\Sitecore.Kernel.9.2.0\lib\net471\Sitecore.Kernel.dll
+    
+      ..\..\packages\Sitecore.Kernel.10.3.0\lib\net48\Sitecore.Kernel.dll
     
     
     
diff --git a/tests/Unic.Flex.Core.Tests/app.config b/tests/Unic.Flex.Core.Tests/app.config
index 57adffdf..fda53956 100644
--- a/tests/Unic.Flex.Core.Tests/app.config
+++ b/tests/Unic.Flex.Core.Tests/app.config
@@ -16,7 +16,7 @@
       
       
         
-        
+        
       
       
         
diff --git a/tests/Unic.Flex.Core.Tests/packages.config b/tests/Unic.Flex.Core.Tests/packages.config
index 7e456365..b16c2b72 100644
--- a/tests/Unic.Flex.Core.Tests/packages.config
+++ b/tests/Unic.Flex.Core.Tests/packages.config
@@ -6,6 +6,6 @@
   
   
   
-  
+  
   
 
\ No newline at end of file
diff --git a/tests/Unic.Flex.Implementation.Tests/app.config b/tests/Unic.Flex.Implementation.Tests/app.config
index 35b4cd6e..823b7b40 100644
--- a/tests/Unic.Flex.Implementation.Tests/app.config
+++ b/tests/Unic.Flex.Implementation.Tests/app.config
@@ -12,7 +12,7 @@
       
       
         
-        
+        
       
       
         
diff --git a/tests/Unic.Flex.Tests/Unic.Flex.Tests.csproj b/tests/Unic.Flex.Tests/Unic.Flex.Tests.csproj
index 002c3830..5a0fa6aa 100644
--- a/tests/Unic.Flex.Tests/Unic.Flex.Tests.csproj
+++ b/tests/Unic.Flex.Tests/Unic.Flex.Tests.csproj
@@ -11,7 +11,7 @@
     Properties
     Unic.Flex.Tests
     Unic.Flex.Tests
-    v4.7.1
+    v4.8
     512
     
     
@@ -50,8 +50,8 @@
     
       ..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll
     
-    
-      ..\..\packages\Sitecore.Kernel.9.2.0\lib\net471\Sitecore.Kernel.dll
+    
+      ..\..\packages\Sitecore.Kernel.10.3.0\lib\net48\Sitecore.Kernel.dll
     
     
     
diff --git a/tests/Unic.Flex.Tests/app.config b/tests/Unic.Flex.Tests/app.config
index 41685331..9553864a 100644
--- a/tests/Unic.Flex.Tests/app.config
+++ b/tests/Unic.Flex.Tests/app.config
@@ -8,7 +8,7 @@
       
       
         
-        
+        
       
       
         
diff --git a/tests/Unic.Flex.Tests/packages.config b/tests/Unic.Flex.Tests/packages.config
index 9c2c3087..1c7fe194 100644
--- a/tests/Unic.Flex.Tests/packages.config
+++ b/tests/Unic.Flex.Tests/packages.config
@@ -5,7 +5,7 @@
   
   
   
-  
+  
   
   
 
\ No newline at end of file

From 76eba52d1476a52d47091c21bf8b6d3ee2315c88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joanna=20Boro=C5=84?= 
Date: Tue, 23 May 2023 15:57:30 +0200
Subject: [PATCH 10/14] Upgrade more Sitecore references to 10.3

---
 src/Unic.Flex.NinjectIoC/Unic.Flex.NinjectIoC.csproj        | 4 ++--
 src/Unic.Flex.NinjectIoC/packages.config                    | 2 +-
 .../Unic.Flex.SimpleInjectorIoC.csproj                      | 4 ++--
 src/Unic.Flex.SimpleInjectorIoC/packages.config             | 2 +-
 src/Unic.Flex.Website/packages.config                       | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Unic.Flex.NinjectIoC/Unic.Flex.NinjectIoC.csproj b/src/Unic.Flex.NinjectIoC/Unic.Flex.NinjectIoC.csproj
index 21108e74..b6f457be 100644
--- a/src/Unic.Flex.NinjectIoC/Unic.Flex.NinjectIoC.csproj
+++ b/src/Unic.Flex.NinjectIoC/Unic.Flex.NinjectIoC.csproj
@@ -74,8 +74,8 @@
       ..\..\packages\Ninject.Web.Common.3.2.2.0\lib\net45-full\Ninject.Web.Common.dll
       True
     
-    
-      ..\..\packages\Sitecore.Kernel.9.2.0\lib\net471\Sitecore.Kernel.dll
+    
+      ..\..\packages\Sitecore.Kernel.10.3.0\lib\net48\Sitecore.Kernel.dll
     
     
     
diff --git a/src/Unic.Flex.NinjectIoC/packages.config b/src/Unic.Flex.NinjectIoC/packages.config
index 950429c5..0ba9aff8 100644
--- a/src/Unic.Flex.NinjectIoC/packages.config
+++ b/src/Unic.Flex.NinjectIoC/packages.config
@@ -11,7 +11,7 @@
   
   
   
-  
+  
   
   
 
\ No newline at end of file
diff --git a/src/Unic.Flex.SimpleInjectorIoC/Unic.Flex.SimpleInjectorIoC.csproj b/src/Unic.Flex.SimpleInjectorIoC/Unic.Flex.SimpleInjectorIoC.csproj
index 2671ea79..3456a6ea 100644
--- a/src/Unic.Flex.SimpleInjectorIoC/Unic.Flex.SimpleInjectorIoC.csproj
+++ b/src/Unic.Flex.SimpleInjectorIoC/Unic.Flex.SimpleInjectorIoC.csproj
@@ -79,8 +79,8 @@
     
       ..\..\packages\SimpleInjector.Integration.Web.4.2.0\lib\net40\SimpleInjector.Integration.Web.dll
     
-    
-      ..\..\packages\Sitecore.Kernel.9.2.0\lib\net471\Sitecore.Kernel.dll
+    
+      ..\..\packages\Sitecore.Kernel.10.3.0\lib\net48\Sitecore.Kernel.dll
     
     
     
diff --git a/src/Unic.Flex.SimpleInjectorIoC/packages.config b/src/Unic.Flex.SimpleInjectorIoC/packages.config
index 2fa13bef..60d50438 100644
--- a/src/Unic.Flex.SimpleInjectorIoC/packages.config
+++ b/src/Unic.Flex.SimpleInjectorIoC/packages.config
@@ -13,7 +13,7 @@
   
   
   
-  
+  
   
   
   
diff --git a/src/Unic.Flex.Website/packages.config b/src/Unic.Flex.Website/packages.config
index 2ad3a468..c1f5d333 100644
--- a/src/Unic.Flex.Website/packages.config
+++ b/src/Unic.Flex.Website/packages.config
@@ -8,9 +8,9 @@
   
   
   
-  
-  
-  
+  
+  
+  
   
   
   

From 4df250994180ca1e58f83b7e6f073d10d1c284fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joanna=20Boro=C5=84?= 
Date: Wed, 24 May 2023 19:06:35 +0200
Subject: [PATCH 11/14] Reorganize configuration files

---
 .../{20_author => 01_modules}/Unic.Feature.Flex.Config    | 0
 .../Include/20_delivery/Unic.Feature.Flex.Config          | 8 --------
 .../Unic.Flex.SimpleInjectorIoC.csproj                    | 5 +----
 .../Unic.Configuration.Serialization.config}              | 4 ++--
 .../Unic.Flex.Serialization.config}                       | 0
 src/Unic.Flex.Website/Unic.Flex.Website.csproj            | 4 ++--
 6 files changed, 5 insertions(+), 16 deletions(-)
 rename src/Unic.Flex.SimpleInjectorIoC/App_Config/Include/{20_author => 01_modules}/Unic.Feature.Flex.Config (100%)
 delete mode 100644 src/Unic.Flex.SimpleInjectorIoC/App_Config/Include/20_delivery/Unic.Feature.Flex.Config
 rename src/Unic.Flex.Website/App_Config/Include/{01_modules_author/Unic.Configuration.config => 01_modules/Unic.Configuration.Serialization.config} (87%)
 rename src/Unic.Flex.Website/App_Config/Include/{01_modules_author/Unic.Flex.config => 01_modules/Unic.Flex.Serialization.config} (100%)

diff --git a/src/Unic.Flex.SimpleInjectorIoC/App_Config/Include/20_author/Unic.Feature.Flex.Config b/src/Unic.Flex.SimpleInjectorIoC/App_Config/Include/01_modules/Unic.Feature.Flex.Config
similarity index 100%
rename from src/Unic.Flex.SimpleInjectorIoC/App_Config/Include/20_author/Unic.Feature.Flex.Config
rename to src/Unic.Flex.SimpleInjectorIoC/App_Config/Include/01_modules/Unic.Feature.Flex.Config
diff --git a/src/Unic.Flex.SimpleInjectorIoC/App_Config/Include/20_delivery/Unic.Feature.Flex.Config b/src/Unic.Flex.SimpleInjectorIoC/App_Config/Include/20_delivery/Unic.Feature.Flex.Config
deleted file mode 100644
index 96623ba5..00000000
--- a/src/Unic.Flex.SimpleInjectorIoC/App_Config/Include/20_delivery/Unic.Feature.Flex.Config
+++ /dev/null
@@ -1,8 +0,0 @@
-
-  
-    
-      
-      
-    
-  
-
\ No newline at end of file
diff --git a/src/Unic.Flex.SimpleInjectorIoC/Unic.Flex.SimpleInjectorIoC.csproj b/src/Unic.Flex.SimpleInjectorIoC/Unic.Flex.SimpleInjectorIoC.csproj
index 3456a6ea..db7961b4 100644
--- a/src/Unic.Flex.SimpleInjectorIoC/Unic.Flex.SimpleInjectorIoC.csproj
+++ b/src/Unic.Flex.SimpleInjectorIoC/Unic.Flex.SimpleInjectorIoC.csproj
@@ -128,10 +128,7 @@
     
   
   
-    
-      Designer
-    
-    
+    
       Designer
     
     
diff --git a/src/Unic.Flex.Website/App_Config/Include/01_modules_author/Unic.Configuration.config b/src/Unic.Flex.Website/App_Config/Include/01_modules/Unic.Configuration.Serialization.config
similarity index 87%
rename from src/Unic.Flex.Website/App_Config/Include/01_modules_author/Unic.Configuration.config
rename to src/Unic.Flex.Website/App_Config/Include/01_modules/Unic.Configuration.Serialization.config
index 267575a1..8c5cc805 100644
--- a/src/Unic.Flex.Website/App_Config/Include/01_modules_author/Unic.Configuration.config
+++ b/src/Unic.Flex.Website/App_Config/Include/01_modules/Unic.Configuration.Serialization.config
@@ -1,5 +1,5 @@
-
-  
+
+  
 
     
       
diff --git a/src/Unic.Flex.Website/App_Config/Include/01_modules_author/Unic.Flex.config b/src/Unic.Flex.Website/App_Config/Include/01_modules/Unic.Flex.Serialization.config
similarity index 100%
rename from src/Unic.Flex.Website/App_Config/Include/01_modules_author/Unic.Flex.config
rename to src/Unic.Flex.Website/App_Config/Include/01_modules/Unic.Flex.Serialization.config
diff --git a/src/Unic.Flex.Website/Unic.Flex.Website.csproj b/src/Unic.Flex.Website/Unic.Flex.Website.csproj
index 48ba70a0..33fa7212 100644
--- a/src/Unic.Flex.Website/Unic.Flex.Website.csproj
+++ b/src/Unic.Flex.Website/Unic.Flex.Website.csproj
@@ -152,8 +152,8 @@
     
     
     
-    
-    
+    
+    
     
     
       Designer

From 7c787e13f1cf1769016d01a9bcf177295089ea43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joanna=20Boro=C5=84?= 
Date: Wed, 24 May 2023 19:52:39 +0200
Subject: [PATCH 12/14] Add changelog

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index 2febf51e..f556f774 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,12 @@ Sitecore Authors and Marketers to create amazing web form experiences.
 
 ## Changelog
 
+### 6.0
+
+* Upgrade Sitecore from 9.3 to 10.3
+* Remove XP-only features to gain XM compatibility
+* Improve *.config files for easier updates in non-Bob folder structure
+
 ### 5.0
 
 * Migration to GitHub public repository, AppVeyor and NuGet.org

From bc7d3732ec580188439a4ae3ca1576076e5fdc27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joanna=20Boro=C5=84?= 
Date: Mon, 29 May 2023 11:21:37 +0200
Subject: [PATCH 13/14] Upgrade GlassMapper

---
 src/Unic.Flex.Core/Unic.Flex.Core.csproj             |  8 ++++----
 src/Unic.Flex.Core/packages.config                   |  2 +-
 .../Unic.Flex.Implementation.csproj                  |  8 ++++----
 src/Unic.Flex.Implementation/packages.config         |  2 +-
 .../Unic.Flex.Integration.Website.csproj             |  4 ++--
 src/Unic.Flex.Integration.Website/packages.config    |  2 +-
 src/Unic.Flex.Model/Unic.Flex.Model.csproj           |  8 ++++----
 src/Unic.Flex.Model/packages.config                  |  2 +-
 src/Unic.Flex.NinjectIoC/Unic.Flex.NinjectIoC.csproj |  8 ++++----
 src/Unic.Flex.NinjectIoC/packages.config             |  2 +-
 .../Unic.Flex.SimpleInjectorIoC.csproj               | 12 ++++++------
 src/Unic.Flex.SimpleInjectorIoC/packages.config      |  4 ++--
 src/Unic.Flex.Website/Unic.Flex.Website.csproj       |  8 ++++----
 src/Unic.Flex.Website/packages.config                |  2 +-
 .../Unic.Flex.Core.Tests/Unic.Flex.Core.Tests.csproj |  8 ++++----
 tests/Unic.Flex.Core.Tests/packages.config           |  2 +-
 tests/Unic.Flex.Tests/Unic.Flex.Tests.csproj         |  8 ++++----
 tests/Unic.Flex.Tests/packages.config                |  2 +-
 18 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/src/Unic.Flex.Core/Unic.Flex.Core.csproj b/src/Unic.Flex.Core/Unic.Flex.Core.csproj
index 13694756..f829f3a1 100644
--- a/src/Unic.Flex.Core/Unic.Flex.Core.csproj
+++ b/src/Unic.Flex.Core/Unic.Flex.Core.csproj
@@ -47,11 +47,11 @@
     
       ..\..\packages\EntityFramework.6.1.1\lib\net45\EntityFramework.SqlServer.dll
     
-    
-      ..\..\packages\Glass.Mapper.Sc.92.Core.5.5.28\lib\net471\Glass.Mapper.dll
+    
+      ..\..\packages\Glass.Mapper.Sc.103.Core.5.8.181\lib\net48\Glass.Mapper.dll
     
-    
-      ..\..\packages\Glass.Mapper.Sc.92.Core.5.5.28\lib\net471\Glass.Mapper.Sc.dll
+    
+      ..\..\packages\Glass.Mapper.Sc.103.Core.5.8.181\lib\net48\Glass.Mapper.Sc.dll
     
     
       ..\..\packages\MailKit.2.6.0\lib\net47\MailKit.dll
diff --git a/src/Unic.Flex.Core/packages.config b/src/Unic.Flex.Core/packages.config
index de8b4d00..1c496979 100644
--- a/src/Unic.Flex.Core/packages.config
+++ b/src/Unic.Flex.Core/packages.config
@@ -3,7 +3,7 @@
   
   
   
-  
+  
   
   
   
diff --git a/src/Unic.Flex.Implementation/Unic.Flex.Implementation.csproj b/src/Unic.Flex.Implementation/Unic.Flex.Implementation.csproj
index d55b88ad..e8d711f6 100644
--- a/src/Unic.Flex.Implementation/Unic.Flex.Implementation.csproj
+++ b/src/Unic.Flex.Implementation/Unic.Flex.Implementation.csproj
@@ -44,11 +44,11 @@
     
       ..\..\packages\EPPlus.3.1.3.3\lib\net35\EPPlus.dll
     
-    
-      ..\..\packages\Glass.Mapper.Sc.92.Core.5.5.28\lib\net471\Glass.Mapper.dll
+    
+      ..\..\packages\Glass.Mapper.Sc.103.Core.5.8.181\lib\net48\Glass.Mapper.dll
     
-    
-      ..\..\packages\Glass.Mapper.Sc.92.Core.5.5.28\lib\net471\Glass.Mapper.Sc.dll
+    
+      ..\..\packages\Glass.Mapper.Sc.103.Core.5.8.181\lib\net48\Glass.Mapper.Sc.dll
     
     
       ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll
diff --git a/src/Unic.Flex.Implementation/packages.config b/src/Unic.Flex.Implementation/packages.config
index 1e5b5a5f..fdea67d1 100644
--- a/src/Unic.Flex.Implementation/packages.config
+++ b/src/Unic.Flex.Implementation/packages.config
@@ -3,7 +3,7 @@
   
   
   
-  
+  
   
   
   
diff --git a/src/Unic.Flex.Integration.Website/Unic.Flex.Integration.Website.csproj b/src/Unic.Flex.Integration.Website/Unic.Flex.Integration.Website.csproj
index d8e8fd1b..85c4e624 100644
--- a/src/Unic.Flex.Integration.Website/Unic.Flex.Integration.Website.csproj
+++ b/src/Unic.Flex.Integration.Website/Unic.Flex.Integration.Website.csproj
@@ -49,8 +49,8 @@
     
       ..\..\packages\Configy.1.0.0\lib\net45\Configy.dll
     
-    
-      ..\..\packages\Glass.Mapper.Sc.92.Mvc.5.5.28\lib\net471\Glass.Mapper.Sc.Mvc.dll
+    
+      ..\..\packages\Glass.Mapper.Sc.103.Mvc.5.8.181\lib\net48\Glass.Mapper.Sc.Mvc.dll
     
     
       ..\..\packages\Kamsar.WebConsole.2.0.1\lib\net40\Kamsar.WebConsole.dll
diff --git a/src/Unic.Flex.Integration.Website/packages.config b/src/Unic.Flex.Integration.Website/packages.config
index 1d3fb114..724d3ece 100644
--- a/src/Unic.Flex.Integration.Website/packages.config
+++ b/src/Unic.Flex.Integration.Website/packages.config
@@ -1,7 +1,7 @@
 
 
   
-  
+  
   
   
   
diff --git a/src/Unic.Flex.Model/Unic.Flex.Model.csproj b/src/Unic.Flex.Model/Unic.Flex.Model.csproj
index a36b5583..04b25a57 100644
--- a/src/Unic.Flex.Model/Unic.Flex.Model.csproj
+++ b/src/Unic.Flex.Model/Unic.Flex.Model.csproj
@@ -38,11 +38,11 @@
     
       ..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll
     
-    
-      ..\..\packages\Glass.Mapper.Sc.92.Core.5.5.28\lib\net471\Glass.Mapper.dll
+    
+      ..\..\packages\Glass.Mapper.Sc.103.Core.5.8.181\lib\net48\Glass.Mapper.dll
     
-    
-      ..\..\packages\Glass.Mapper.Sc.92.Core.5.5.28\lib\net471\Glass.Mapper.Sc.dll
+    
+      ..\..\packages\Glass.Mapper.Sc.103.Core.5.8.181\lib\net48\Glass.Mapper.Sc.dll
     
     
       ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll
diff --git a/src/Unic.Flex.Model/packages.config b/src/Unic.Flex.Model/packages.config
index f781d891..4eb0565e 100644
--- a/src/Unic.Flex.Model/packages.config
+++ b/src/Unic.Flex.Model/packages.config
@@ -1,7 +1,7 @@
 
 
   
-  
+  
   
   
   
diff --git a/src/Unic.Flex.NinjectIoC/Unic.Flex.NinjectIoC.csproj b/src/Unic.Flex.NinjectIoC/Unic.Flex.NinjectIoC.csproj
index b6f457be..5f2244a6 100644
--- a/src/Unic.Flex.NinjectIoC/Unic.Flex.NinjectIoC.csproj
+++ b/src/Unic.Flex.NinjectIoC/Unic.Flex.NinjectIoC.csproj
@@ -48,11 +48,11 @@
     
       ..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll
     
-    
-      ..\..\packages\Glass.Mapper.Sc.92.Core.5.5.28\lib\net471\Glass.Mapper.dll
+    
+      ..\..\packages\Glass.Mapper.Sc.103.Core.5.8.181\lib\net48\Glass.Mapper.dll
     
-    
-      ..\..\packages\Glass.Mapper.Sc.92.Core.5.5.28\lib\net471\Glass.Mapper.Sc.dll
+    
+      ..\..\packages\Glass.Mapper.Sc.103.Core.5.8.181\lib\net48\Glass.Mapper.Sc.dll
     
     
       ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll
diff --git a/src/Unic.Flex.NinjectIoC/packages.config b/src/Unic.Flex.NinjectIoC/packages.config
index 0ba9aff8..9bf27057 100644
--- a/src/Unic.Flex.NinjectIoC/packages.config
+++ b/src/Unic.Flex.NinjectIoC/packages.config
@@ -1,7 +1,7 @@
 
 
   
-  
+  
   
   
   
diff --git a/src/Unic.Flex.SimpleInjectorIoC/Unic.Flex.SimpleInjectorIoC.csproj b/src/Unic.Flex.SimpleInjectorIoC/Unic.Flex.SimpleInjectorIoC.csproj
index db7961b4..03f81010 100644
--- a/src/Unic.Flex.SimpleInjectorIoC/Unic.Flex.SimpleInjectorIoC.csproj
+++ b/src/Unic.Flex.SimpleInjectorIoC/Unic.Flex.SimpleInjectorIoC.csproj
@@ -49,14 +49,14 @@
     
       ..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll
     
-    
-      ..\..\packages\Glass.Mapper.Sc.92.Core.5.5.28\lib\net471\Glass.Mapper.dll
+    
+      ..\..\packages\Glass.Mapper.Sc.103.Core.5.8.181\lib\net48\Glass.Mapper.dll
     
-    
-      ..\..\packages\Glass.Mapper.Sc.92.Core.5.5.28\lib\net471\Glass.Mapper.Sc.dll
+    
+      ..\..\packages\Glass.Mapper.Sc.103.Core.5.8.181\lib\net48\Glass.Mapper.Sc.dll
     
-    
-      ..\..\packages\Glass.Mapper.Sc.92.Mvc.5.5.28\lib\net471\Glass.Mapper.Sc.Mvc.dll
+    
+      ..\..\packages\Glass.Mapper.Sc.103.Mvc.5.8.181\lib\net48\Glass.Mapper.Sc.Mvc.dll
     
     
       ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll
diff --git a/src/Unic.Flex.SimpleInjectorIoC/packages.config b/src/Unic.Flex.SimpleInjectorIoC/packages.config
index 60d50438..188a8838 100644
--- a/src/Unic.Flex.SimpleInjectorIoC/packages.config
+++ b/src/Unic.Flex.SimpleInjectorIoC/packages.config
@@ -1,8 +1,8 @@
 
 
   
-  
-  
+  
+  
   
   
   
diff --git a/src/Unic.Flex.Website/Unic.Flex.Website.csproj b/src/Unic.Flex.Website/Unic.Flex.Website.csproj
index 33fa7212..dd7adaf8 100644
--- a/src/Unic.Flex.Website/Unic.Flex.Website.csproj
+++ b/src/Unic.Flex.Website/Unic.Flex.Website.csproj
@@ -50,11 +50,11 @@
     
       ..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll
     
-    
-      ..\..\packages\Glass.Mapper.Sc.92.Core.5.5.28\lib\net471\Glass.Mapper.dll
+    
+      ..\..\packages\Glass.Mapper.Sc.103.Core.5.8.181\lib\net48\Glass.Mapper.dll
     
-    
-      ..\..\packages\Glass.Mapper.Sc.92.Core.5.5.28\lib\net471\Glass.Mapper.Sc.dll
+    
+      ..\..\packages\Glass.Mapper.Sc.103.Core.5.8.181\lib\net48\Glass.Mapper.Sc.dll
     
     
       ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll
diff --git a/src/Unic.Flex.Website/packages.config b/src/Unic.Flex.Website/packages.config
index c1f5d333..2f1d5024 100644
--- a/src/Unic.Flex.Website/packages.config
+++ b/src/Unic.Flex.Website/packages.config
@@ -1,7 +1,7 @@
 
 
   
-  
+  
   
   
   
diff --git a/tests/Unic.Flex.Core.Tests/Unic.Flex.Core.Tests.csproj b/tests/Unic.Flex.Core.Tests/Unic.Flex.Core.Tests.csproj
index c87234e1..c268e6fb 100644
--- a/tests/Unic.Flex.Core.Tests/Unic.Flex.Core.Tests.csproj
+++ b/tests/Unic.Flex.Core.Tests/Unic.Flex.Core.Tests.csproj
@@ -38,11 +38,11 @@
     
       ..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll
     
-    
-      ..\..\packages\Glass.Mapper.Sc.92.Core.5.5.28\lib\net471\Glass.Mapper.dll
+    
+      ..\..\packages\Glass.Mapper.Sc.103.Core.5.8.181\lib\net48\Glass.Mapper.dll
     
-    
-      ..\..\packages\Glass.Mapper.Sc.92.Core.5.5.28\lib\net471\Glass.Mapper.Sc.dll
+    
+      ..\..\packages\Glass.Mapper.Sc.103.Core.5.8.181\lib\net48\Glass.Mapper.Sc.dll
     
     
       ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll
diff --git a/tests/Unic.Flex.Core.Tests/packages.config b/tests/Unic.Flex.Core.Tests/packages.config
index b16c2b72..b973868b 100644
--- a/tests/Unic.Flex.Core.Tests/packages.config
+++ b/tests/Unic.Flex.Core.Tests/packages.config
@@ -1,7 +1,7 @@
 
 
   
-  
+  
   
   
   
diff --git a/tests/Unic.Flex.Tests/Unic.Flex.Tests.csproj b/tests/Unic.Flex.Tests/Unic.Flex.Tests.csproj
index 5a0fa6aa..c054acb4 100644
--- a/tests/Unic.Flex.Tests/Unic.Flex.Tests.csproj
+++ b/tests/Unic.Flex.Tests/Unic.Flex.Tests.csproj
@@ -38,11 +38,11 @@
     
       ..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll
     
-    
-      ..\..\packages\Glass.Mapper.Sc.92.Core.5.5.28\lib\net471\Glass.Mapper.dll
+    
+      ..\..\packages\Glass.Mapper.Sc.103.Core.5.8.181\lib\net48\Glass.Mapper.dll
     
-    
-      ..\..\packages\Glass.Mapper.Sc.92.Core.5.5.28\lib\net471\Glass.Mapper.Sc.dll
+    
+      ..\..\packages\Glass.Mapper.Sc.103.Core.5.8.181\lib\net48\Glass.Mapper.Sc.dll
     
     
       ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll
diff --git a/tests/Unic.Flex.Tests/packages.config b/tests/Unic.Flex.Tests/packages.config
index 1c7fe194..bbe206bc 100644
--- a/tests/Unic.Flex.Tests/packages.config
+++ b/tests/Unic.Flex.Tests/packages.config
@@ -1,7 +1,7 @@
 
 
   
-  
+  
   
   
   

From 123290ccf0c9e0a0b26cfda413c8b5501932881e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joanna=20Boro=C5=84?= 
Date: Mon, 29 May 2023 11:30:11 +0200
Subject: [PATCH 14/14] Upgrade Castle.Core

---
 src/Unic.Flex.Core/Unic.Flex.Core.csproj                      | 4 ++--
 src/Unic.Flex.Core/app.config                                 | 2 +-
 src/Unic.Flex.Core/packages.config                            | 2 +-
 src/Unic.Flex.Implementation/Unic.Flex.Implementation.csproj  | 4 ++--
 src/Unic.Flex.Implementation/app.config                       | 2 +-
 src/Unic.Flex.Implementation/packages.config                  | 2 +-
 src/Unic.Flex.Model/Unic.Flex.Model.csproj                    | 4 ++--
 src/Unic.Flex.Model/app.config                                | 2 +-
 src/Unic.Flex.Model/packages.config                           | 2 +-
 src/Unic.Flex.NinjectIoC/Unic.Flex.NinjectIoC.csproj          | 4 ++--
 src/Unic.Flex.NinjectIoC/Web.config                           | 2 +-
 src/Unic.Flex.NinjectIoC/packages.config                      | 2 +-
 .../Unic.Flex.SimpleInjectorIoC.csproj                        | 4 ++--
 src/Unic.Flex.SimpleInjectorIoC/Web.config                    | 2 +-
 src/Unic.Flex.SimpleInjectorIoC/packages.config               | 2 +-
 src/Unic.Flex.Website/Unic.Flex.Website.csproj                | 4 ++--
 src/Unic.Flex.Website/packages.config                         | 2 +-
 src/Unic.Flex.Website/web.config                              | 2 +-
 tests/Unic.Flex.Core.Tests/Unic.Flex.Core.Tests.csproj        | 4 ++--
 tests/Unic.Flex.Core.Tests/app.config                         | 2 +-
 tests/Unic.Flex.Core.Tests/packages.config                    | 2 +-
 tests/Unic.Flex.Implementation.Tests/app.config               | 2 +-
 tests/Unic.Flex.Tests/Unic.Flex.Tests.csproj                  | 4 ++--
 tests/Unic.Flex.Tests/app.config                              | 2 +-
 tests/Unic.Flex.Tests/packages.config                         | 2 +-
 25 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/Unic.Flex.Core/Unic.Flex.Core.csproj b/src/Unic.Flex.Core/Unic.Flex.Core.csproj
index f829f3a1..a299daba 100644
--- a/src/Unic.Flex.Core/Unic.Flex.Core.csproj
+++ b/src/Unic.Flex.Core/Unic.Flex.Core.csproj
@@ -38,8 +38,8 @@
     
       ..\..\packages\Portable.BouncyCastle.1.8.5\lib\net40\BouncyCastle.Crypto.dll
     
-    
-      ..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll
+    
+      ..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll
     
     
       ..\..\packages\EntityFramework.6.1.1\lib\net45\EntityFramework.dll
diff --git a/src/Unic.Flex.Core/app.config b/src/Unic.Flex.Core/app.config
index 1c111dbb..24c29423 100644
--- a/src/Unic.Flex.Core/app.config
+++ b/src/Unic.Flex.Core/app.config
@@ -8,7 +8,7 @@
     
       
         
-        
+        
       
       
         
diff --git a/src/Unic.Flex.Core/packages.config b/src/Unic.Flex.Core/packages.config
index 1c496979..4f17c7b1 100644
--- a/src/Unic.Flex.Core/packages.config
+++ b/src/Unic.Flex.Core/packages.config
@@ -1,7 +1,7 @@
 
 
   
-  
+  
   
   
   
diff --git a/src/Unic.Flex.Implementation/Unic.Flex.Implementation.csproj b/src/Unic.Flex.Implementation/Unic.Flex.Implementation.csproj
index e8d711f6..98f25e22 100644
--- a/src/Unic.Flex.Implementation/Unic.Flex.Implementation.csproj
+++ b/src/Unic.Flex.Implementation/Unic.Flex.Implementation.csproj
@@ -38,8 +38,8 @@
     
       ..\..\packages\BouncyCastle.1.8.5\lib\BouncyCastle.Crypto.dll
     
-    
-      ..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll
+    
+      ..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll
     
     
       ..\..\packages\EPPlus.3.1.3.3\lib\net35\EPPlus.dll
diff --git a/src/Unic.Flex.Implementation/app.config b/src/Unic.Flex.Implementation/app.config
index 35c47966..58cd5a03 100644
--- a/src/Unic.Flex.Implementation/app.config
+++ b/src/Unic.Flex.Implementation/app.config
@@ -12,7 +12,7 @@
       
       
         
-        
+        
       
       
         
diff --git a/src/Unic.Flex.Implementation/packages.config b/src/Unic.Flex.Implementation/packages.config
index fdea67d1..32fafc7e 100644
--- a/src/Unic.Flex.Implementation/packages.config
+++ b/src/Unic.Flex.Implementation/packages.config
@@ -1,7 +1,7 @@
 
 
   
-  
+  
   
   
   
diff --git a/src/Unic.Flex.Model/Unic.Flex.Model.csproj b/src/Unic.Flex.Model/Unic.Flex.Model.csproj
index 04b25a57..041828ac 100644
--- a/src/Unic.Flex.Model/Unic.Flex.Model.csproj
+++ b/src/Unic.Flex.Model/Unic.Flex.Model.csproj
@@ -35,8 +35,8 @@
     4
   
   
-    
-      ..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll
+    
+      ..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll
     
     
       ..\..\packages\Glass.Mapper.Sc.103.Core.5.8.181\lib\net48\Glass.Mapper.dll
diff --git a/src/Unic.Flex.Model/app.config b/src/Unic.Flex.Model/app.config
index 92d4d217..6b96f19c 100644
--- a/src/Unic.Flex.Model/app.config
+++ b/src/Unic.Flex.Model/app.config
@@ -4,7 +4,7 @@
     
       
         
-        
+        
       
       
         
diff --git a/src/Unic.Flex.Model/packages.config b/src/Unic.Flex.Model/packages.config
index 4eb0565e..813eaad3 100644
--- a/src/Unic.Flex.Model/packages.config
+++ b/src/Unic.Flex.Model/packages.config
@@ -1,6 +1,6 @@
 
 
-  
+  
   
   
   
diff --git a/src/Unic.Flex.NinjectIoC/Unic.Flex.NinjectIoC.csproj b/src/Unic.Flex.NinjectIoC/Unic.Flex.NinjectIoC.csproj
index 5f2244a6..442ff028 100644
--- a/src/Unic.Flex.NinjectIoC/Unic.Flex.NinjectIoC.csproj
+++ b/src/Unic.Flex.NinjectIoC/Unic.Flex.NinjectIoC.csproj
@@ -45,8 +45,8 @@
     4
   
   
-    
-      ..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll
+    
+      ..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll
     
     
       ..\..\packages\Glass.Mapper.Sc.103.Core.5.8.181\lib\net48\Glass.Mapper.dll
diff --git a/src/Unic.Flex.NinjectIoC/Web.config b/src/Unic.Flex.NinjectIoC/Web.config
index a4bdccd0..b5e9b4d4 100644
--- a/src/Unic.Flex.NinjectIoC/Web.config
+++ b/src/Unic.Flex.NinjectIoC/Web.config
@@ -20,7 +20,7 @@
     
       
         
-        
+        
       
       
         
diff --git a/src/Unic.Flex.NinjectIoC/packages.config b/src/Unic.Flex.NinjectIoC/packages.config
index 9bf27057..8b70fca1 100644
--- a/src/Unic.Flex.NinjectIoC/packages.config
+++ b/src/Unic.Flex.NinjectIoC/packages.config
@@ -1,6 +1,6 @@
 
 
-  
+  
   
   
   
diff --git a/src/Unic.Flex.SimpleInjectorIoC/Unic.Flex.SimpleInjectorIoC.csproj b/src/Unic.Flex.SimpleInjectorIoC/Unic.Flex.SimpleInjectorIoC.csproj
index 03f81010..7278bf26 100644
--- a/src/Unic.Flex.SimpleInjectorIoC/Unic.Flex.SimpleInjectorIoC.csproj
+++ b/src/Unic.Flex.SimpleInjectorIoC/Unic.Flex.SimpleInjectorIoC.csproj
@@ -46,8 +46,8 @@
     4
   
   
-    
-      ..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll
+    
+      ..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll
     
     
       ..\..\packages\Glass.Mapper.Sc.103.Core.5.8.181\lib\net48\Glass.Mapper.dll
diff --git a/src/Unic.Flex.SimpleInjectorIoC/Web.config b/src/Unic.Flex.SimpleInjectorIoC/Web.config
index 59a24509..7530fecd 100644
--- a/src/Unic.Flex.SimpleInjectorIoC/Web.config
+++ b/src/Unic.Flex.SimpleInjectorIoC/Web.config
@@ -20,7 +20,7 @@
     
       
         
-        
+        
       
       
         
diff --git a/src/Unic.Flex.SimpleInjectorIoC/packages.config b/src/Unic.Flex.SimpleInjectorIoC/packages.config
index 188a8838..59aab714 100644
--- a/src/Unic.Flex.SimpleInjectorIoC/packages.config
+++ b/src/Unic.Flex.SimpleInjectorIoC/packages.config
@@ -1,6 +1,6 @@
 
 
-  
+  
   
   
   
diff --git a/src/Unic.Flex.Website/Unic.Flex.Website.csproj b/src/Unic.Flex.Website/Unic.Flex.Website.csproj
index dd7adaf8..d8ff1346 100644
--- a/src/Unic.Flex.Website/Unic.Flex.Website.csproj
+++ b/src/Unic.Flex.Website/Unic.Flex.Website.csproj
@@ -47,8 +47,8 @@
     4
   
   
-    
-      ..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll
+    
+      ..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll
     
     
       ..\..\packages\Glass.Mapper.Sc.103.Core.5.8.181\lib\net48\Glass.Mapper.dll
diff --git a/src/Unic.Flex.Website/packages.config b/src/Unic.Flex.Website/packages.config
index 2f1d5024..828f781d 100644
--- a/src/Unic.Flex.Website/packages.config
+++ b/src/Unic.Flex.Website/packages.config
@@ -1,6 +1,6 @@
 
 
-  
+  
   
   
   
diff --git a/src/Unic.Flex.Website/web.config b/src/Unic.Flex.Website/web.config
index 1890d4f3..17147829 100644
--- a/src/Unic.Flex.Website/web.config
+++ b/src/Unic.Flex.Website/web.config
@@ -36,7 +36,7 @@
       
       
         
-        
+        
       
       
         
diff --git a/tests/Unic.Flex.Core.Tests/Unic.Flex.Core.Tests.csproj b/tests/Unic.Flex.Core.Tests/Unic.Flex.Core.Tests.csproj
index c268e6fb..887ac491 100644
--- a/tests/Unic.Flex.Core.Tests/Unic.Flex.Core.Tests.csproj
+++ b/tests/Unic.Flex.Core.Tests/Unic.Flex.Core.Tests.csproj
@@ -35,8 +35,8 @@
     4
   
   
-    
-      ..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll
+    
+      ..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll
     
     
       ..\..\packages\Glass.Mapper.Sc.103.Core.5.8.181\lib\net48\Glass.Mapper.dll
diff --git a/tests/Unic.Flex.Core.Tests/app.config b/tests/Unic.Flex.Core.Tests/app.config
index fda53956..e55384d9 100644
--- a/tests/Unic.Flex.Core.Tests/app.config
+++ b/tests/Unic.Flex.Core.Tests/app.config
@@ -12,7 +12,7 @@
       
       
         
-        
+        
       
       
         
diff --git a/tests/Unic.Flex.Core.Tests/packages.config b/tests/Unic.Flex.Core.Tests/packages.config
index b973868b..817502cb 100644
--- a/tests/Unic.Flex.Core.Tests/packages.config
+++ b/tests/Unic.Flex.Core.Tests/packages.config
@@ -1,6 +1,6 @@
 
 
-  
+  
   
   
   
diff --git a/tests/Unic.Flex.Implementation.Tests/app.config b/tests/Unic.Flex.Implementation.Tests/app.config
index 823b7b40..7bc33c8b 100644
--- a/tests/Unic.Flex.Implementation.Tests/app.config
+++ b/tests/Unic.Flex.Implementation.Tests/app.config
@@ -20,7 +20,7 @@
       
       
         
-        
+        
       
     
   
diff --git a/tests/Unic.Flex.Tests/Unic.Flex.Tests.csproj b/tests/Unic.Flex.Tests/Unic.Flex.Tests.csproj
index c054acb4..82176713 100644
--- a/tests/Unic.Flex.Tests/Unic.Flex.Tests.csproj
+++ b/tests/Unic.Flex.Tests/Unic.Flex.Tests.csproj
@@ -35,8 +35,8 @@
     4
   
   
-    
-      ..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll
+    
+      ..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll
     
     
       ..\..\packages\Glass.Mapper.Sc.103.Core.5.8.181\lib\net48\Glass.Mapper.dll
diff --git a/tests/Unic.Flex.Tests/app.config b/tests/Unic.Flex.Tests/app.config
index 9553864a..98b1aa51 100644
--- a/tests/Unic.Flex.Tests/app.config
+++ b/tests/Unic.Flex.Tests/app.config
@@ -20,7 +20,7 @@
       
       
         
-        
+        
       
     
   
diff --git a/tests/Unic.Flex.Tests/packages.config b/tests/Unic.Flex.Tests/packages.config
index bbe206bc..4eb6d947 100644
--- a/tests/Unic.Flex.Tests/packages.config
+++ b/tests/Unic.Flex.Tests/packages.config
@@ -1,6 +1,6 @@
 
 
-  
+