Merge branch 'maintenance/AttributeValueDictionary' into develop

JeremyCaney · JeremyCaney · commit cec9de4ec18e · 2022-06-24T20:30:06.000-07:00
The `AttributeDictionary` class (OnTopicCMS/OnTopic-Library#99) introduces a conflict with the `AttributeDictionary` in `Microsoft.AspNetCore.Mvc.ViewFeatures`, which is often used as a namespace in model libraries (OnTopicCMS/OnTopic-Library#107). To disambiguate this, it's been renamed to `AttributeValueDictionary` in OnTopic Library 5.2.0 Alpha 255 (b243853). The editor's view models have been updated to utilize this new naming convention (1ca4eb4).
diff --git a/OnTopic.Editor.AspNetCore.Attributes/BooleanAttribute/BooleanAttributeDescriptorViewModel.cs b/OnTopic.Editor.AspNetCore.Attributes/BooleanAttribute/BooleanAttributeDescriptorViewModel.cs
@@ -20,8 +20,8 @@ public record BooleanAttributeDescriptorViewModel: AttributeDescriptorViewModel
     /// <summary>
     ///   Initializes a new <see cref="BooleanAttributeDescriptorViewModel"/> with an <paramref name="attributes"/> dictionary.
     /// </summary>
-    /// <param name="attributes">An <see cref="AttributeDictionary"/> of attribute values.</param>
-    public BooleanAttributeDescriptorViewModel(AttributeDictionary attributes): base(attributes) { }
+    /// <param name="attributes">An <see cref="AttributeValueDictionary"/> of attribute values.</param>
+    public BooleanAttributeDescriptorViewModel(AttributeValueDictionary attributes): base(attributes) { }
 
     /// <summary>
     ///   Initializes a new instance of the <see cref="BooleanAttributeDescriptorViewModel"/> class.
diff --git a/OnTopic.Editor.AspNetCore.Attributes/DateTimeAttribute/DateTimeAttributeDescriptorViewModel.cs b/OnTopic.Editor.AspNetCore.Attributes/DateTimeAttribute/DateTimeAttributeDescriptorViewModel.cs
@@ -20,8 +20,8 @@ public record DateTimeAttributeDescriptorViewModel: AttributeDescriptorViewModel
     /// <summary>
     ///   Initializes a new <see cref="DateTimeAttributeDescriptorViewModel"/> with an <paramref name="attributes"/> dictionary.
     /// </summary>
-    /// <param name="attributes">An <see cref="AttributeDictionary"/> of attribute values.</param>
-    public DateTimeAttributeDescriptorViewModel(AttributeDictionary attributes): base(attributes) {
+    /// <param name="attributes">An <see cref="AttributeValueDictionary"/> of attribute values.</param>
+    public DateTimeAttributeDescriptorViewModel(AttributeValueDictionary attributes): base(attributes) {
       Contract.Requires(attributes, nameof(attributes));
       IncludeDatePicker         = attributes.GetBoolean(nameof(IncludeDatePicker));
       IncludeTimePicker         = attributes.GetBoolean(nameof(IncludeTimePicker));
diff --git a/OnTopic.Editor.AspNetCore.Attributes/FileListAttribute/FileListAttributeDescriptorViewModel.cs b/OnTopic.Editor.AspNetCore.Attributes/FileListAttribute/FileListAttributeDescriptorViewModel.cs
@@ -20,8 +20,8 @@ public record FileListAttributeDescriptorViewModel: AttributeDescriptorViewModel
     /// <summary>
     ///   Initializes a new <see cref="FileListAttributeDescriptorViewModel"/> with an <paramref name="attributes"/> dictionary.
     /// </summary>
-    /// <param name="attributes">An <see cref="AttributeDictionary"/> of attribute values.</param>
-    public FileListAttributeDescriptorViewModel(AttributeDictionary attributes): base(attributes) {
+    /// <param name="attributes">An <see cref="AttributeValueDictionary"/> of attribute values.</param>
+    public FileListAttributeDescriptorViewModel(AttributeValueDictionary attributes): base(attributes) {
       Contract.Requires(attributes, nameof(attributes));
       Path                      = attributes.GetValue(nameof(Path));
       Extension                 = attributes.GetValue(nameof(Extension));
diff --git a/OnTopic.Editor.AspNetCore.Attributes/FilePathAttribute/FilePathAttributeDescriptorViewModel.cs b/OnTopic.Editor.AspNetCore.Attributes/FilePathAttribute/FilePathAttributeDescriptorViewModel.cs
@@ -20,8 +20,8 @@ public record FilePathAttributeDescriptorViewModel: AttributeDescriptorViewModel
     /// <summary>
     ///   Initializes a new <see cref="FilePathAttributeDescriptorViewModel"/> with an <paramref name="attributes"/> dictionary.
     /// </summary>
-    /// <param name="attributes">An <see cref="AttributeDictionary"/> of attribute values.</param>
-    public FilePathAttributeDescriptorViewModel(AttributeDictionary attributes): base(attributes) {
+    /// <param name="attributes">An <see cref="AttributeValueDictionary"/> of attribute values.</param>
+    public FilePathAttributeDescriptorViewModel(AttributeValueDictionary attributes): base(attributes) {
       Contract.Requires(attributes, nameof(attributes));
       InheritValue              = attributes.GetBoolean(nameof(InheritValue))?? InheritValue;
       RelativeToTopicPath       = attributes.GetBoolean(nameof(RelativeToTopicPath))?? RelativeToTopicPath;
diff --git a/OnTopic.Editor.AspNetCore.Attributes/HtmlAttribute/HtmlAttributeDescriptorViewModel.cs b/OnTopic.Editor.AspNetCore.Attributes/HtmlAttribute/HtmlAttributeDescriptorViewModel.cs
@@ -21,8 +21,8 @@ public record HtmlAttributeDescriptorViewModel: TextAreaAttributeDescriptorViewM
     /// <summary>
     ///   Initializes a new <see cref="HtmlAttributeDescriptorViewModel"/> with an <paramref name="attributes"/> dictionary.
     /// </summary>
-    /// <param name="attributes">An <see cref="AttributeDictionary"/> of attribute values.</param>
-    public HtmlAttributeDescriptorViewModel(AttributeDictionary attributes): base(attributes) {
+    /// <param name="attributes">An <see cref="AttributeValueDictionary"/> of attribute values.</param>
+    public HtmlAttributeDescriptorViewModel(AttributeValueDictionary attributes): base(attributes) {
       Contract.Requires(attributes, nameof(attributes));
       Height                    = attributes.GetInteger(nameof(Height));
       Rows                      = 20;
diff --git a/OnTopic.Editor.AspNetCore.Attributes/IncomingRelationshipAttribute/IncomingRelationshipAttributeDescriptorViewModel.cs b/OnTopic.Editor.AspNetCore.Attributes/IncomingRelationshipAttribute/IncomingRelationshipAttributeDescriptorViewModel.cs
@@ -24,8 +24,8 @@ public record IncomingRelationshipAttributeDescriptorViewModel: QueryableTopicLi
     ///   Initializes a new <see cref="IncomingRelationshipAttributeDescriptorViewModel"/> with an <paramref name="attributes"/>
     ///   dictionary.
     /// </summary>
-    /// <param name="attributes">An <see cref="AttributeDictionary"/> of attribute values.</param>
-    public IncomingRelationshipAttributeDescriptorViewModel(AttributeDictionary attributes): base(attributes) {
+    /// <param name="attributes">An <see cref="AttributeValueDictionary"/> of attribute values.</param>
+    public IncomingRelationshipAttributeDescriptorViewModel(AttributeValueDictionary attributes): base(attributes) {
       Contract.Requires(attributes, nameof(attributes));
       RelationshipKey           = attributes.GetValue(nameof(RelationshipKey));
     }
diff --git a/OnTopic.Editor.AspNetCore.Attributes/InstructionAttribute/InstructionAttributeDescriptorViewModel.cs b/OnTopic.Editor.AspNetCore.Attributes/InstructionAttribute/InstructionAttributeDescriptorViewModel.cs
@@ -21,8 +21,8 @@ public record InstructionAttributeDescriptorViewModel: AttributeDescriptorViewMo
     ///   Initializes a new <see cref="InstructionAttributeDescriptorViewModel"/> with an <paramref name="attributes"/>
     ///   dictionary.
     /// </summary>
-    /// <param name="attributes">An <see cref="AttributeDictionary"/> of attribute values.</param>
-    public InstructionAttributeDescriptorViewModel(AttributeDictionary attributes): base(attributes) {
+    /// <param name="attributes">An <see cref="AttributeValueDictionary"/> of attribute values.</param>
+    public InstructionAttributeDescriptorViewModel(AttributeValueDictionary attributes): base(attributes) {
       Contract.Requires(attributes, nameof(attributes));
       Instructions              = attributes.GetValue(nameof(Instructions));
     }
diff --git a/OnTopic.Editor.AspNetCore.Attributes/LastModifiedAttribute/LastModifiedAttributeDescriptorViewModel.cs b/OnTopic.Editor.AspNetCore.Attributes/LastModifiedAttribute/LastModifiedAttributeDescriptorViewModel.cs
@@ -21,8 +21,8 @@ public record LastModifiedAttributeDescriptorViewModel: AttributeDescriptorViewM
     ///   Initializes a new <see cref="LastModifiedAttributeDescriptorViewModel"/> with an <paramref name="attributes"/>
     ///   dictionary.
     /// </summary>
-    /// <param name="attributes">An <see cref="AttributeDictionary"/> of attribute values.</param>
-    public LastModifiedAttributeDescriptorViewModel(AttributeDictionary attributes): base(attributes) { }
+    /// <param name="attributes">An <see cref="AttributeValueDictionary"/> of attribute values.</param>
+    public LastModifiedAttributeDescriptorViewModel(AttributeValueDictionary attributes): base(attributes) { }
 
     /// <summary>
     ///   Initializes a new instance of the <see cref="LastModifiedAttributeDescriptorViewModel"/> class.
diff --git a/OnTopic.Editor.AspNetCore.Attributes/LastModifiedByAttribute/LastModifiedByAttributeDescriptorViewModel.cs b/OnTopic.Editor.AspNetCore.Attributes/LastModifiedByAttribute/LastModifiedByAttributeDescriptorViewModel.cs
@@ -21,8 +21,8 @@ public record LastModifiedByAttributeDescriptorViewModel: AttributeDescriptorVie
     ///   Initializes a new <see cref="LastModifiedByAttributeDescriptorViewModel"/> with an <paramref name="attributes"/>
     ///   dictionary.
     /// </summary>
-    /// <param name="attributes">An <see cref="AttributeDictionary"/> of attribute values.</param>
-    public LastModifiedByAttributeDescriptorViewModel(AttributeDictionary attributes): base(attributes) { }
+    /// <param name="attributes">An <see cref="AttributeValueDictionary"/> of attribute values.</param>
+    public LastModifiedByAttributeDescriptorViewModel(AttributeValueDictionary attributes): base(attributes) { }
 
     /// <summary>
     ///   Initializes a new instance of the <see cref="LastModifiedByAttributeDescriptorViewModel"/> class.
diff --git a/OnTopic.Editor.AspNetCore.Attributes/MetadataListAttribute/MetadataListAttributeDescriptorViewModel.cs b/OnTopic.Editor.AspNetCore.Attributes/MetadataListAttribute/MetadataListAttributeDescriptorViewModel.cs
@@ -21,8 +21,8 @@ public record MetadataListAttributeDescriptorViewModel: TopicListAttributeDescri
     /// <summary>
     ///   Initializes a new <see cref="MetadataListAttributeDescriptorViewModel"/> with an <paramref name="attributes"/> dictionary.
     /// </summary>
-    /// <param name="attributes">An <see cref="AttributeDictionary"/> of attribute values.</param>
-    public MetadataListAttributeDescriptorViewModel(AttributeDictionary attributes): base(attributes) {
+    /// <param name="attributes">An <see cref="AttributeValueDictionary"/> of attribute values.</param>
+    public MetadataListAttributeDescriptorViewModel(AttributeValueDictionary attributes): base(attributes) {
       RelativeTopicPath         = "LookupList";
     }
 
diff --git a/OnTopic.Editor.AspNetCore.Attributes/NestedTopicListAttribute/NestedTopicListAttributeDescriptorViewModel.cs b/OnTopic.Editor.AspNetCore.Attributes/NestedTopicListAttribute/NestedTopicListAttributeDescriptorViewModel.cs
@@ -21,8 +21,8 @@ public record NestedTopicListAttributeDescriptorViewModel: ContentTypeListAttrib
     /// <summary>
     ///   Initializes a new <see cref="NestedTopicListAttributeDescriptorViewModel"/> with an <paramref name="attributes"/> dictionary.
     /// </summary>
-    /// <param name="attributes">An <see cref="AttributeDictionary"/> of attribute values.</param>
-    public NestedTopicListAttributeDescriptorViewModel(AttributeDictionary attributes): base(attributes) {
+    /// <param name="attributes">An <see cref="AttributeValueDictionary"/> of attribute values.</param>
+    public NestedTopicListAttributeDescriptorViewModel(AttributeValueDictionary attributes): base(attributes) {
       RegisterResources();
     }
 
diff --git a/OnTopic.Editor.AspNetCore.Attributes/NumberAttribute/NumberAttributeDescriptorViewModel.cs b/OnTopic.Editor.AspNetCore.Attributes/NumberAttribute/NumberAttributeDescriptorViewModel.cs
@@ -21,8 +21,8 @@ public record NumberAttributeDescriptorViewModel: AttributeDescriptorViewModel {
     ///   Initializes a new <see cref="NumberAttributeDescriptorViewModel"/> with an <paramref name="attributes"/>
     ///   dictionary.
     /// </summary>
-    /// <param name="attributes">An <see cref="AttributeDictionary"/> of attribute values.</param>
-    public NumberAttributeDescriptorViewModel(AttributeDictionary attributes): base(attributes) {
+    /// <param name="attributes">An <see cref="AttributeValueDictionary"/> of attribute values.</param>
+    public NumberAttributeDescriptorViewModel(AttributeValueDictionary attributes): base(attributes) {
       Contract.Requires(attributes, nameof(attributes));
       MinimumValue              = attributes.GetInteger(nameof(MinimumValue))?? MinimumValue;
       MaximumValue              = attributes.GetInteger(nameof(MaximumValue))?? MaximumValue;
diff --git a/OnTopic.Editor.AspNetCore.Attributes/OnTopic.Editor.AspNetCore.Attributes.csproj b/OnTopic.Editor.AspNetCore.Attributes/OnTopic.Editor.AspNetCore.Attributes.csproj
@@ -25,7 +25,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="OnTopic" Version="5.2.0-alpha.234" />
+    <PackageReference Include="OnTopic" Version="5.2.0-alpha.255" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/OnTopic.Editor.AspNetCore.Attributes/QueryableTopicListAttribute/QueryableTopicListAttributeDescriptorViewModel.cs b/OnTopic.Editor.AspNetCore.Attributes/QueryableTopicListAttribute/QueryableTopicListAttributeDescriptorViewModel.cs
@@ -28,8 +28,8 @@ public record QueryableTopicListAttributeDescriptorViewModel: AttributeDescripto
     ///   Initializes a new <see cref="QueryableTopicListAttributeDescriptorViewModel"/> with an <paramref name="attributes"/>
     ///   dictionary.
     /// </summary>
-    /// <param name="attributes">An <see cref="AttributeDictionary"/> of attribute values.</param>
-    public QueryableTopicListAttributeDescriptorViewModel(AttributeDictionary attributes): base(attributes) {
+    /// <param name="attributes">An <see cref="AttributeValueDictionary"/> of attribute values.</param>
+    public QueryableTopicListAttributeDescriptorViewModel(AttributeValueDictionary attributes): base(attributes) {
       Contract.Requires(attributes, nameof(attributes));
       AttributeKey              = attributes.GetValue(nameof(AttributeKey));
       AttributeValue            = attributes.GetValue(nameof(AttributeValue));
diff --git a/OnTopic.Editor.AspNetCore.Attributes/ReflexiveAttribute/ReflexiveAttributeDescriptorViewModel.cs b/OnTopic.Editor.AspNetCore.Attributes/ReflexiveAttribute/ReflexiveAttributeDescriptorViewModel.cs
@@ -21,8 +21,8 @@ public record ReflexiveAttributeDescriptorViewModel: AttributeDescriptorViewMode
     ///   Initializes a new <see cref="ReflexiveAttributeDescriptorViewModel"/> with an <paramref name="attributes"/>
     ///   dictionary.
     /// </summary>
-    /// <param name="attributes">An <see cref="AttributeDictionary"/> of attribute values.</param>
-    public ReflexiveAttributeDescriptorViewModel(AttributeDictionary attributes): base(attributes) { }
+    /// <param name="attributes">An <see cref="AttributeValueDictionary"/> of attribute values.</param>
+    public ReflexiveAttributeDescriptorViewModel(AttributeValueDictionary attributes): base(attributes) { }
 
     /// <summary>
     ///   Initializes a new instance of the <see cref="ReflexiveAttributeDescriptorViewModel"/> class.
diff --git a/OnTopic.Editor.AspNetCore.Attributes/RelationshipAttribute/RelationshipAttributeDescriptorViewModel.cs b/OnTopic.Editor.AspNetCore.Attributes/RelationshipAttribute/RelationshipAttributeDescriptorViewModel.cs
@@ -21,8 +21,8 @@ public record RelationshipAttributeDescriptorViewModel: QueryableTopicListAttrib
     /// <summary>
     ///   Initializes a new <see cref="RelationshipAttributeDescriptorViewModel"/> with an <paramref name="attributes"/> dictionary.
     /// </summary>
-    /// <param name="attributes">An <see cref="AttributeDictionary"/> of attribute values.</param>
-    public RelationshipAttributeDescriptorViewModel(AttributeDictionary attributes): base(attributes) {
+    /// <param name="attributes">An <see cref="AttributeValueDictionary"/> of attribute values.</param>
+    public RelationshipAttributeDescriptorViewModel(AttributeValueDictionary attributes): base(attributes) {
       Contract.Requires(attributes, nameof(attributes));
       ShowRoot                  = attributes.GetBoolean(nameof(ShowRoot));
       ExpandRelated             = attributes.GetBoolean(nameof(ExpandRelated));
diff --git a/OnTopic.Editor.AspNetCore.Attributes/TextAreaAttribute/TextAreaAttributeDescriptorViewModel.cs b/OnTopic.Editor.AspNetCore.Attributes/TextAreaAttribute/TextAreaAttributeDescriptorViewModel.cs
@@ -22,8 +22,8 @@ public record TextAreaAttributeDescriptorViewModel: AttributeDescriptorViewModel
     ///   Initializes a new <see cref="TextAreaAttributeDescriptorViewModel"/> with an <paramref name="attributes"/>
     ///   dictionary.
     /// </summary>
-    /// <param name="attributes">An <see cref="AttributeDictionary"/> of attribute values.</param>
-    public TextAreaAttributeDescriptorViewModel(AttributeDictionary attributes): base(attributes) {
+    /// <param name="attributes">An <see cref="AttributeValueDictionary"/> of attribute values.</param>
+    public TextAreaAttributeDescriptorViewModel(AttributeValueDictionary attributes): base(attributes) {
       Contract.Requires(attributes, nameof(attributes));
       Rows                      = attributes.GetInteger(nameof(Rows))?? Rows;
       MinimumLength             = attributes.GetInteger(nameof(MinimumLength))?? MinimumLength;
diff --git a/OnTopic.Editor.AspNetCore.Attributes/TextAttribute/TextAttributeDescriptorViewModel.cs b/OnTopic.Editor.AspNetCore.Attributes/TextAttribute/TextAttributeDescriptorViewModel.cs
@@ -21,8 +21,8 @@ public record TextAttributeDescriptorViewModel: AttributeDescriptorViewModel {
     ///   Initializes a new <see cref="TextAttributeDescriptorViewModel"/> with an <paramref name="attributes"/>
     ///   dictionary.
     /// </summary>
-    /// <param name="attributes">An <see cref="AttributeDictionary"/> of attribute values.</param>
-    public TextAttributeDescriptorViewModel(AttributeDictionary attributes): base(attributes) {
+    /// <param name="attributes">An <see cref="AttributeValueDictionary"/> of attribute values.</param>
+    public TextAttributeDescriptorViewModel(AttributeValueDictionary attributes): base(attributes) {
       Contract.Requires(attributes, nameof(attributes));
       MinimumLength             = attributes.GetInteger(nameof(MinimumLength));
       MaximumLength             = attributes.GetInteger(nameof(MaximumLength));
diff --git a/OnTopic.Editor.AspNetCore.Attributes/TokenizedTopicListAttribute/TokenizedTopicListAttributeDescriptorViewModel.cs b/OnTopic.Editor.AspNetCore.Attributes/TokenizedTopicListAttribute/TokenizedTopicListAttributeDescriptorViewModel.cs
@@ -23,8 +23,8 @@ public record TokenizedTopicListAttributeDescriptorViewModel: QueryableTopicList
     /// <summary>
     ///   Initializes a new <see cref="TokenizedTopicListAttributeDescriptorViewModel"/> with an <paramref name="attributes"/> dictionary.
     /// </summary>
-    /// <param name="attributes">An <see cref="AttributeDictionary"/> of attribute values.</param>
-    public TokenizedTopicListAttributeDescriptorViewModel(AttributeDictionary attributes): base(attributes) {
+    /// <param name="attributes">An <see cref="AttributeValueDictionary"/> of attribute values.</param>
+    public TokenizedTopicListAttributeDescriptorViewModel(AttributeValueDictionary attributes): base(attributes) {
       ResultLimit               = attributes.GetInteger(nameof(ResultLimit));
       TokenLimit                = attributes.GetInteger(nameof(TokenLimit));
       AutoPostBack              = attributes.GetBoolean(nameof(AutoPostBack));
diff --git a/OnTopic.Editor.AspNetCore.Attributes/TopicListAttribute/TopicListAttributeDescriptorViewModel.cs b/OnTopic.Editor.AspNetCore.Attributes/TopicListAttribute/TopicListAttributeDescriptorViewModel.cs
@@ -23,8 +23,8 @@ public record TopicListAttributeDescriptorViewModel: QueryableTopicListAttribute
     ///   Initializes a new <see cref="TopicListAttributeDescriptorViewModel"/> with an <paramref name="attributes"/>
     ///   dictionary.
     /// </summary>
-    /// <param name="attributes">An <see cref="AttributeDictionary"/> of attribute values.</param>
-    public TopicListAttributeDescriptorViewModel(AttributeDictionary attributes): base(attributes) {
+    /// <param name="attributes">An <see cref="AttributeValueDictionary"/> of attribute values.</param>
+    public TopicListAttributeDescriptorViewModel(AttributeValueDictionary attributes): base(attributes) {
       Contract.Requires(attributes, nameof(attributes));
       DefaultLabel              = attributes.GetValue(nameof(DefaultLabel))?? DefaultLabel;
       RelativeTopicBase         = attributes.GetValue(nameof(RelativeTopicBase));
diff --git a/OnTopic.Editor.AspNetCore.Attributes/TopicReferenceAttribute/TopicReferenceAttributeDescriptorViewModel.cs b/OnTopic.Editor.AspNetCore.Attributes/TopicReferenceAttribute/TopicReferenceAttributeDescriptorViewModel.cs
@@ -22,8 +22,8 @@ public record TopicReferenceAttributeDescriptorViewModel: TokenizedTopicListAttr
     ///   Initializes a new <see cref="TopicReferenceAttributeDescriptorViewModel"/> with an <paramref name="attributes"/>
     ///   dictionary.
     /// </summary>
-    /// <param name="attributes">An <see cref="AttributeDictionary"/> of attribute values.</param>
-    public TopicReferenceAttributeDescriptorViewModel(AttributeDictionary attributes): base(attributes) {
+    /// <param name="attributes">An <see cref="AttributeValueDictionary"/> of attribute values.</param>
+    public TopicReferenceAttributeDescriptorViewModel(AttributeValueDictionary attributes): base(attributes) {
       Contract.Requires(attributes, nameof(attributes));
       UseCurrentContentType     = attributes.GetBoolean(nameof(UseCurrentContentType))?? false;
       TokenLimit                = 1;
diff --git a/OnTopic.Editor.AspNetCore.Host/OnTopic.Editor.AspNetCore.Host.csproj b/OnTopic.Editor.AspNetCore.Host/OnTopic.Editor.AspNetCore.Host.csproj
@@ -11,8 +11,8 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="OnTopic.Data.Caching" Version="5.1.0" />
-    <PackageReference Include="OnTopic.Data.Sql" Version="5.1.0" />
+    <PackageReference Include="OnTopic.Data.Caching" Version="5.2.0-alpha.255" />
+    <PackageReference Include="OnTopic.Data.Sql" Version="5.2.0-alpha.255" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.1" />
   </ItemGroup>
 
diff --git a/OnTopic.Editor.AspNetCore/Models/Components/ContentTypeListAttributeDescriptorViewModel.cs b/OnTopic.Editor.AspNetCore/Models/Components/ContentTypeListAttributeDescriptorViewModel.cs
@@ -23,8 +23,8 @@ public record ContentTypeListAttributeDescriptorViewModel: AttributeDescriptorVi
     /// <summary>
     ///   Initializes a new <see cref="ContentTypeListAttributeDescriptorViewModel"/> with an <paramref name="attributes"/> dictionary.
     /// </summary>
-    /// <param name="attributes">An <see cref="AttributeDictionary"/> of attribute values.</param>
-    public ContentTypeListAttributeDescriptorViewModel(AttributeDictionary attributes): base(attributes) {
+    /// <param name="attributes">An <see cref="AttributeValueDictionary"/> of attribute values.</param>
+    public ContentTypeListAttributeDescriptorViewModel(AttributeValueDictionary attributes): base(attributes) {
       Contract.Requires(attributes, nameof(attributes));
       EnableModal               = attributes.GetBoolean(nameof(EnableModal))?? EnableModal;
     }
diff --git a/OnTopic.Editor.AspNetCore/Models/EditingTopicViewModel.cs b/OnTopic.Editor.AspNetCore/Models/EditingTopicViewModel.cs
@@ -24,8 +24,8 @@ public record EditingTopicViewModel: CoreTopicViewModel {
     /// <summary>
     ///   Initializes a new <see cref="EditingTopicViewModel"/> with an <paramref name="attributes"/> dictionary.
     /// </summary>
-    /// <param name="attributes">An <see cref="AttributeDictionary"/> of attribute values.</param>
-    public EditingTopicViewModel(AttributeDictionary attributes) {
+    /// <param name="attributes">An <see cref="AttributeValueDictionary"/> of attribute values.</param>
+    public EditingTopicViewModel(AttributeValueDictionary attributes) {
       Contract.Requires(attributes, nameof(attributes));
       NoIndex                   = attributes.GetBoolean(nameof(NoIndex))?? false;
       IsHidden                  = attributes.GetBoolean(nameof(IsHidden))?? false;
diff --git a/OnTopic.Editor.AspNetCore/Models/Metadata/AttributeDescriptorViewModel.cs b/OnTopic.Editor.AspNetCore/Models/Metadata/AttributeDescriptorViewModel.cs
diff --git a/OnTopic.Editor.AspNetCore/Models/Metadata/ContentTypeDescriptorViewModel.cs b/OnTopic.Editor.AspNetCore/Models/Metadata/ContentTypeDescriptorViewModel.cs
diff --git a/OnTopic.Editor.AspNetCore/OnTopic.Editor.AspNetCore.csproj b/OnTopic.Editor.AspNetCore/OnTopic.Editor.AspNetCore.csproj
