Added an option to define a folder for client assets used in custom criteria, avoiding issue with build removing them from the package's App_Plugins folder.

PersonalisationGroups/App_Plugins/PersonalisationGroups/personalisaton-group-definition.controller.js

@@ -80,7 +80,13 @@
 
             $scope.editDefinitionDetail = function (definitionDetail) {
                 editingNew = false;
-                var templateUrl = "/App_Plugins/PersonalisationGroups/Criteria/" + convertAliasToFolderName(definitionDetail.alias) + "/definition.editor.html";
+
+                var clientAssetsFolder = getCriteriaByAlias(definitionDetail.alias).clientAssetsFolder;
+                if (!clientAssetsFolder) {
+                    clientAssetsFolder = "PersonalisationGroups/Criteria";
+                }
+
+                var templateUrl = "/App_Plugins/" + clientAssetsFolder + "/" + convertAliasToFolderName(definitionDetail.alias) + "/definition.editor.html";
 
                 editorService.open(
                     {

PersonalisationGroups/Criteria/AuthenticationStatus/AuthenticationStatusPersonalisationGroupCriteria.cs

@@ -7,7 +7,7 @@ namespace Our.Umbraco.PersonalisationGroups.Criteria.AuthenticationStatus
     /// <summary>
     /// Implements a personalisation group criteria based on whether the user is logged on or not
     /// </summary>
-    public class AuthenticationStatusPersonalisationGroupCriteria : IPersonalisationGroupCriteria
+    public class AuthenticationStatusPersonalisationGroupCriteria : PersonalisationGroupCriteriaBase, IPersonalisationGroupCriteria
     {
         private readonly IAuthenticationStatusProvider _authenticationStatusProvider;
 

PersonalisationGroups/Criteria/Continent/ContinentPersonalisationGroupCriteria.cs

@@ -9,7 +9,7 @@ namespace Our.Umbraco.PersonalisationGroups.Criteria.Continent
     /// <summary>
     /// Implements a personalisation group criteria based on the country derived from the vistor's IP address
     /// </summary>
-    public class ContinentPersonalisationGroupCriteria : IPersonalisationGroupCriteria
+    public class ContinentPersonalisationGroupCriteria : PersonalisationGroupCriteriaBase, IPersonalisationGroupCriteria
     {
         private readonly IIpProvider _ipProvider;
         private readonly IGeoLocationProvider _geoLocationProvider;

PersonalisationGroups/Criteria/Country/CountryPersonalisationGroupCriteria.cs

@@ -8,7 +8,7 @@
     /// <summary>
     /// Implements a personalisation group criteria based on the country derived from the vistor's IP address
     /// </summary>
-    public class CountryPersonalisationGroupCriteria : IPersonalisationGroupCriteria
+    public class CountryPersonalisationGroupCriteria : PersonalisationGroupCriteriaBase, IPersonalisationGroupCriteria
     {
         private readonly ICountryCodeProvider _countryCodeProvider;
 

PersonalisationGroups/Criteria/DayOfWeek/DayOfWeekPersonalisationGroupCriteria.cs

@@ -8,7 +8,7 @@
     /// <summary>
     /// Implements a personalisation group criteria based on the day of the week
     /// </summary>
-    public class DayOfWeekPersonalisationGroupCriteria : IPersonalisationGroupCriteria
+    public class DayOfWeekPersonalisationGroupCriteria : PersonalisationGroupCriteriaBase, IPersonalisationGroupCriteria
     {
         private readonly IDateTimeProvider _dateTimeProvider;
 

PersonalisationGroups/Criteria/IPersonalisationGroupCriteria.cs

@@ -20,6 +20,11 @@ public interface IPersonalisationGroupCriteria
         /// </summary>
         string Description { get; }
 
+        /// <summary>
+        /// Gets the client assets folder
+        /// </summary>
+        string ClientAssetsFolder { get; }
+
         /// <summary>
         /// Checks whether the attributes of the current site visitor match the provided definition
         /// </summary>

PersonalisationGroups/Criteria/MemberGroup/MemberGroupPersonalisationGroupCriteria.cs

@@ -8,7 +8,7 @@ namespace Our.Umbraco.PersonalisationGroups.Criteria.MemberGroup
     /// <summary>
     /// Implements a personalisation group criteria based on the presence, absence or value of a session key
     /// </summary>
-    public class MemberGroupPersonalisationGroupCriteria : IPersonalisationGroupCriteria
+    public class MemberGroupPersonalisationGroupCriteria : PersonalisationGroupCriteriaBase, IPersonalisationGroupCriteria
     {
         private readonly IMemberGroupProvider _memberGroupProvider;
 

PersonalisationGroups/Criteria/MemberType/MemberTypePersonalisationGroupCriteria.cs

@@ -7,7 +7,7 @@ namespace Our.Umbraco.PersonalisationGroups.Criteria.MemberType
     /// <summary>
     /// Implements a personalisation group criteria based on the presence, absence or value of a session key
     /// </summary>
-    public class MemberTypePersonalisationGroupCriteria : IPersonalisationGroupCriteria
+    public class MemberTypePersonalisationGroupCriteria : PersonalisationGroupCriteriaBase, IPersonalisationGroupCriteria
     {
         private readonly IMemberTypeProvider _memberTypeProvider;
 

PersonalisationGroups/Criteria/MonthOfYear/MonthOfYearPersonalisationGroupCriteria.cs

@@ -8,7 +8,7 @@ namespace Our.Umbraco.PersonalisationGroups.Criteria.MonthOfYear
     /// <summary>
     /// Implements a personalisation group criteria based on the month of the year
     /// </summary>
-    public class MonthOfYearPersonalisationGroupCriteria : IPersonalisationGroupCriteria
+    public class MonthOfYearPersonalisationGroupCriteria : PersonalisationGroupCriteriaBase, IPersonalisationGroupCriteria
     {
         private readonly IDateTimeProvider _dateTimeProvider;
 

PersonalisationGroups/Criteria/NumberOfVisits/NumberOfVisitsPersonalisationGroupCriteria.cs

@@ -7,7 +7,7 @@ namespace Our.Umbraco.PersonalisationGroups.Criteria.NumberOfVisits
     /// <summary>
     /// Implements a personalisation group criteria based on the whether certain pages (node Ids) have been viewed
     /// </summary>
-    public class NumberOfVisitsPersonalisationGroupCriteria : IPersonalisationGroupCriteria
+    public class NumberOfVisitsPersonalisationGroupCriteria : PersonalisationGroupCriteriaBase, IPersonalisationGroupCriteria
     {
         internal static string CriteriaAlias = "numberOfVisits";
 

PersonalisationGroups/Criteria/PagesViewed/PagesViewedPersonalisationGroupCriteria.cs

@@ -8,7 +8,7 @@ namespace Our.Umbraco.PersonalisationGroups.Criteria.PagesViewed
     /// <summary>
     /// Implements a personalisation group criteria based on the whether certain pages (node Ids) have been viewed
     /// </summary>
-    public class PagesViewedPersonalisationGroupCriteria : IPersonalisationGroupCriteria
+    public class PagesViewedPersonalisationGroupCriteria : PersonalisationGroupCriteriaBase, IPersonalisationGroupCriteria
     {
         internal static string CriteriaAlias = "pagesViewed";
 

PersonalisationGroups/Criteria/PersonalisationGroupCriteriaBase.cs

@@ -9,6 +9,8 @@ namespace Our.Umbraco.PersonalisationGroups.Criteria
     /// </summary>
     public abstract class PersonalisationGroupCriteriaBase
     {
+        public virtual string ClientAssetsFolder => "PersonalisationGroups/Criteria";
+
         protected static bool MatchesValue(string valueFromContext, string valueFromDefinition)
         {
             if (valueFromContext == null)
@@ -58,7 +60,7 @@ protected bool CompareValues(string value, string definitionValue, Comparison co
             return StringCompare(value, definitionValue, comparison);
         }
 
-        private bool DateCompare(string value, string definitionValue, Comparison comparison, out bool comparisonMade)
+        private static bool DateCompare(string value, string definitionValue, Comparison comparison, out bool comparisonMade)
         {
             if (DateTime.TryParse(value, out DateTime dateValue) && DateTime.TryParse(definitionValue, out DateTime dateDefinitionValue))
             {

PersonalisationGroups/Criteria/Region/RegionPersonalisationGroupCriteria.cs

@@ -9,7 +9,7 @@ namespace Our.Umbraco.PersonalisationGroups.Criteria.Region
     /// <summary>
     /// Implements a personalisation group criteria based on the country derived from the vistor's IP address
     /// </summary>
-    public class RegionPersonalisationGroupCriteria : IPersonalisationGroupCriteria
+    public class RegionPersonalisationGroupCriteria : PersonalisationGroupCriteriaBase, IPersonalisationGroupCriteria
     {
         private readonly IIpProvider _ipProvider;
         private readonly IGeoLocationProvider _geoLocationProvider;

PersonalisationGroups/Criteria/TimeOfDay/TimeOfDayPersonalisationGroupCriteria.cs

@@ -9,7 +9,7 @@ namespace Our.Umbraco.PersonalisationGroups.Criteria.TimeOfDay
     /// <summary>
     /// Implements a personalisation group criteria based on the time of the day
     /// </summary>
-    public class TimeOfDayPersonalisationGroupCriteria : IPersonalisationGroupCriteria
+    public class TimeOfDayPersonalisationGroupCriteria : PersonalisationGroupCriteriaBase, IPersonalisationGroupCriteria
     {
         private readonly IDateTimeProvider _dateTimeProvider;
 

PersonalisationGroups/UmbracoPersonalisationGroups.csproj

@@ -6,7 +6,7 @@
     <ContentTargetFolders>.</ContentTargetFolders>
     <TargetFramework>net5.0</TargetFramework>
     <PackageId>UmbracoPersonalisationGroups</PackageId>
-    <Version>3.0.0</Version>
+    <Version>3.1.0-alpha001</Version>
     <Authors>Andy Butland</Authors>
     <Description>An Umbraco package supporting personalisation of content to different groups of site visitors.</Description>
     <Copyright>2021 Andy Butland</Copyright>