RicoSuter · lahma · Apr 27, 2025 · Apr 27, 2025
diff --git a/src/NJsonSchema.CodeGeneration.CSharp.Tests/AbstractSchemaTests.cs b/src/NJsonSchema.CodeGeneration.CSharp.Tests/AbstractSchemaTests.cs
@@ -1,6 +1,5 @@
 using NJsonSchema.CodeGeneration.CSharp;
 using NJsonSchema.NewtonsoftJson.Generation;
-using Xunit;
 
 namespace NJsonSchema.CodeGeneration.Tests.CSharp.Generation
 {

diff --git a/src/NJsonSchema.CodeGeneration.CSharp.Tests/AdditionalPropertiesTests.cs b/src/NJsonSchema.CodeGeneration.CSharp.Tests/AdditionalPropertiesTests.cs
@@ -1,7 +1,6 @@
 using System.Text.RegularExpressions;
 using NJsonSchema.CodeGeneration.CSharp;
 using NJsonSchema.NewtonsoftJson.Generation;
-using Xunit;
 
 namespace NJsonSchema.CodeGeneration.Tests.CSharp
 {

diff --git a/src/NJsonSchema.CodeGeneration.CSharp.Tests/AllOfTests.cs b/src/NJsonSchema.CodeGeneration.CSharp.Tests/AllOfTests.cs
@@ -1,5 +1,4 @@
 using NJsonSchema.CodeGeneration.CSharp;
-using Xunit;
 
 namespace NJsonSchema.CodeGeneration.Tests.CSharp
 {

diff --git a/src/NJsonSchema.CodeGeneration.CSharp.Tests/AnnotationsTests.cs b/src/NJsonSchema.CodeGeneration.CSharp.Tests/AnnotationsTests.cs
@@ -1,7 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using NJsonSchema.CodeGeneration.CSharp;
 using NJsonSchema.NewtonsoftJson.Generation;
-using Xunit;
 
 namespace NJsonSchema.CodeGeneration.Tests.CSharp
 {

diff --git a/src/NJsonSchema.CodeGeneration.CSharp.Tests/ArrayTests.cs b/src/NJsonSchema.CodeGeneration.CSharp.Tests/ArrayTests.cs
@@ -1,7 +1,6 @@
 using NJsonSchema.Annotations;
 using NJsonSchema.NewtonsoftJson.Generation;
 using System.ComponentModel.DataAnnotations;
-using Xunit;
 
 namespace NJsonSchema.CodeGeneration.CSharp.Tests
 {

diff --git a/src/NJsonSchema.CodeGeneration.CSharp.Tests/CSharpJsonSerializerGeneratorTests.cs b/src/NJsonSchema.CodeGeneration.CSharp.Tests/CSharpJsonSerializerGeneratorTests.cs
@@ -1,6 +1,4 @@
-using Xunit;
-
-namespace NJsonSchema.CodeGeneration.CSharp.Tests
+namespace NJsonSchema.CodeGeneration.CSharp.Tests
 {
     public class CSharpJsonSerializerGeneratorTests
     {

diff --git a/src/NJsonSchema.CodeGeneration.CSharp.Tests/DefaultPropertyTests.cs b/src/NJsonSchema.CodeGeneration.CSharp.Tests/DefaultPropertyTests.cs
@@ -1,6 +1,4 @@
-using Xunit;
-
-namespace NJsonSchema.CodeGeneration.CSharp.Tests
+namespace NJsonSchema.CodeGeneration.CSharp.Tests
 {
     public class DefaultPropertyTests
     {

diff --git a/src/NJsonSchema.CodeGeneration.CSharp.Tests/DictionaryTests.cs b/src/NJsonSchema.CodeGeneration.CSharp.Tests/DictionaryTests.cs
@@ -1,6 +1,5 @@
 using NJsonSchema.NewtonsoftJson.Generation;
 using System.ComponentModel.DataAnnotations;
-using Xunit;
 
 namespace NJsonSchema.CodeGeneration.CSharp.Tests
 {

diff --git a/src/NJsonSchema.CodeGeneration.CSharp.Tests/EnumTests.cs b/src/NJsonSchema.CodeGeneration.CSharp.Tests/EnumTests.cs
@@ -2,7 +2,6 @@
 using Newtonsoft.Json.Converters;
 using NJsonSchema.CodeGeneration.CSharp;
 using NJsonSchema.NewtonsoftJson.Generation;
-using Xunit;
 
 namespace NJsonSchema.CodeGeneration.Tests.CSharp
 {

diff --git a/src/NJsonSchema.CodeGeneration.CSharp.Tests/GeneralGeneratorTests.cs b/src/NJsonSchema.CodeGeneration.CSharp.Tests/GeneralGeneratorTests.cs
@@ -10,7 +10,6 @@
 using Newtonsoft.Json.Converters;
 using NJsonSchema.Annotations;
 using NJsonSchema.NewtonsoftJson.Generation;
-using Xunit;
 
 namespace NJsonSchema.CodeGeneration.CSharp.Tests
 {

diff --git a/src/NJsonSchema.CodeGeneration.CSharp.Tests/InheritanceInterfaceTests.cs b/src/NJsonSchema.CodeGeneration.CSharp.Tests/InheritanceInterfaceTests.cs
@@ -3,7 +3,6 @@
 using NJsonSchema.CodeGeneration.CSharp;
 using NJsonSchema.NewtonsoftJson.Converters;
 using NJsonSchema.NewtonsoftJson.Generation;
-using Xunit;
 
 namespace NJsonSchema.CodeGeneration.Tests.CSharp
 {

diff --git a/src/NJsonSchema.CodeGeneration.CSharp.Tests/InheritanceTests.cs b/src/NJsonSchema.CodeGeneration.CSharp.Tests/InheritanceTests.cs
@@ -4,7 +4,6 @@
 using NJsonSchema.CodeGeneration.CSharp;
 using NJsonSchema.NewtonsoftJson.Converters;
 using NJsonSchema.NewtonsoftJson.Generation;
-using Xunit;
 
 namespace NJsonSchema.CodeGeneration.Tests.CSharp
 {

diff --git a/src/NJsonSchema.CodeGeneration.CSharp.Tests/InterfaceTests.cs b/src/NJsonSchema.CodeGeneration.CSharp.Tests/InterfaceTests.cs
@@ -1,5 +1,4 @@
 using NJsonSchema.NewtonsoftJson.Generation;
-using Xunit;
 
 namespace NJsonSchema.CodeGeneration.CSharp.Tests
 {

diff --git a/src/NJsonSchema.CodeGeneration.CSharp.Tests/NullableEnumTests.cs b/src/NJsonSchema.CodeGeneration.CSharp.Tests/NullableEnumTests.cs
@@ -1,5 +1,4 @@
 using NJsonSchema.CodeGeneration.CSharp;
-using Xunit;
 
 namespace NJsonSchema.CodeGeneration.Tests.CSharp
 {

diff --git a/src/NJsonSchema.CodeGeneration.CSharp.Tests/NullableReferenceTypesTests.cs b/src/NJsonSchema.CodeGeneration.CSharp.Tests/NullableReferenceTypesTests.cs
@@ -1,7 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using NJsonSchema.CodeGeneration.CSharp;
 using NJsonSchema.NewtonsoftJson.Generation;
-using Xunit;
 
 namespace NJsonSchema.CodeGeneration.Tests.CSharp
 {

diff --git a/src/NJsonSchema.CodeGeneration.CSharp.Tests/NullableTests.cs b/src/NJsonSchema.CodeGeneration.CSharp.Tests/NullableTests.cs
@@ -1,7 +1,6 @@
 using NJsonSchema.CodeGeneration.CSharp;
 using NJsonSchema.NewtonsoftJson.Generation;
 using System.ComponentModel.DataAnnotations;
-using Xunit;
 
 namespace NJsonSchema.CodeGeneration.Tests.CSharp
 {

diff --git a/src/NJsonSchema.CodeGeneration.CSharp.Tests/NumberTests.cs b/src/NJsonSchema.CodeGeneration.CSharp.Tests/NumberTests.cs
@@ -1,5 +1,4 @@
 using NJsonSchema.CodeGeneration.CSharp;
-using Xunit;
 
 namespace NJsonSchema.CodeGeneration.Tests.CSharp;
 

diff --git a/src/NJsonSchema.CodeGeneration.CSharp.Tests/ObjectPropertyRequiredTests.cs b/src/NJsonSchema.CodeGeneration.CSharp.Tests/ObjectPropertyRequiredTests.cs
@@ -1,7 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using NJsonSchema.CodeGeneration.CSharp;
 using NJsonSchema.NewtonsoftJson.Generation;
-using Xunit;
 
 namespace NJsonSchema.CodeGeneration.Tests.CSharp
 {

diff --git a/src/NJsonSchema.CodeGeneration.CSharp.Tests/ObsoleteTests.cs b/src/NJsonSchema.CodeGeneration.CSharp.Tests/ObsoleteTests.cs
@@ -1,6 +1,5 @@
 using NJsonSchema.CodeGeneration.CSharp;
 using NJsonSchema.NewtonsoftJson.Generation;
-using Xunit;
 
 namespace NJsonSchema.CodeGeneration.Tests.CSharp
 {

diff --git a/src/NJsonSchema.CodeGeneration.CSharp.Tests/ReferencesTest.cs b/src/NJsonSchema.CodeGeneration.CSharp.Tests/ReferencesTest.cs
@@ -2,7 +2,6 @@
 using NJsonSchema.CodeGeneration.CSharp;
 using NJsonSchema.Infrastructure;
 using System.Reflection;
-using Xunit;
 
 namespace NJsonSchema.CodeGeneration.Tests.CSharp
 {

diff --git a/src/NJsonSchema.CodeGeneration.CSharp.Tests/StringPropertyRequiredTests.cs b/src/NJsonSchema.CodeGeneration.CSharp.Tests/StringPropertyRequiredTests.cs
@@ -1,6 +1,5 @@
 using System.ComponentModel.DataAnnotations;
 using NJsonSchema.NewtonsoftJson.Generation;
-using Xunit;
 
 namespace NJsonSchema.CodeGeneration.CSharp.Tests
 {

diff --git a/src/NJsonSchema.CodeGeneration.CSharp.Tests/UriTests.cs b/src/NJsonSchema.CodeGeneration.CSharp.Tests/UriTests.cs
@@ -1,6 +1,5 @@
 using Newtonsoft.Json;
 using NJsonSchema.NewtonsoftJson.Generation;
-using Xunit;
 
 namespace NJsonSchema.CodeGeneration.CSharp.Tests
 {

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

diff --git a/src/NJsonSchema.CodeGeneration.CSharp/CSharpJsonSerializerGenerator.cs b/src/NJsonSchema.CodeGeneration.CSharp/CSharpJsonSerializerGenerator.cs
@@ -6,6 +6,8 @@
 // <author>Rico Suter, [email protected]</author>
 //-----------------------------------------------------------------------
 
+using System.Linq;
+
 namespace NJsonSchema.CodeGeneration.CSharp
 {
     /// <summary>Generates JSON converter code.</summary>

diff --git a/src/NJsonSchema.CodeGeneration.CSharp/CSharpTypeResolver.cs b/src/NJsonSchema.CodeGeneration.CSharp/CSharpTypeResolver.cs
@@ -6,6 +6,8 @@
 // <author>Rico Suter, [email protected]</author>
 //-----------------------------------------------------------------------
 
+using System.Linq;
+
 namespace NJsonSchema.CodeGeneration.CSharp
 {
     /// <summary>Manages the generated types and converts JSON types to CSharp types. </summary>

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

diff --git a/src/NJsonSchema.CodeGeneration.CSharp/Models/DateFormatConverterTemplateModel.cs b/src/NJsonSchema.CodeGeneration.CSharp/Models/DateFormatConverterTemplateModel.cs
@@ -6,6 +6,8 @@
 // <author>Rico Suter, [email protected]</author>
 //-----------------------------------------------------------------------
 
+using System.Linq;
+
 namespace NJsonSchema.CodeGeneration.CSharp.Models
 {
     /// <summary>The DateFormatConverterTemplateModel.</summary>

diff --git a/src/NJsonSchema.CodeGeneration.CSharp/Models/EnumTemplateModel.cs b/src/NJsonSchema.CodeGeneration.CSharp/Models/EnumTemplateModel.cs
@@ -7,6 +7,7 @@
 //-----------------------------------------------------------------------
 
 using System.Globalization;
+using System.Linq;
 using NJsonSchema.CodeGeneration.Models;
 
 namespace NJsonSchema.CodeGeneration.CSharp.Models

diff --git a/src/NJsonSchema.CodeGeneration.CSharp/NJsonSchema.CodeGeneration.CSharp.csproj b/src/NJsonSchema.CodeGeneration.CSharp/NJsonSchema.CodeGeneration.CSharp.csproj
@@ -23,4 +23,8 @@
         <None Include="NuGetIcon.png" Pack="true" PackagePath="\" />
     </ItemGroup>
 
+    <ItemGroup>
+        <Using Remove="System.Linq" />
+    </ItemGroup>
+
 </Project>
diff --git a/src/NJsonSchema.CodeGeneration.Tests/DefaultGenerationTests.cs b/src/NJsonSchema.CodeGeneration.Tests/DefaultGenerationTests.cs
@@ -1,7 +1,6 @@
 using System.ComponentModel;
 using NJsonSchema.CodeGeneration.CSharp;
 using NJsonSchema.NewtonsoftJson.Generation;
-using Xunit;
 
 namespace NJsonSchema.CodeGeneration.Tests
 {

diff --git a/src/NJsonSchema.CodeGeneration.Tests/DefaultValueGeneratorTests.cs b/src/NJsonSchema.CodeGeneration.Tests/DefaultValueGeneratorTests.cs
@@ -1,6 +1,5 @@
 using NJsonSchema.CodeGeneration.CSharp;
 using NJsonSchema.CodeGeneration.TypeScript;
-using Xunit;
 
 namespace NJsonSchema.CodeGeneration.Tests
 {

diff --git a/src/NJsonSchema.CodeGeneration.Tests/EnumGenerationTests.cs b/src/NJsonSchema.CodeGeneration.Tests/EnumGenerationTests.cs
@@ -4,7 +4,6 @@
 using NJsonSchema.CodeGeneration.CSharp;
 using NJsonSchema.CodeGeneration.TypeScript;
 using NJsonSchema.NewtonsoftJson.Generation;
-using Xunit;
 
 namespace NJsonSchema.CodeGeneration.Tests
 {

diff --git a/src/NJsonSchema.CodeGeneration.Tests/InheritanceSerializationTests.cs b/src/NJsonSchema.CodeGeneration.Tests/InheritanceSerializationTests.cs
@@ -5,7 +5,6 @@
 using Newtonsoft.Json.Serialization;
 using NJsonSchema.CodeGeneration.CSharp;
 using NJsonSchema.CodeGeneration.TypeScript;
-using Xunit;
 using System.Reflection;
 using System.CodeDom.Compiler;
 using NJsonSchema.NewtonsoftJson.Converters;

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

diff --git a/src/NJsonSchema.CodeGeneration.Tests/Samples/SampleTests.cs b/src/NJsonSchema.CodeGeneration.Tests/Samples/SampleTests.cs
@@ -3,7 +3,6 @@
 using Newtonsoft.Json.Linq;
 using NJsonSchema.CodeGeneration.TypeScript;
 using NJsonSchema.NewtonsoftJson.Generation;
-using Xunit;
 
 namespace NJsonSchema.CodeGeneration.Tests.Samples
 {

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

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

diff --git a/src/NJsonSchema.CodeGeneration.TypeScript/NJsonSchema.CodeGeneration.TypeScript.csproj b/src/NJsonSchema.CodeGeneration.TypeScript/NJsonSchema.CodeGeneration.TypeScript.csproj
@@ -26,4 +26,8 @@
         <None Include="NuGetIcon.png" Pack="true" PackagePath="\" />
     </ItemGroup>
 
+    <ItemGroup>
+        <Using Remove="System.Linq" />
+    </ItemGroup>
+
 </Project>
diff --git a/src/NJsonSchema.CodeGeneration.TypeScript/TypeScriptExtensionCode.cs b/src/NJsonSchema.CodeGeneration.TypeScript/TypeScriptExtensionCode.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using System.Text.RegularExpressions;
 
 namespace NJsonSchema.CodeGeneration.TypeScript

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

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

diff --git a/src/NJsonSchema.CodeGeneration.TypeScript/TypeScriptTypeResolver.cs b/src/NJsonSchema.CodeGeneration.TypeScript/TypeScriptTypeResolver.cs
@@ -6,6 +6,8 @@
 // <author>Rico Suter, [email protected]</author>
 //-----------------------------------------------------------------------
 
+using System.Linq;
+
 namespace NJsonSchema.CodeGeneration.TypeScript
 {
     /// <summary>Manages the generated types and converts JSON types to TypeScript types. </summary>

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

diff --git a/src/NJsonSchema.CodeGeneration/DefaultEnumNameGenerator.cs b/src/NJsonSchema.CodeGeneration/DefaultEnumNameGenerator.cs
@@ -60,8 +60,9 @@ public string Generate(int index, string? name, object? value, JsonSchema schema
             }
 #pragma warning restore CA1845
 
-            return _invalidNameCharactersPattern.Replace(ConversionUtilities.ConvertToUpperCamelCase(name
-                .Replace(":", "-").Replace(@"""", ""), firstCharacterMustBeAlpha: true), "_");
+            var cleaned = name.Replace(':', '-').Replace(@"""", "");
+            var camelCase = ConversionUtilities.ConvertToUpperCamelCase(cleaned, firstCharacterMustBeAlpha: true);
+            return _invalidNameCharactersPattern.Replace(camelCase, "_");
         }
     }
 }