Merge branch 'bugfix/C#10-implicit-usings' into develop

JeremyCaney · JeremyCaney · commit ebdd23d83334 · 2021-12-08T21:51:31.000-08:00
Unfortunately, when implementing the C# 10 implicit and global using directives (c9f6b17; #93), I inadvertently introduced an ambiguous reference in the unit tests which prevents compilation, since a `[Collection()]` attribute exists in both `Xunit` and `OnTopic`. This is fixed by removing `Xunit` as a global directive. Despite the fact that this is a unit test project, the vast majority of the files are actually POCO models, many of which use the `OnTopic` attribute, and so it makes sense to manually include `Xunit` on the twenty-something files that are actual unit tests.
diff --git a/OnTopic.Tests/AttributeCollectionTest.cs b/OnTopic.Tests/AttributeCollectionTest.cs
@@ -8,6 +8,7 @@
 using OnTopic.Attributes;
 using OnTopic.Collections.Specialized;
 using OnTopic.Tests.Entities;
+using Xunit;
 
 namespace OnTopic.Tests {
 
diff --git a/OnTopic.Tests/AttributeValueConverterTest.cs b/OnTopic.Tests/AttributeValueConverterTest.cs
@@ -4,6 +4,7 @@
 | Project       Topics Library
 \=============================================================================================================================*/
 using OnTopic.Attributes;
+using Xunit;
 
 namespace OnTopic.Tests {
 
diff --git a/OnTopic.Tests/ContentTypeDescriptorTest.cs b/OnTopic.Tests/ContentTypeDescriptorTest.cs
@@ -4,6 +4,7 @@
 | Project       Topics Library
 \=============================================================================================================================*/
 using OnTopic.Metadata;
+using Xunit;
 
 namespace OnTopic.Tests {
 
diff --git a/OnTopic.Tests/ContractTest.cs b/OnTopic.Tests/ContractTest.cs
@@ -4,6 +4,8 @@
 | Project       Topics Library
 \=============================================================================================================================*/
 
+using Xunit;
+
 namespace OnTopic.Tests {
 
   /*============================================================================================================================
diff --git a/OnTopic.Tests/Fixtures/SharedRepositoryCollection.cs b/OnTopic.Tests/Fixtures/SharedRepositoryCollection.cs
@@ -4,6 +4,7 @@
 | Project       Topics Library
 \=============================================================================================================================*/
 using OnTopic.TestDoubles;
+using Xunit;
 
 #pragma warning disable CA1711 // Identifiers should not have incorrect suffix
 
diff --git a/OnTopic.Tests/Fixtures/TopicInfrastructureFixture.cs b/OnTopic.Tests/Fixtures/TopicInfrastructureFixture.cs
@@ -3,15 +3,15 @@
 | Client        Ignia, LLC
 | Project       Topics Library
 \=============================================================================================================================*/
-using System.Text;
 using OnTopic.Data.Caching;
 using OnTopic.Lookup;
 using OnTopic.Mapping;
 using OnTopic.Repositories;
 using OnTopic.TestDoubles;
 using OnTopic.Tests.TestDoubles;
 
-namespace OnTopic.Tests.Fixtures {
+namespace OnTopic.Tests.Fixtures
+{
 
   /*============================================================================================================================
   | CLASS: TOPIC INFRASTRUCTURE FIXTURE
diff --git a/OnTopic.Tests/Fixtures/TypeAccessorFixture.cs b/OnTopic.Tests/Fixtures/TypeAccessorFixture.cs
@@ -3,16 +3,10 @@
 | Client        Ignia, LLC
 | Project       Topics Library
 \=============================================================================================================================*/
-using System.Text;
-using OnTopic.Data.Caching;
 using OnTopic.Internal.Reflection;
-using OnTopic.Lookup;
-using OnTopic.Mapping;
-using OnTopic.Repositories;
-using OnTopic.TestDoubles;
-using OnTopic.Tests.TestDoubles;
 
-namespace OnTopic.Tests.Fixtures {
+namespace OnTopic.Tests.Fixtures
+{
 
   /*============================================================================================================================
   | CLASS: TYPE ACCESSOR FIXTURE
diff --git a/OnTopic.Tests/HierarchicalTopicMappingServiceTest.cs b/OnTopic.Tests/HierarchicalTopicMappingServiceTest.cs
@@ -8,6 +8,7 @@
 using OnTopic.Repositories;
 using OnTopic.TestDoubles;
 using OnTopic.Tests.Fixtures;
+using Xunit;
 
 namespace OnTopic.Tests {
 
diff --git a/OnTopic.Tests/ITopicRepositoryTest.cs b/OnTopic.Tests/ITopicRepositoryTest.cs
@@ -8,6 +8,7 @@
 using OnTopic.Repositories;
 using OnTopic.TestDoubles;
 using OnTopic.Tests.Fixtures;
+using Xunit;
 
 namespace OnTopic.Tests {
 
@@ -22,7 +23,7 @@ namespace OnTopic.Tests {
   ///   underlying <see cref="TopicRepository"/> functions are also operating correctly.
   /// </remarks>
   [ExcludeFromCodeCoverage]
-  [Collection("Shared Repository")]
+  [Xunit.Collection("Shared Repository")]
   public class ITopicRepositoryTest {
 
     /*==========================================================================================================================
diff --git a/OnTopic.Tests/ITypeLookupServiceTest.cs b/OnTopic.Tests/ITypeLookupServiceTest.cs
@@ -6,6 +6,7 @@
 using OnTopic.Lookup;
 using OnTopic.Tests.TestDoubles;
 using OnTopic.Tests.ViewModels;
+using Xunit;
 
 namespace OnTopic.Tests {
 
diff --git a/OnTopic.Tests/KeyedTopicCollectionTest.cs b/OnTopic.Tests/KeyedTopicCollectionTest.cs
@@ -4,6 +4,7 @@
 | Project       Topics Library
 \=============================================================================================================================*/
 using OnTopic.Collections;
+using Xunit;
 
 namespace OnTopic.Tests {
 
diff --git a/OnTopic.Tests/MemberAccessorTest.cs b/OnTopic.Tests/MemberAccessorTest.cs
@@ -6,6 +6,7 @@
 using System.Reflection;
 using OnTopic.Internal.Reflection;
 using OnTopic.Tests.ViewModels;
+using Xunit;
 
 namespace OnTopic.Tests {
 
diff --git a/OnTopic.Tests/Properties/AssemblyInfo.cs b/OnTopic.Tests/Properties/AssemblyInfo.cs
@@ -12,7 +12,6 @@
 global using OnTopic.Internal.Diagnostics;
 global using OnTopic.Mapping.Annotations;
 global using OnTopic.ViewModels;
-global using Xunit;
 
 /*==============================================================================================================================
 | USING DIRECTIVES (LOCAL)
diff --git a/OnTopic.Tests/ReverseTopicMappingServiceTest.cs b/OnTopic.Tests/ReverseTopicMappingServiceTest.cs
@@ -15,6 +15,7 @@
 using OnTopic.TestDoubles.Metadata;
 using OnTopic.Tests.BindingModels;
 using OnTopic.Tests.Fixtures;
+using Xunit;
 
 namespace OnTopic.Tests {
 
diff --git a/OnTopic.Tests/SqlTopicRepositoryTest.cs b/OnTopic.Tests/SqlTopicRepositoryTest.cs
@@ -9,6 +9,7 @@
 using OnTopic.Associations;
 using OnTopic.Data.Sql;
 using OnTopic.Tests.Schemas;
+using Xunit;
 
 namespace OnTopic.Tests {
 
diff --git a/OnTopic.Tests/TopicMappingServiceTest.cs b/OnTopic.Tests/TopicMappingServiceTest.cs
@@ -17,6 +17,7 @@
 using OnTopic.Tests.Fixtures;
 using OnTopic.Tests.ViewModels;
 using OnTopic.Tests.ViewModels.Metadata;
+using Xunit;
 
 namespace OnTopic.Tests {
 
diff --git a/OnTopic.Tests/TopicQueryingTest.cs b/OnTopic.Tests/TopicQueryingTest.cs
@@ -10,6 +10,7 @@
 using OnTopic.Repositories;
 using OnTopic.TestDoubles;
 using OnTopic.Tests.Fixtures;
+using Xunit;
 
 namespace OnTopic.Tests {
 
diff --git a/OnTopic.Tests/TopicReferenceCollectionTest.cs b/OnTopic.Tests/TopicReferenceCollectionTest.cs
@@ -6,6 +6,7 @@
 using OnTopic.Associations;
 using OnTopic.Tests.Entities;
 using OnTopic.Collections.Specialized;
+using Xunit;
 
 namespace OnTopic.Tests {
 
diff --git a/OnTopic.Tests/TopicRelationshipMultiMapTest.cs b/OnTopic.Tests/TopicRelationshipMultiMapTest.cs
@@ -6,6 +6,7 @@
 using OnTopic.Associations;
 using OnTopic.Collections;
 using OnTopic.Collections.Specialized;
+using Xunit;
 
 namespace OnTopic.Tests {
 
diff --git a/OnTopic.Tests/TopicRepositoryBaseTest.cs b/OnTopic.Tests/TopicRepositoryBaseTest.cs
@@ -10,6 +10,7 @@
 using OnTopic.Repositories;
 using OnTopic.TestDoubles;
 using OnTopic.TestDoubles.Metadata;
+using Xunit;
 
 namespace OnTopic.Tests {
 
diff --git a/OnTopic.Tests/TopicTest.cs b/OnTopic.Tests/TopicTest.cs
@@ -7,6 +7,7 @@
 using OnTopic.Collections;
 using OnTopic.Metadata;
 using OnTopic.Repositories;
+using Xunit;
 
 namespace OnTopic.Tests {
 
diff --git a/OnTopic.Tests/TypeAccessorTest.cs b/OnTopic.Tests/TypeAccessorTest.cs
@@ -11,6 +11,7 @@
 using OnTopic.Tests.BindingModels;
 using OnTopic.Tests.Fixtures;
 using OnTopic.Tests.ViewModels;
+using Xunit;
 
 namespace OnTopic.Tests {
 
diff --git a/OnTopic.Tests/TypeLookupServiceTest.cs b/OnTopic.Tests/TypeLookupServiceTest.cs
@@ -8,6 +8,7 @@
 using OnTopic.Tests.BindingModels;
 using OnTopic.Tests.Entities;
 using OnTopic.Tests.ViewModels;
+using Xunit;
 
 namespace OnTopic.Tests {
 
