Remove unnecessary usings (#1746)

RicoSuter · Nov 19, 2024 · f86d896 · f86d896
1 parent 7869b1e
commit f86d896
Show file tree

Hide file tree

Showing 42 changed files with 13 additions and 43 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -25,6 +25,7 @@
         <Nullable>enable</Nullable>
 
         <UseArtifactsOutput>true</UseArtifactsOutput>
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
 
     </PropertyGroup>
 
@@ -33,7 +34,6 @@
         <AnalysisLevel>latest-Recommended</AnalysisLevel>
         <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
         <!--
-          [IDE0005] Using directive is unnecessary
           [IDE0008] Use explicit type instead of 'var'
           [IDE0019] Use pattern matching
           [IDE0021] Use block body for constructor
@@ -64,9 +64,10 @@
           [CA1510] Use 'ArgumentNullException.ThrowIfNull' instead of explicitly throwing a new exception instance
           [CA1716] rename parameter property so that it no longer conflicts with the reserved language keyword
           [CA1720] Identifier 'xxx' contains type name
+          [CA1870] Use a cached 'SearchValues' instance for improved searching performance
           [CA2263] Prefer the generic overload 'System.Enum.GetValues<TEnum>()'
         -->
-        <NoWarn>$(NoWarn);IDE0005;IDE0008;IDE0019;IDE0021;IDE0022;IDE0025;IDE0027;IDE0028;IDE0029;IDE0032;IDE0039;IDE0045;IDE0046;IDE0055;IDE0057;IDE0059;IDE0060;IDE0074;IDE0078;IDE0083;IDE0090;IDE0100;IDE0130;IDE0160;IDE0260;IDE0290;IDE1005;CA1200;CA1510;CA1716;CA1720;CA2263</NoWarn>
+        <NoWarn>$(NoWarn);IDE0008;IDE0019;IDE0021;IDE0022;IDE0025;IDE0027;IDE0028;IDE0029;IDE0032;IDE0039;IDE0045;IDE0046;IDE0055;IDE0057;IDE0059;IDE0060;IDE0074;IDE0078;IDE0083;IDE0090;IDE0100;IDE0130;IDE0160;IDE0260;IDE0290;IDE1005;CA1200;CA1510;CA1716;CA1720;CA1870;CA2263</NoWarn>
     </PropertyGroup>
 
 </Project>
diff --git a/build/Build.cs b/build/Build.cs
@@ -11,8 +11,6 @@
 using Nuke.Common.Tooling;
 using Nuke.Common.Tools.DotNet;
 using Nuke.Common.Utilities.Collections;
-
-using static Nuke.Common.Logger;
 using static Nuke.Common.Tools.DotNet.DotNetTasks;
 
 [ShutdownDotNetAfterServerBuild]

diff --git a/src/NJsonSchema.Benchmark/NJsonSchema.Benchmark.csproj b/src/NJsonSchema.Benchmark/NJsonSchema.Benchmark.csproj
@@ -3,7 +3,7 @@
     <PropertyGroup>
         <TargetFramework>net8.0</TargetFramework>
         <GenerateProgramFile>false</GenerateProgramFile>
-        <NoWarn>$(NoWarn),xUnit1013</NoWarn>
+        <NoWarn>$(NoWarn),xUnit1013;CS1591</NoWarn>
         <SignAssembly>false</SignAssembly>
         <Nullable>disable</Nullable>
         <EnableNETAnalyzers>false</EnableNETAnalyzers>

diff --git a/src/NJsonSchema.CodeGeneration.CSharp.Tests/NJsonSchema.CodeGeneration.CSharp.Tests.csproj b/src/NJsonSchema.CodeGeneration.CSharp.Tests/NJsonSchema.CodeGeneration.CSharp.Tests.csproj
@@ -3,7 +3,6 @@
     <PropertyGroup>
         <TargetFramework>net8.0</TargetFramework>
         <IsPackable>false</IsPackable>
-        <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <NoWarn>$(NoWarn),1587,1998,1591,618,SYSLIB0012</NoWarn>
         <Nullable>disable</Nullable>
         <EnableNETAnalyzers>false</EnableNETAnalyzers>

diff --git a/src/NJsonSchema.CodeGeneration.CSharp/CSharpGenerator.cs b/src/NJsonSchema.CodeGeneration.CSharp/CSharpGenerator.cs
@@ -9,7 +9,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using NJsonSchema.CodeGeneration.CSharp.Models;
-using NJsonSchema.CodeGeneration.Models;
 
 namespace NJsonSchema.CodeGeneration.CSharp
 {

diff --git a/src/NJsonSchema.CodeGeneration.CSharp/CSharpJsonSerializerGenerator.cs b/src/NJsonSchema.CodeGeneration.CSharp/CSharpJsonSerializerGenerator.cs
@@ -6,7 +6,6 @@
 // <author>Rico Suter, [email protected]</author>
 //-----------------------------------------------------------------------
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
 

diff --git a/src/NJsonSchema.CodeGeneration.CSharp/CSharpValueGenerator.cs b/src/NJsonSchema.CodeGeneration.CSharp/CSharpValueGenerator.cs
@@ -6,7 +6,6 @@
 // <author>Rico Suter, [email protected]</author>
 //-----------------------------------------------------------------------
 
-using NJsonSchema.Annotations;
 using System;
 using System.Collections.Generic;
 using System.Globalization;

diff --git a/src/NJsonSchema.CodeGeneration.CSharp/Models/EnumTemplateModel.cs b/src/NJsonSchema.CodeGeneration.CSharp/Models/EnumTemplateModel.cs
@@ -6,7 +6,6 @@
 // <author>Rico Suter, [email protected]</author>
 //-----------------------------------------------------------------------
 
-using NJsonSchema.Annotations;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;

diff --git a/src/NJsonSchema.CodeGeneration.CSharp/Models/PropertyModel.cs b/src/NJsonSchema.CodeGeneration.CSharp/Models/PropertyModel.cs
@@ -6,7 +6,6 @@
 // <author>Rico Suter, [email protected]</author>
 //-----------------------------------------------------------------------
 
-using NJsonSchema.Annotations;
 using System.Globalization;
 using NJsonSchema.CodeGeneration.Models;
 

diff --git a/src/NJsonSchema.CodeGeneration.Tests/LiquidTests.cs b/src/NJsonSchema.CodeGeneration.Tests/LiquidTests.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Reflection;
 using Fluid;
 using NJsonSchema.CodeGeneration.TypeScript;
 using Xunit;

diff --git a/src/NJsonSchema.CodeGeneration.TypeScript.Tests/ExtensionCodeTests.cs b/src/NJsonSchema.CodeGeneration.TypeScript.Tests/ExtensionCodeTests.cs
@@ -1,5 +1,4 @@
 using NJsonSchema.NewtonsoftJson.Generation;
-using System;
 using System.Threading.Tasks;
 using Xunit;
 

diff --git a/...Schema.CodeGeneration.TypeScript.Tests/NJsonSchema.CodeGeneration.TypeScript.Tests.csproj b/...Schema.CodeGeneration.TypeScript.Tests/NJsonSchema.CodeGeneration.TypeScript.Tests.csproj
@@ -3,7 +3,6 @@
     <PropertyGroup>
         <TargetFrameworks>net8.0;net472</TargetFrameworks>
         <IsPackable>false</IsPackable>
-        <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <NoWarn>$(NoWarn),1587,1998,1591,618</NoWarn>
         <Nullable>disable</Nullable>
         <EnableNETAnalyzers>false</EnableNETAnalyzers>

diff --git a/src/NJsonSchema.CodeGeneration.TypeScript/DataConversionGenerator.cs b/src/NJsonSchema.CodeGeneration.TypeScript/DataConversionGenerator.cs
@@ -6,7 +6,6 @@
 // <author>Rico Suter, [email protected]</author>
 //-----------------------------------------------------------------------
 
-using NJsonSchema.Annotations;
 using System;
 
 namespace NJsonSchema.CodeGeneration.TypeScript

diff --git a/src/NJsonSchema.CodeGeneration.TypeScript/TypeScriptGenerator.cs b/src/NJsonSchema.CodeGeneration.TypeScript/TypeScriptGenerator.cs
@@ -9,7 +9,6 @@
 using System;
 using NJsonSchema.CodeGeneration.TypeScript.Models;
 using System.Linq;
-using NJsonSchema.CodeGeneration.Models;
 using System.Collections.Generic;
 
 namespace NJsonSchema.CodeGeneration.TypeScript

diff --git a/src/NJsonSchema.CodeGeneration.TypeScript/TypeScriptTypeResolver.cs b/src/NJsonSchema.CodeGeneration.TypeScript/TypeScriptTypeResolver.cs
@@ -6,7 +6,6 @@
 // <author>Rico Suter, [email protected]</author>
 //-----------------------------------------------------------------------
 
-using NJsonSchema.Annotations;
 using System;
 using System.Linq;
 

diff --git a/src/NJsonSchema.CodeGeneration.TypeScript/TypeScriptValueGenerator.cs b/src/NJsonSchema.CodeGeneration.TypeScript/TypeScriptValueGenerator.cs
@@ -6,7 +6,6 @@
 // <author>Rico Suter, [email protected]</author>
 //-----------------------------------------------------------------------
 
-using NJsonSchema.Annotations;
 using System.Collections.Generic;
 
 namespace NJsonSchema.CodeGeneration.TypeScript

diff --git a/src/NJsonSchema.CodeGeneration/CodeGeneratorSettingsBase.cs b/src/NJsonSchema.CodeGeneration/CodeGeneratorSettingsBase.cs
@@ -6,7 +6,6 @@
 // <author>Rico Suter, [email protected]</author>
 //-----------------------------------------------------------------------
 
-using System;
 using Newtonsoft.Json;
 
 namespace NJsonSchema.CodeGeneration

diff --git a/src/NJsonSchema.Demo/NJsonSchema.Demo.csproj b/src/NJsonSchema.Demo/NJsonSchema.Demo.csproj
@@ -8,6 +8,7 @@
         <OutputType>Exe</OutputType>
         <StartupObject />
         <Nullable>disable</Nullable>
+        <NoWarn>$(NoWarn);CS1591;IDE0005</NoWarn>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/src/NJsonSchema.Yaml.Tests/NJsonSchema.Yaml.Tests.csproj b/src/NJsonSchema.Yaml.Tests/NJsonSchema.Yaml.Tests.csproj
@@ -5,6 +5,7 @@
         <IsPackable>false</IsPackable>
         <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
         <Nullable>disable</Nullable>
+        <NoWarn>$(NoWarn);CS1591</NoWarn>
     </PropertyGroup>
 
     <PropertyGroup>

diff --git a/src/NJsonSchema.Yaml/JsonAndYamlReferenceResolver.cs b/src/NJsonSchema.Yaml/JsonAndYamlReferenceResolver.cs
@@ -38,6 +38,7 @@ JsonReferenceResolver ReferenceResolverFactory(JsonSchema schema)
 
         /// <summary>Resolves a file reference.</summary>
         /// <param name="filePath">The file path.</param>
+        /// <param name="cancellationToken">The cancellation token</param>
         /// <returns>The resolved JSON Schema.</returns>
         /// <exception cref="NotSupportedException">The System.IO.File API is not available on this platform.</exception>
         public override async Task<IJsonReference> ResolveFileReferenceAsync(string filePath, CancellationToken cancellationToken = default)
@@ -47,6 +48,7 @@ public override async Task<IJsonReference> ResolveFileReferenceAsync(string file
 
         /// <summary>Resolves an URL reference.</summary>
         /// <param name="url">The URL.</param>
+        /// <param name="cancellationToken">The cancellation token</param>
         /// <exception cref="NotSupportedException">The HttpClient.GetAsync API is not available on this platform.</exception>
         public override async Task<IJsonReference> ResolveUrlReferenceAsync(string url, CancellationToken cancellationToken = default)
         {

diff --git a/src/NJsonSchema.Yaml/JsonSchemaYaml.cs b/src/NJsonSchema.Yaml/JsonSchemaYaml.cs
@@ -44,6 +44,7 @@ public static async Task<JsonSchema> FromYamlAsync(string data, string? document
         /// <param name="data">The JSON string.</param>
         /// <param name="documentPath">The document path (URL or file path) for resolving relative document references.</param>
         /// <param name="referenceResolverFactory">The JSON reference resolver factory.</param>
+        /// <param name="cancellationToken">The cancellation token</param>
         /// <returns>The JSON Schema.</returns>
         public static async Task<JsonSchema> FromYamlAsync(string data, string? documentPath, Func<JsonSchema, JsonReferenceResolver> referenceResolverFactory, CancellationToken cancellationToken = default)
         {
@@ -81,6 +82,7 @@ public static async Task<JsonSchema> FromFileAsync(string filePath)
         /// <summary>Creates a JSON Schema from a JSON file.</summary>
         /// <param name="filePath">The file path.</param>
         /// <param name="referenceResolverFactory">The JSON reference resolver factory.</param>
+        /// <param name="cancellationToken">The cancellation token</param>
         /// <returns>The <see cref="JsonSchema" />.</returns>
         public static async Task<JsonSchema> FromFileAsync(string filePath, Func<JsonSchema, JsonReferenceResolver> referenceResolverFactory, CancellationToken cancellationToken = default)
         {
@@ -91,6 +93,7 @@ public static async Task<JsonSchema> FromFileAsync(string filePath, Func<JsonSch
         /// <summary>Creates a JSON Schema from an URL.</summary>
         /// <param name="url">The URL.</param>
         /// <param name="referenceResolverFactory">The JSON reference resolver factory.</param>
+        /// <param name="cancellationToken">The cancellation token</param>
         /// <returns>The <see cref="JsonSchema"/>.</returns>
         public static async Task<JsonSchema> FromUrlAsync(string url, Func<JsonSchema, JsonReferenceResolver> referenceResolverFactory, CancellationToken cancellationToken = default)
         {

diff --git a/src/NJsonSchema/Generation/SampleJsonDataGenerator.cs b/src/NJsonSchema/Generation/SampleJsonDataGenerator.cs
@@ -7,7 +7,6 @@
 //-----------------------------------------------------------------------
 
 using Newtonsoft.Json.Linq;
-using NJsonSchema.Annotations;
 using System;
 using System.Collections.Generic;
 using System.Globalization;

diff --git a/src/NJsonSchema/Generation/TypeMappers/PrimitiveTypeMapper.cs b/src/NJsonSchema/Generation/TypeMappers/PrimitiveTypeMapper.cs
@@ -7,7 +7,6 @@
 //-----------------------------------------------------------------------
 
 using System;
-using System.Threading.Tasks;
 
 namespace NJsonSchema.Generation.TypeMappers
 {

diff --git a/src/NJsonSchema/Infrastructure/IgnoreEmptyCollectionsContractResolver.cs b/src/NJsonSchema/Infrastructure/IgnoreEmptyCollectionsContractResolver.cs
@@ -8,7 +8,6 @@
 
 using System.Collections;
 using System.Reflection;
-using Namotion.Reflection;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 

diff --git a/src/NJsonSchema/Infrastructure/Polyfills.cs b/src/NJsonSchema/Infrastructure/Polyfills.cs
@@ -1,6 +1,5 @@
-using System;
-
 // ReSharper disable once CheckNamespace
+
 namespace NJsonSchema;
 
 internal static class Polyfills
@@ -18,6 +17,6 @@ internal static class Polyfills
 
 #if NETFRAMEWORK
     [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
-    internal static bool Contains(this ReadOnlySpan<string> source, string c) => source.IndexOf(c) != -1;
+    internal static bool Contains(this System.ReadOnlySpan<string> source, string c) => System.MemoryExtensions.IndexOf(source, c) != -1;
 #endif
 }
diff --git a/src/NJsonSchema/Infrastructure/XmlObjectExtension.cs b/src/NJsonSchema/Infrastructure/XmlObjectExtension.cs
@@ -8,9 +8,7 @@
 
 using Namotion.Reflection;
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
 
 namespace NJsonSchema.Infrastructure
 {

diff --git a/src/NJsonSchema/JsonSchema.cs b/src/NJsonSchema/JsonSchema.cs
@@ -19,7 +19,6 @@
 using Namotion.Reflection;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using NJsonSchema.Annotations;
 using NJsonSchema.Collections;
 using NJsonSchema.Generation;
 using NJsonSchema.Infrastructure;

diff --git a/src/NJsonSchema/References/JsonReferenceBase.cs b/src/NJsonSchema/References/JsonReferenceBase.cs
@@ -6,7 +6,6 @@
 // <author>Rico Suter, [email protected]</author>
 //-----------------------------------------------------------------------
 
-using NJsonSchema.Infrastructure;
 using Newtonsoft.Json;
 
 namespace NJsonSchema.References

diff --git a/src/NJsonSchema/SampleJsonSchemaGenerator.cs b/src/NJsonSchema/SampleJsonSchemaGenerator.cs
@@ -13,7 +13,6 @@
 using System.Text.RegularExpressions;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using NJsonSchema.Annotations;
 
 namespace NJsonSchema
 {

diff --git a/src/NJsonSchema/Validation/FormatValidators/Base64FormatValidator.cs b/src/NJsonSchema/Validation/FormatValidators/Base64FormatValidator.cs
@@ -7,7 +7,6 @@
 //-----------------------------------------------------------------------
 
 using Newtonsoft.Json.Linq;
-using NJsonSchema.Annotations;
 
 namespace NJsonSchema.Validation.FormatValidators
 {

diff --git a/src/NJsonSchema/Validation/FormatValidators/ByteFormatValidator.cs b/src/NJsonSchema/Validation/FormatValidators/ByteFormatValidator.cs
@@ -7,7 +7,6 @@
 //-----------------------------------------------------------------------
 
 using Newtonsoft.Json.Linq;
-using NJsonSchema.Annotations;
 using System.Text.RegularExpressions;
 
 namespace NJsonSchema.Validation.FormatValidators

diff --git a/src/NJsonSchema/Validation/FormatValidators/DateFormatValidator.cs b/src/NJsonSchema/Validation/FormatValidators/DateFormatValidator.cs
@@ -7,7 +7,6 @@
 //-----------------------------------------------------------------------
 
 using Newtonsoft.Json.Linq;
-using NJsonSchema.Annotations;
 using System;
 using System.Globalization;
 

diff --git a/src/NJsonSchema/Validation/FormatValidators/DateTimeFormatValidator.cs b/src/NJsonSchema/Validation/FormatValidators/DateTimeFormatValidator.cs
@@ -6,7 +6,6 @@
 // <author>Rico Suter, [email protected]</author>
 //-----------------------------------------------------------------------
 using Newtonsoft.Json.Linq;
-using NJsonSchema.Annotations;
 using System;
 using System.Globalization;
 

diff --git a/src/NJsonSchema/Validation/FormatValidators/EmailFormatValidator.cs b/src/NJsonSchema/Validation/FormatValidators/EmailFormatValidator.cs
@@ -7,7 +7,6 @@
 //-----------------------------------------------------------------------
 
 using Newtonsoft.Json.Linq;
-using NJsonSchema.Annotations;
 using System.Text.RegularExpressions;
 
 namespace NJsonSchema.Validation.FormatValidators

diff --git a/src/NJsonSchema/Validation/FormatValidators/GuidFormatValidator.cs b/src/NJsonSchema/Validation/FormatValidators/GuidFormatValidator.cs
@@ -7,7 +7,6 @@
 //-----------------------------------------------------------------------
 
 using Newtonsoft.Json.Linq;
-using NJsonSchema.Annotations;
 using System;
 
 namespace NJsonSchema.Validation.FormatValidators

diff --git a/src/NJsonSchema/Validation/FormatValidators/HostnameFormatValidator.cs b/src/NJsonSchema/Validation/FormatValidators/HostnameFormatValidator.cs
@@ -7,7 +7,6 @@
 //-----------------------------------------------------------------------
 
 using Newtonsoft.Json.Linq;
-using NJsonSchema.Annotations;
 using System.Text.RegularExpressions;
 
 namespace NJsonSchema.Validation.FormatValidators

diff --git a/src/NJsonSchema/Validation/FormatValidators/IpV4FormatValidator.cs b/src/NJsonSchema/Validation/FormatValidators/IpV4FormatValidator.cs
@@ -7,7 +7,6 @@
 //-----------------------------------------------------------------------
 
 using Newtonsoft.Json.Linq;
-using NJsonSchema.Annotations;
 using System.Text.RegularExpressions;
 
 namespace NJsonSchema.Validation.FormatValidators

diff --git a/src/NJsonSchema/Validation/FormatValidators/IpV6FormatValidator.cs b/src/NJsonSchema/Validation/FormatValidators/IpV6FormatValidator.cs
@@ -7,7 +7,6 @@
 //-----------------------------------------------------------------------
 
 using Newtonsoft.Json.Linq;
-using NJsonSchema.Annotations;
 using System;
 
 namespace NJsonSchema.Validation.FormatValidators

diff --git a/src/NJsonSchema/Validation/FormatValidators/TimeFormatValidator.cs b/src/NJsonSchema/Validation/FormatValidators/TimeFormatValidator.cs
@@ -7,7 +7,6 @@
 //-----------------------------------------------------------------------
 
 using Newtonsoft.Json.Linq;
-using NJsonSchema.Annotations;
 using System;
 using System.Globalization;
 

diff --git a/src/NJsonSchema/Validation/FormatValidators/TimeSpanFormatValidator.cs b/src/NJsonSchema/Validation/FormatValidators/TimeSpanFormatValidator.cs
@@ -7,7 +7,6 @@
 //-----------------------------------------------------------------------
 
 using Newtonsoft.Json.Linq;
-using NJsonSchema.Annotations;
 using System;
 
 namespace NJsonSchema.Validation.FormatValidators

diff --git a/src/NJsonSchema/Validation/FormatValidators/UriFormatValidator.cs b/src/NJsonSchema/Validation/FormatValidators/UriFormatValidator.cs
@@ -7,7 +7,6 @@
 //-----------------------------------------------------------------------
 
 using Newtonsoft.Json.Linq;
-using NJsonSchema.Annotations;
 using System;
 
 namespace NJsonSchema.Validation.FormatValidators

diff --git a/src/NJsonSchema/Validation/FormatValidators/UuidFormatValidator.cs b/src/NJsonSchema/Validation/FormatValidators/UuidFormatValidator.cs
@@ -7,7 +7,6 @@
 //-----------------------------------------------------------------------
 
 using Newtonsoft.Json.Linq;
-using NJsonSchema.Annotations;
 using System;
 
 namespace NJsonSchema.Validation.FormatValidators