Skip to content

Commit f4c1be7

Browse files
committed
Merge branch 'maintenance/global-using-Attributes' into develop
With `AttributeDictionary` renamed to `AttributeValueDictionary` (OnTopicCMS/OnTopic-Library#107) the potential naming conflict with the out-of-the-box `AttributeValueDictionary` is removed, and we can thus (re)introduce `OnTopic.Attributes` as a global using directive (0ca571a), and remove the local using directives across `OnTopic.Editor.AspNetCore.Attributes` (f87ad72).
2 parents 25fcd6d + f87ad72 commit f4c1be7

8 files changed

Lines changed: 1 addition & 7 deletions

File tree

OnTopic.Editor.AspNetCore/Components/ContentTypeListViewComponent.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
\=============================================================================================================================*/
66
using Microsoft.AspNetCore.Mvc;
77
using Microsoft.AspNetCore.Mvc.Rendering;
8-
using OnTopic.Attributes;
98
using OnTopic.Editor.AspNetCore.Models.Components;
109
using OnTopic.Repositories;
1110

OnTopic.Editor.AspNetCore/Infrastructure/TopicQueryService.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
| Client Ignia, LLC
44
| Project Topics Library
55
\=============================================================================================================================*/
6-
using OnTopic.Attributes;
76
using OnTopic.Collections;
87

98
namespace OnTopic.Editor.AspNetCore.Models.Queryable {

OnTopic.Editor.AspNetCore/Models/AttributeViewModel.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
| Client Ignia, LLC
44
| Project Topics Library
55
\=============================================================================================================================*/
6-
using OnTopic.Attributes;
76

87
namespace OnTopic.Editor.AspNetCore.Models {
98

OnTopic.Editor.AspNetCore/Models/Components/ContentTypeListAttributeDescriptorViewModel.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
| Client Ignia, LLC
44
| Project Topics Library
55
\=============================================================================================================================*/
6-
using OnTopic.Attributes;
76
using OnTopic.Editor.AspNetCore.Components;
87
using OnTopic.Mapping.Annotations;
98

OnTopic.Editor.AspNetCore/Models/EditingTopicViewModel.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
| Client Ignia, LLC
44
| Project Topics Library
55
\=============================================================================================================================*/
6-
using OnTopic.Attributes;
76
using OnTopic.Mapping.Annotations;
87

98
namespace OnTopic.Editor.AspNetCore.Models {

OnTopic.Editor.AspNetCore/Models/Metadata/AttributeDescriptorViewModel.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
| Project Topics Library
55
\=============================================================================================================================*/
66
using System.ComponentModel.DataAnnotations;
7-
using OnTopic.Attributes;
87
using OnTopic.Editor.AspNetCore.Models.ClientResources;
98
using OnTopic.Mapping.Annotations;
109

OnTopic.Editor.AspNetCore/Models/Metadata/ContentTypeDescriptorViewModel.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
| Client Ignia, LLC
44
| Project Topics Library
55
\=============================================================================================================================*/
6-
using OnTopic.Attributes;
76
using OnTopic.Editor.AspNetCore.Models.ClientResources;
87
using OnTopic.Mapping.Annotations;
98

OnTopic.Editor.AspNetCore/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
| USING DIRECTIVES (GLOBAL)
99
\-----------------------------------------------------------------------------------------------------------------------------*/
1010
global using System.Collections.ObjectModel;
11+
global using OnTopic.Attributes;
1112
global using OnTopic.Editor.AspNetCore.Models;
1213
global using OnTopic.Editor.AspNetCore.Models.Metadata;
1314
global using OnTopic.Internal.Diagnostics;

0 commit comments

Comments
 (0)