Skip to content

Commit e73f71c

Browse files
JeremyCaneyJeremyCaney
committed
Merge branch 'maintenance/global-using-Attributes' into develop
With `AttributeDictionary` renamed to `AttributeValueDictionary` (#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, and remove the local using directives across `OnTopic` and `OnTopic.Tests` (07d46ec).
2 parents 0b62fe0 + 07d46ec commit e73f71c

27 files changed

+2
-26
lines changed

‎OnTopic.Tests/AttributeCollectionTest.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
\=============================================================================================================================*/
66
using System.Collections;
77
using System.Globalization;
8-
using OnTopic.Attributes;
98
using OnTopic.Collections.Specialized;
109
using OnTopic.Tests.Entities;
1110
using Xunit;

‎OnTopic.Tests/AttributeValueConverterTest.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 Xunit;
87

98
namespace OnTopic.Tests {

‎OnTopic.Tests/AttributeValueDictionaryTest.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 Xunit;
87

98
namespace OnTopic.Tests {

‎OnTopic.Tests/Entities/CustomTopic.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.Globalization;
7-
using OnTopic.Attributes;
87
using OnTopic.Associations;
98

109
namespace OnTopic.Tests.Entities {

‎OnTopic.Tests/ITopicRepositoryTest.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.Data.Caching;
87
using OnTopic.Repositories;
98
using OnTopic.TestDoubles;

‎OnTopic.Tests/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
\-----------------------------------------------------------------------------------------------------------------------------*/
1010
global using System.Collections.ObjectModel;
1111
global using System.Diagnostics.CodeAnalysis;
12+
global using OnTopic.Attributes;
1213
global using OnTopic.Internal.Diagnostics;
1314
global using OnTopic.Mapping.Annotations;
1415
global using OnTopic.ViewModels;

‎OnTopic.Tests/TopicMappingServiceTest.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
\=============================================================================================================================*/
66
using System.ComponentModel.DataAnnotations;
77
using System.Globalization;
8-
using OnTopic.Attributes;
98
using OnTopic.Data.Caching;
109
using OnTopic.Mapping;
1110
using OnTopic.Mapping.Internal;

‎OnTopic.Tests/TopicRepositoryBaseTest.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.Specialized;
87
using OnTopic.Data.Caching;
98
using OnTopic.Metadata;

‎OnTopic.Tests/TopicTest.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
using OnTopic.Metadata;
98
using OnTopic.Repositories;

‎OnTopic.Tests/TypeAccessorTest.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
\=============================================================================================================================*/
66
using System.ComponentModel;
77
using System.Reflection;
8-
using OnTopic.Attributes;
98
using OnTopic.Internal.Reflection;
109
using OnTopic.Metadata;
1110
using OnTopic.Tests.BindingModels;

‎OnTopic.Tests/ViewModels/AttributeValueDictionaryConstructorTopicViewModel.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
| Project Topics Library
55
\=============================================================================================================================*/
66

7-
using OnTopic.Attributes;
8-
97
namespace OnTopic.Tests.ViewModels {
108

119
/*============================================================================================================================

‎OnTopic.Tests/ViewModels/CustomTopicTopicViewModel.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.Internal.Reflection;
87
using OnTopic.Tests.Entities;
98

‎OnTopic.Tests/ViewModels/LoadTestingViewModel.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;
87

98
namespace OnTopic.Tests.ViewModels {

‎OnTopic/Collections/Specialized/TrackedRecord{T}.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.Repositories;
87

98
namespace OnTopic.Collections.Specialized {

‎OnTopic/Internal/Reflection/ItemMetadata.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
\=============================================================================================================================*/
66
using System.Collections;
77
using System.Reflection;
8-
using OnTopic.Attributes;
98
using OnTopic.Mapping;
109
using OnTopic.Mapping.Internal;
1110
using OnTopic.Mapping.Reverse;

‎OnTopic/Internal/Reflection/MemberAccessor.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
\=============================================================================================================================*/
66
using System.ComponentModel.DataAnnotations;
77
using System.Reflection;
8-
using OnTopic.Attributes;
98

109
namespace OnTopic.Internal.Reflection {
1110

‎OnTopic/Internal/Reflection/TopicPropertyDispatcher{TItem,TValue,TAttributeType}.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
\=============================================================================================================================*/
66
using System.Reflection;
77
using System.Runtime.ExceptionServices;
8-
using OnTopic.Attributes;
98
using OnTopic.Collections.Specialized;
109
using OnTopic.Associations;
1110

‎OnTopic/Internal/Reflection/TypeAccessor.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.Reflection;
7-
using OnTopic.Attributes;
87

98
namespace OnTopic.Internal.Reflection {
109

‎OnTopic/Mapping/Reverse/ReverseTopicMappingService.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
using System.ComponentModel;
88
using System.Globalization;
99
using System.Reflection;
10-
using OnTopic.Attributes;
1110
using OnTopic.Collections;
1211
using OnTopic.Internal.Reflection;
1312
using OnTopic.Metadata;

‎OnTopic/Mapping/TopicMappingService.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
\=============================================================================================================================*/
66
using System.Collections;
77
using System.Reflection;
8-
using OnTopic.Attributes;
98
using OnTopic.Collections.Specialized;
109
using OnTopic.Internal.Reflection;
1110
using OnTopic.Lookup;

‎OnTopic/Metadata/AttributeDescriptor.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.Specialized;
87

98
namespace OnTopic.Metadata {

‎OnTopic/Metadata/ContentTypeDescriptor.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
using OnTopic.Collections.Specialized;
98
using OnTopic.Associations;

‎OnTopic/Obsolete/Collections/AttributeValueCollection.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.Collections.ObjectModel;
7-
using OnTopic.Attributes;
87
using OnTopic.Repositories;
98

109
#pragma warning disable IDE0060 // Remove unused parameter

‎OnTopic/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.Diagnostics.CodeAnalysis;
11+
global using OnTopic.Attributes;
1112
global using OnTopic.Internal.Diagnostics;
1213

1314
/*==============================================================================================================================

‎OnTopic/Querying/TopicExtensions.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
using OnTopic.Collections.Specialized;
98
using OnTopic.Metadata;

‎OnTopic/Repositories/TopicRepository.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 Microsoft;
7-
using OnTopic.Attributes;
87
using OnTopic.Collections;
98
using OnTopic.Collections.Specialized;
109
using OnTopic.Metadata;

‎OnTopic/Topic.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
\=============================================================================================================================*/
66
using System.Collections.ObjectModel;
77
using System.Globalization;
8-
using OnTopic.Attributes;
98
using OnTopic.Collections;
109
using OnTopic.Collections.Specialized;
1110
using OnTopic.Metadata;

0 commit comments

Comments
 (0)