From ee19a36769bdd7682c1fd3a26a15e25a555ee523 Mon Sep 17 00:00:00 2001 From: Marko Lahma Date: Wed, 17 Jul 2024 19:31:25 +0300 Subject: [PATCH] Upgrade packages * latest dependencies * target net472 consistently for test projects * remove unnecessary dotnet-xunit reference * remove unused usings in test projects * ensure GitHubActionsTestLogger is in use --- Directory.Packages.props | 28 +++++++++---------- build/Build.cs | 11 ++++++-- .../JsonInheritanceConverterBenchmarks.cs | 10 +------ .../NJsonSchema.Benchmark.csproj | 4 --- .../SchemaGenerationBenchmarks.cs | 8 ------ .../SerializationBenchmarks.cs | 10 +------ .../AdditionalPropertiesTests.cs | 1 - .../CSharpJsonSerializerGeneratorTests.cs | 3 +- .../EnumTests.cs | 1 - .../GeneralGeneratorTests.cs | 1 - .../InheritanceInterfaceTests.cs | 1 - .../InterfaceTests.cs | 1 - ...nSchema.CodeGeneration.CSharp.Tests.csproj | 1 - .../NullableReferenceTypesTests.cs | 1 - .../NullableTests.cs | 1 - .../ObjectPropertyRequiredTests.cs | 1 - .../StringPropertyRequiredTests.cs | 1 - .../DefaultGenerationTests.cs | 1 - .../DefaultValueGeneratorTests.cs | 3 +- .../EnumGenerationTests.cs | 1 - .../NJsonSchema.CodeGeneration.Tests.csproj | 11 ++------ .../ClassGenerationTests.cs | 3 -- .../ConstructorInterfaceTests.cs | 1 - .../DateCodeGenerationTests.cs | 1 - .../DateTimeCodeGenerationTests.cs | 1 - .../InheritanceTests.cs | 1 - ...ema.CodeGeneration.TypeScript.Tests.csproj | 4 +-- .../PropertyNameTests.cs | 3 -- .../TypeScriptDiscriminatorTests.cs | 2 -- .../TypeScriptGeneratorTests.cs | 3 +- .../DefaultTemplateFactory.cs | 2 +- .../NJsonSchema.NewtonsoftJson.Tests.csproj | 6 ++-- .../Conversion/ArrayTypeToSchemaTests.cs | 1 - .../Conversion/TypeToSchemaTests.cs | 2 -- .../AllowAdditionalPropertiesTests.cs | 1 - .../Generation/ArrayGenerationTests.cs | 1 - .../Generation/ContractResolverTests.cs | 1 - .../Generation/DataContractTests.cs | 1 - .../Generation/DictionaryTests.cs | 3 +- .../Generation/EnumGenerationTests.cs | 1 - src/NJsonSchema.Tests/Generation/EnumTests.cs | 1 - .../ExtensionDataGenerationTests.cs | 1 - .../FlattenInheritanceHierarchyTests.cs | 1 - .../Generation/InheritanceTests.cs | 1 - .../Generation/InterfaceTests.cs | 1 - .../Generation/JsonPropertyAttributeTests.cs | 1 - ...emaExtensionDataAttributeGeneratorTests.cs | 1 - .../Generation/KnownTypeGenerationTests.cs | 1 - .../PrimitiveTypeGenerationTests.cs | 1 - .../PropertyNamesGenerationTests.cs | 1 - .../SampleJsonSchemaGeneratorTests.cs | 3 +- .../Generation/SchemaGenerationTests.cs | 3 +- .../Generation/SchemaProcessorTests.cs | 3 +- .../Generation/TypeMapperTests.cs | 1 - .../Generation/XmlObjectTests.cs | 1 - .../NJsonSchema.Tests.csproj | 10 +++++-- .../Validation/CustomValidationTests.cs | 1 - .../Validation/FormatBase64Tests.cs | 1 - .../Validation/FormatDateTests.cs | 1 - .../Validation/FormatDateTimeTests.cs | 1 - .../Validation/FormatEmailTests.cs | 1 - .../Validation/FormatGuidTests.cs | 1 - .../Validation/FormatHostnameTests.cs | 1 - .../Validation/FormatIpV4Tests.cs | 1 - .../Validation/FormatIpV6Tests.cs | 1 - .../Validation/FormatTimeSpanTests.cs | 1 - .../Validation/FormatTimeTests.cs | 1 - .../Validation/FormatUriTests.cs | 1 - .../Validation/FormatUuidTests.cs | 1 - .../Validation/NullPropertyTests.cs | 1 - .../NJsonSchema.Yaml.Tests.csproj | 8 ++++-- src/NJsonSchema.sln | 1 + .../Generation/JsonSchemaGeneratorSettings.cs | 2 +- src/NJsonSchema/NJsonSchema.csproj | 2 +- 74 files changed, 56 insertions(+), 140 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 94d8c431d..77f581dbb 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -4,27 +4,25 @@ false - - - - - + + + + + - - + + - - - - - - + + + + + - - + \ No newline at end of file diff --git a/build/Build.cs b/build/Build.cs index 06284d623..a3205e09a 100644 --- a/build/Build.cs +++ b/build/Build.cs @@ -4,6 +4,7 @@ using System.Xml.Linq; using Nuke.Common; using Nuke.Common.CI; +using Nuke.Common.CI.GitHubActions; using Nuke.Common.Git; using Nuke.Common.IO; using Nuke.Common.ProjectModel; @@ -83,7 +84,7 @@ protected override void OnBuildInitialized() VersionSuffix = $"dev-{DateTime.UtcNow:yyyyMMdd-HHmm}"; } - using var _ = Block("BUILD SETUP"); + Serilog.Log.Information("BUILD SETUP"); Serilog.Log.Information("Configuration:\t {Configuration}" , Configuration); Serilog.Log.Information("Version prefix:\t {VersionPrefix}" , VersionPrefix); Serilog.Log.Information("Version suffix:\t {VersionSuffix}" , VersionSuffix); @@ -118,11 +119,15 @@ protected override void OnBuildInitialized() .EnableNoRestore() .SetDeterministic(IsServerBuild) .SetContinuousIntegrationBuild(IsServerBuild) + // ensure we don't generate too much output in CI run + // 0 Turns off emission of all warning messages + // 1 Displays severe warning messages + .SetWarningLevel(IsServerBuild ? 0 : 1) ); }); Target Test => _ => _ - .After(Compile) + .DependsOn(Compile) .Executes(() => { var framework = ""; @@ -135,7 +140,9 @@ protected override void OnBuildInitialized() .SetProjectFile(Solution) .SetConfiguration(Configuration) .EnableNoRestore() + .EnableNoBuild() .SetFramework(framework) + .When(GitHubActions.Instance is not null, x => x.SetLoggers("GitHubActions")) ); }); diff --git a/src/NJsonSchema.Benchmark/JsonInheritanceConverterBenchmarks.cs b/src/NJsonSchema.Benchmark/JsonInheritanceConverterBenchmarks.cs index 398205e3f..7e70b79c8 100644 --- a/src/NJsonSchema.Benchmark/JsonInheritanceConverterBenchmarks.cs +++ b/src/NJsonSchema.Benchmark/JsonInheritanceConverterBenchmarks.cs @@ -1,8 +1,6 @@ -using System.Diagnostics; -using NBench; +using NBench; using NJsonSchema.Tests.Generation; using Pro.NBench.xUnit.XunitExtensions; -using Xunit.Abstractions; namespace NJsonSchema.Benchmark { @@ -11,12 +9,6 @@ public class JsonInheritanceConverterBenchmarks private Counter _counter; private JsonInheritanceConverterTests _tests; - public JsonInheritanceConverterBenchmarks(ITestOutputHelper output) - { - Trace.Listeners.Clear(); - Trace.Listeners.Add(new XunitTraceListener(output)); - } - [PerfSetup] public void Setup(BenchmarkContext context) { diff --git a/src/NJsonSchema.Benchmark/NJsonSchema.Benchmark.csproj b/src/NJsonSchema.Benchmark/NJsonSchema.Benchmark.csproj index f889f9404..92f109cb8 100644 --- a/src/NJsonSchema.Benchmark/NJsonSchema.Benchmark.csproj +++ b/src/NJsonSchema.Benchmark/NJsonSchema.Benchmark.csproj @@ -22,10 +22,6 @@ - - - - diff --git a/src/NJsonSchema.Benchmark/SchemaGenerationBenchmarks.cs b/src/NJsonSchema.Benchmark/SchemaGenerationBenchmarks.cs index 220619391..b9ab6021d 100644 --- a/src/NJsonSchema.Benchmark/SchemaGenerationBenchmarks.cs +++ b/src/NJsonSchema.Benchmark/SchemaGenerationBenchmarks.cs @@ -1,10 +1,8 @@ using System; -using System.Diagnostics; using System.Runtime.Serialization; using NBench; using NJsonSchema.NewtonsoftJson.Generation; using Pro.NBench.xUnit.XunitExtensions; -using Xunit.Abstractions; namespace NJsonSchema.Benchmark { @@ -12,12 +10,6 @@ public class SchemaGenerationBenchmarks { private Counter _counter; - public SchemaGenerationBenchmarks(ITestOutputHelper output) - { - Trace.Listeners.Clear(); - Trace.Listeners.Add(new XunitTraceListener(output)); - } - [PerfSetup] public void Setup(BenchmarkContext context) { diff --git a/src/NJsonSchema.Benchmark/SerializationBenchmarks.cs b/src/NJsonSchema.Benchmark/SerializationBenchmarks.cs index ed37bd4c5..f6cc14b1b 100644 --- a/src/NJsonSchema.Benchmark/SerializationBenchmarks.cs +++ b/src/NJsonSchema.Benchmark/SerializationBenchmarks.cs @@ -1,10 +1,8 @@ -using System.Diagnostics; -using System.IO; +using System.IO; using System.Reflection; using NBench; using Pro.NBench.xUnit.XunitExtensions; using Xunit; -using Xunit.Abstractions; [assembly: CollectionBehavior(DisableTestParallelization = true)] @@ -16,12 +14,6 @@ public class SerializationBenchmarks private Counter _counter; private string _json; - public SerializationBenchmarks(ITestOutputHelper output) - { - Trace.Listeners.Clear(); - Trace.Listeners.Add(new XunitTraceListener(output)); - } - [PerfSetup] public void Setup(BenchmarkContext context) { diff --git a/src/NJsonSchema.CodeGeneration.CSharp.Tests/AdditionalPropertiesTests.cs b/src/NJsonSchema.CodeGeneration.CSharp.Tests/AdditionalPropertiesTests.cs index 286204e7a..51334b36b 100644 --- a/src/NJsonSchema.CodeGeneration.CSharp.Tests/AdditionalPropertiesTests.cs +++ b/src/NJsonSchema.CodeGeneration.CSharp.Tests/AdditionalPropertiesTests.cs @@ -2,7 +2,6 @@ using System.Text.RegularExpressions; using System.Threading.Tasks; using NJsonSchema.CodeGeneration.CSharp; -using NJsonSchema.Generation; using NJsonSchema.NewtonsoftJson.Generation; using Xunit; diff --git a/src/NJsonSchema.CodeGeneration.CSharp.Tests/CSharpJsonSerializerGeneratorTests.cs b/src/NJsonSchema.CodeGeneration.CSharp.Tests/CSharpJsonSerializerGeneratorTests.cs index 41b204477..4301c355d 100644 --- a/src/NJsonSchema.CodeGeneration.CSharp.Tests/CSharpJsonSerializerGeneratorTests.cs +++ b/src/NJsonSchema.CodeGeneration.CSharp.Tests/CSharpJsonSerializerGeneratorTests.cs @@ -1,5 +1,4 @@ -using System; -using Xunit; +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 index 2af50a47b..ea6f27c02 100644 --- a/src/NJsonSchema.CodeGeneration.CSharp.Tests/EnumTests.cs +++ b/src/NJsonSchema.CodeGeneration.CSharp.Tests/EnumTests.cs @@ -1,7 +1,6 @@ using Newtonsoft.Json; using Newtonsoft.Json.Converters; using NJsonSchema.CodeGeneration.CSharp; -using NJsonSchema.Generation; using NJsonSchema.NewtonsoftJson.Generation; using System.Collections.Generic; using System.Threading.Tasks; diff --git a/src/NJsonSchema.CodeGeneration.CSharp.Tests/GeneralGeneratorTests.cs b/src/NJsonSchema.CodeGeneration.CSharp.Tests/GeneralGeneratorTests.cs index 5ac78e2ff..cd5fb9798 100644 --- a/src/NJsonSchema.CodeGeneration.CSharp.Tests/GeneralGeneratorTests.cs +++ b/src/NJsonSchema.CodeGeneration.CSharp.Tests/GeneralGeneratorTests.cs @@ -13,7 +13,6 @@ using Newtonsoft.Json; using Newtonsoft.Json.Converters; using NJsonSchema.Annotations; -using NJsonSchema.Generation; using NJsonSchema.NewtonsoftJson.Generation; using Xunit; diff --git a/src/NJsonSchema.CodeGeneration.CSharp.Tests/InheritanceInterfaceTests.cs b/src/NJsonSchema.CodeGeneration.CSharp.Tests/InheritanceInterfaceTests.cs index ae1b8db70..039b96e6f 100644 --- a/src/NJsonSchema.CodeGeneration.CSharp.Tests/InheritanceInterfaceTests.cs +++ b/src/NJsonSchema.CodeGeneration.CSharp.Tests/InheritanceInterfaceTests.cs @@ -4,7 +4,6 @@ using System.Threading.Tasks; using Newtonsoft.Json; using NJsonSchema.CodeGeneration.CSharp; -using NJsonSchema.Generation; using NJsonSchema.NewtonsoftJson.Converters; using NJsonSchema.NewtonsoftJson.Generation; using Xunit; diff --git a/src/NJsonSchema.CodeGeneration.CSharp.Tests/InterfaceTests.cs b/src/NJsonSchema.CodeGeneration.CSharp.Tests/InterfaceTests.cs index 9dda3330c..d248d937b 100644 --- a/src/NJsonSchema.CodeGeneration.CSharp.Tests/InterfaceTests.cs +++ b/src/NJsonSchema.CodeGeneration.CSharp.Tests/InterfaceTests.cs @@ -1,5 +1,4 @@ using System.Threading.Tasks; -using NJsonSchema.Generation; using NJsonSchema.NewtonsoftJson.Generation; using Xunit; diff --git a/src/NJsonSchema.CodeGeneration.CSharp.Tests/NJsonSchema.CodeGeneration.CSharp.Tests.csproj b/src/NJsonSchema.CodeGeneration.CSharp.Tests/NJsonSchema.CodeGeneration.CSharp.Tests.csproj index d5ea2de05..440ee6fc8 100644 --- a/src/NJsonSchema.CodeGeneration.CSharp.Tests/NJsonSchema.CodeGeneration.CSharp.Tests.csproj +++ b/src/NJsonSchema.CodeGeneration.CSharp.Tests/NJsonSchema.CodeGeneration.CSharp.Tests.csproj @@ -18,7 +18,6 @@ - diff --git a/src/NJsonSchema.CodeGeneration.CSharp.Tests/NullableReferenceTypesTests.cs b/src/NJsonSchema.CodeGeneration.CSharp.Tests/NullableReferenceTypesTests.cs index f33422088..c2e8ebb39 100644 --- 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 System.Threading.Tasks; using NJsonSchema.CodeGeneration.CSharp; -using NJsonSchema.Generation; using NJsonSchema.NewtonsoftJson.Generation; using Xunit; diff --git a/src/NJsonSchema.CodeGeneration.CSharp.Tests/NullableTests.cs b/src/NJsonSchema.CodeGeneration.CSharp.Tests/NullableTests.cs index aee242fb7..62d5918d5 100644 --- a/src/NJsonSchema.CodeGeneration.CSharp.Tests/NullableTests.cs +++ b/src/NJsonSchema.CodeGeneration.CSharp.Tests/NullableTests.cs @@ -1,5 +1,4 @@ using NJsonSchema.CodeGeneration.CSharp; -using NJsonSchema.Generation; using NJsonSchema.NewtonsoftJson.Generation; using System.ComponentModel.DataAnnotations; using System.Threading.Tasks; diff --git a/src/NJsonSchema.CodeGeneration.CSharp.Tests/ObjectPropertyRequiredTests.cs b/src/NJsonSchema.CodeGeneration.CSharp.Tests/ObjectPropertyRequiredTests.cs index b2c16e1df..687bdf390 100644 --- 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 System.Threading.Tasks; using NJsonSchema.CodeGeneration.CSharp; -using NJsonSchema.Generation; using NJsonSchema.NewtonsoftJson.Generation; using Xunit; diff --git a/src/NJsonSchema.CodeGeneration.CSharp.Tests/StringPropertyRequiredTests.cs b/src/NJsonSchema.CodeGeneration.CSharp.Tests/StringPropertyRequiredTests.cs index 1dc12e68c..f8a490fb5 100644 --- 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 System.Threading.Tasks; -using NJsonSchema.Generation; using NJsonSchema.NewtonsoftJson.Generation; using Xunit; diff --git a/src/NJsonSchema.CodeGeneration.Tests/DefaultGenerationTests.cs b/src/NJsonSchema.CodeGeneration.Tests/DefaultGenerationTests.cs index ee963edee..d6c985cd5 100644 --- a/src/NJsonSchema.CodeGeneration.Tests/DefaultGenerationTests.cs +++ b/src/NJsonSchema.CodeGeneration.Tests/DefaultGenerationTests.cs @@ -1,7 +1,6 @@ using System.ComponentModel; using System.Threading.Tasks; using NJsonSchema.CodeGeneration.CSharp; -using NJsonSchema.Generation; using NJsonSchema.NewtonsoftJson.Generation; using Xunit; diff --git a/src/NJsonSchema.CodeGeneration.Tests/DefaultValueGeneratorTests.cs b/src/NJsonSchema.CodeGeneration.Tests/DefaultValueGeneratorTests.cs index f50b27c76..e50e03ed3 100644 --- a/src/NJsonSchema.CodeGeneration.Tests/DefaultValueGeneratorTests.cs +++ b/src/NJsonSchema.CodeGeneration.Tests/DefaultValueGeneratorTests.cs @@ -1,5 +1,4 @@ -using NJsonSchema.Annotations; -using NJsonSchema.CodeGeneration.CSharp; +using NJsonSchema.CodeGeneration.CSharp; using NJsonSchema.CodeGeneration.TypeScript; using Xunit; diff --git a/src/NJsonSchema.CodeGeneration.Tests/EnumGenerationTests.cs b/src/NJsonSchema.CodeGeneration.Tests/EnumGenerationTests.cs index eb85ea960..fafb47efa 100644 --- a/src/NJsonSchema.CodeGeneration.Tests/EnumGenerationTests.cs +++ b/src/NJsonSchema.CodeGeneration.Tests/EnumGenerationTests.cs @@ -6,7 +6,6 @@ using Newtonsoft.Json.Converters; using NJsonSchema.CodeGeneration.CSharp; using NJsonSchema.CodeGeneration.TypeScript; -using NJsonSchema.Generation; using NJsonSchema.NewtonsoftJson.Generation; using Xunit; diff --git a/src/NJsonSchema.CodeGeneration.Tests/NJsonSchema.CodeGeneration.Tests.csproj b/src/NJsonSchema.CodeGeneration.Tests/NJsonSchema.CodeGeneration.Tests.csproj index 641305b15..cd1ef8ba1 100644 --- a/src/NJsonSchema.CodeGeneration.Tests/NJsonSchema.CodeGeneration.Tests.csproj +++ b/src/NJsonSchema.CodeGeneration.Tests/NJsonSchema.CodeGeneration.Tests.csproj @@ -1,7 +1,7 @@ - net8.0;net462 + net8.0;net472 false $(NoWarn),1998,1591,618 disable @@ -9,19 +9,14 @@ - - + - - - - - + diff --git a/src/NJsonSchema.CodeGeneration.TypeScript.Tests/ClassGenerationTests.cs b/src/NJsonSchema.CodeGeneration.TypeScript.Tests/ClassGenerationTests.cs index 55fb69e42..92d79dd43 100644 --- a/src/NJsonSchema.CodeGeneration.TypeScript.Tests/ClassGenerationTests.cs +++ b/src/NJsonSchema.CodeGeneration.TypeScript.Tests/ClassGenerationTests.cs @@ -1,5 +1,4 @@ using Newtonsoft.Json; -using NJsonSchema.Generation; using NJsonSchema.NewtonsoftJson.Converters; using NJsonSchema.NewtonsoftJson.Generation; using System; @@ -8,14 +7,12 @@ using System.ComponentModel.DataAnnotations; using System.Runtime.Serialization; using System.Threading.Tasks; -using VerifyXunit; using Xunit; using static NJsonSchema.CodeGeneration.TypeScript.Tests.VerifyHelper; namespace NJsonSchema.CodeGeneration.TypeScript.Tests { - [UsesVerify] public class ClassGenerationTests { public class MyClassTest diff --git a/src/NJsonSchema.CodeGeneration.TypeScript.Tests/ConstructorInterfaceTests.cs b/src/NJsonSchema.CodeGeneration.TypeScript.Tests/ConstructorInterfaceTests.cs index 577a1e3e1..c2b0004ab 100644 --- a/src/NJsonSchema.CodeGeneration.TypeScript.Tests/ConstructorInterfaceTests.cs +++ b/src/NJsonSchema.CodeGeneration.TypeScript.Tests/ConstructorInterfaceTests.cs @@ -2,7 +2,6 @@ using System.Runtime.Serialization; using System.Threading.Tasks; using Newtonsoft.Json; -using NJsonSchema.Generation; using NJsonSchema.NewtonsoftJson.Converters; using NJsonSchema.NewtonsoftJson.Generation; using Xunit; diff --git a/src/NJsonSchema.CodeGeneration.TypeScript.Tests/DateCodeGenerationTests.cs b/src/NJsonSchema.CodeGeneration.TypeScript.Tests/DateCodeGenerationTests.cs index d62f359c9..16a13315d 100644 --- a/src/NJsonSchema.CodeGeneration.TypeScript.Tests/DateCodeGenerationTests.cs +++ b/src/NJsonSchema.CodeGeneration.TypeScript.Tests/DateCodeGenerationTests.cs @@ -1,5 +1,4 @@ using System.Threading.Tasks; -using NJsonSchema.CodeGeneration.TypeScript; using Xunit; namespace NJsonSchema.CodeGeneration.TypeScript.Tests diff --git a/src/NJsonSchema.CodeGeneration.TypeScript.Tests/DateTimeCodeGenerationTests.cs b/src/NJsonSchema.CodeGeneration.TypeScript.Tests/DateTimeCodeGenerationTests.cs index 3b521f946..1b1d02778 100644 --- a/src/NJsonSchema.CodeGeneration.TypeScript.Tests/DateTimeCodeGenerationTests.cs +++ b/src/NJsonSchema.CodeGeneration.TypeScript.Tests/DateTimeCodeGenerationTests.cs @@ -1,6 +1,5 @@ using System; using System.Threading.Tasks; -using NJsonSchema.CodeGeneration.TypeScript; using NJsonSchema.NewtonsoftJson.Generation; using Xunit; diff --git a/src/NJsonSchema.CodeGeneration.TypeScript.Tests/InheritanceTests.cs b/src/NJsonSchema.CodeGeneration.TypeScript.Tests/InheritanceTests.cs index 63cc0ef12..7ca7f63bd 100644 --- a/src/NJsonSchema.CodeGeneration.TypeScript.Tests/InheritanceTests.cs +++ b/src/NJsonSchema.CodeGeneration.TypeScript.Tests/InheritanceTests.cs @@ -1,6 +1,5 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -using NJsonSchema.Generation; using NJsonSchema.Infrastructure; using NJsonSchema.NewtonsoftJson.Converters; using NJsonSchema.NewtonsoftJson.Generation; diff --git a/src/NJsonSchema.CodeGeneration.TypeScript.Tests/NJsonSchema.CodeGeneration.TypeScript.Tests.csproj b/src/NJsonSchema.CodeGeneration.TypeScript.Tests/NJsonSchema.CodeGeneration.TypeScript.Tests.csproj index c2dc07531..e7a7d2641 100644 --- a/src/NJsonSchema.CodeGeneration.TypeScript.Tests/NJsonSchema.CodeGeneration.TypeScript.Tests.csproj +++ b/src/NJsonSchema.CodeGeneration.TypeScript.Tests/NJsonSchema.CodeGeneration.TypeScript.Tests.csproj @@ -1,7 +1,7 @@ - net8.0;net462 + net8.0;net472 false true $(NoWarn),1587,1998,1591,618 @@ -19,7 +19,7 @@ - + diff --git a/src/NJsonSchema.CodeGeneration.TypeScript.Tests/PropertyNameTests.cs b/src/NJsonSchema.CodeGeneration.TypeScript.Tests/PropertyNameTests.cs index 5a3199fdf..307d3f7ce 100644 --- a/src/NJsonSchema.CodeGeneration.TypeScript.Tests/PropertyNameTests.cs +++ b/src/NJsonSchema.CodeGeneration.TypeScript.Tests/PropertyNameTests.cs @@ -1,14 +1,11 @@ using System.Threading.Tasks; -using NJsonSchema.Annotations; using NJsonSchema.NewtonsoftJson.Generation; -using VerifyXunit; using Xunit; using static NJsonSchema.CodeGeneration.TypeScript.Tests.VerifyHelper; namespace NJsonSchema.CodeGeneration.TypeScript.Tests; -[UsesVerify] public class PropertyNameTests { private class TypeWithRestrictedProperties diff --git a/src/NJsonSchema.CodeGeneration.TypeScript.Tests/TypeScriptDiscriminatorTests.cs b/src/NJsonSchema.CodeGeneration.TypeScript.Tests/TypeScriptDiscriminatorTests.cs index 52b598912..2831fe917 100644 --- a/src/NJsonSchema.CodeGeneration.TypeScript.Tests/TypeScriptDiscriminatorTests.cs +++ b/src/NJsonSchema.CodeGeneration.TypeScript.Tests/TypeScriptDiscriminatorTests.cs @@ -5,12 +5,10 @@ using Xunit; using NJsonSchema.NewtonsoftJson.Converters; using NJsonSchema.NewtonsoftJson.Generation; -using VerifyXunit; using Newtonsoft.Json.Converters; namespace NJsonSchema.CodeGeneration.TypeScript.Tests { - [UsesVerify] public class TypeScriptDiscriminatorTests { [JsonConverter(typeof(JsonInheritanceConverter), nameof(Type))] diff --git a/src/NJsonSchema.CodeGeneration.TypeScript.Tests/TypeScriptGeneratorTests.cs b/src/NJsonSchema.CodeGeneration.TypeScript.Tests/TypeScriptGeneratorTests.cs index 568a42dd4..8c32df628 100644 --- a/src/NJsonSchema.CodeGeneration.TypeScript.Tests/TypeScriptGeneratorTests.cs +++ b/src/NJsonSchema.CodeGeneration.TypeScript.Tests/TypeScriptGeneratorTests.cs @@ -1,5 +1,4 @@ -using System.Collections.Generic; -using NJsonSchema.CodeGeneration.TypeScript.Tests.Models; +using NJsonSchema.CodeGeneration.TypeScript.Tests.Models; using System.Linq; using System.Text.RegularExpressions; using System.Threading.Tasks; diff --git a/src/NJsonSchema.CodeGeneration/DefaultTemplateFactory.cs b/src/NJsonSchema.CodeGeneration/DefaultTemplateFactory.cs index 2fc559c63..9ded5c121 100644 --- a/src/NJsonSchema.CodeGeneration/DefaultTemplateFactory.cs +++ b/src/NJsonSchema.CodeGeneration/DefaultTemplateFactory.cs @@ -308,7 +308,7 @@ public LiquidParser() } private static ValueTask RenderTemplate( - List arguments, + IReadOnlyList arguments, TextWriter writer, TextEncoder encoder, TemplateContext context) diff --git a/src/NJsonSchema.NewtonsoftJson.Tests/NJsonSchema.NewtonsoftJson.Tests.csproj b/src/NJsonSchema.NewtonsoftJson.Tests/NJsonSchema.NewtonsoftJson.Tests.csproj index 2dc121392..76f205d3c 100644 --- a/src/NJsonSchema.NewtonsoftJson.Tests/NJsonSchema.NewtonsoftJson.Tests.csproj +++ b/src/NJsonSchema.NewtonsoftJson.Tests/NJsonSchema.NewtonsoftJson.Tests.csproj @@ -1,7 +1,7 @@ - net8.0;net462 + net8.0;net472 false false disable @@ -10,6 +10,8 @@ bin\Debug\$(TargetFramework)\NJsonSchema.Tests.xml $(NoWarn),618,1587,1998,1591 + + $(NoWarn),CA1707 @@ -21,8 +23,6 @@ - - diff --git a/src/NJsonSchema.Tests/Conversion/ArrayTypeToSchemaTests.cs b/src/NJsonSchema.Tests/Conversion/ArrayTypeToSchemaTests.cs index 84fb33726..e2ed89bda 100644 --- a/src/NJsonSchema.Tests/Conversion/ArrayTypeToSchemaTests.cs +++ b/src/NJsonSchema.Tests/Conversion/ArrayTypeToSchemaTests.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using System.Collections.ObjectModel; -using System.Linq; using System.Threading.Tasks; using Newtonsoft.Json; using NJsonSchema.NewtonsoftJson.Generation; diff --git a/src/NJsonSchema.Tests/Conversion/TypeToSchemaTests.cs b/src/NJsonSchema.Tests/Conversion/TypeToSchemaTests.cs index cfd0a2b05..5680300d8 100644 --- a/src/NJsonSchema.Tests/Conversion/TypeToSchemaTests.cs +++ b/src/NJsonSchema.Tests/Conversion/TypeToSchemaTests.cs @@ -1,12 +1,10 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; -using System.Linq; using System.Threading.Tasks; using Newtonsoft.Json; using Newtonsoft.Json.Converters; using Newtonsoft.Json.Linq; -using NJsonSchema.Generation; using NJsonSchema.NewtonsoftJson.Generation; using Xunit; diff --git a/src/NJsonSchema.Tests/Generation/AllowAdditionalPropertiesTests.cs b/src/NJsonSchema.Tests/Generation/AllowAdditionalPropertiesTests.cs index a43ef2b3c..db873cb9d 100644 --- a/src/NJsonSchema.Tests/Generation/AllowAdditionalPropertiesTests.cs +++ b/src/NJsonSchema.Tests/Generation/AllowAdditionalPropertiesTests.cs @@ -1,5 +1,4 @@ using System.Linq; -using NJsonSchema.Generation; using System.Collections.Generic; using Xunit; using NJsonSchema.NewtonsoftJson.Generation; diff --git a/src/NJsonSchema.Tests/Generation/ArrayGenerationTests.cs b/src/NJsonSchema.Tests/Generation/ArrayGenerationTests.cs index f14787aff..5faa0f813 100644 --- a/src/NJsonSchema.Tests/Generation/ArrayGenerationTests.cs +++ b/src/NJsonSchema.Tests/Generation/ArrayGenerationTests.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using System.Threading.Tasks; using Newtonsoft.Json.Linq; -using NJsonSchema.Generation; using NJsonSchema.NewtonsoftJson.Generation; using Xunit; diff --git a/src/NJsonSchema.Tests/Generation/ContractResolverTests.cs b/src/NJsonSchema.Tests/Generation/ContractResolverTests.cs index 4a811676d..602f2d127 100644 --- a/src/NJsonSchema.Tests/Generation/ContractResolverTests.cs +++ b/src/NJsonSchema.Tests/Generation/ContractResolverTests.cs @@ -1,6 +1,5 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -using NJsonSchema.Generation; using NJsonSchema.NewtonsoftJson.Generation; using System; using System.Collections; diff --git a/src/NJsonSchema.Tests/Generation/DataContractTests.cs b/src/NJsonSchema.Tests/Generation/DataContractTests.cs index 11ba49662..d5fd7a9a8 100644 --- a/src/NJsonSchema.Tests/Generation/DataContractTests.cs +++ b/src/NJsonSchema.Tests/Generation/DataContractTests.cs @@ -1,5 +1,4 @@ using Newtonsoft.Json; -using NJsonSchema.Generation; using NJsonSchema.NewtonsoftJson.Generation; using System.Runtime.Serialization; using Xunit; diff --git a/src/NJsonSchema.Tests/Generation/DictionaryTests.cs b/src/NJsonSchema.Tests/Generation/DictionaryTests.cs index b21a60a15..4a9560672 100644 --- a/src/NJsonSchema.Tests/Generation/DictionaryTests.cs +++ b/src/NJsonSchema.Tests/Generation/DictionaryTests.cs @@ -1,5 +1,4 @@ -using NJsonSchema.Generation; -using NJsonSchema.NewtonsoftJson.Generation; +using NJsonSchema.NewtonsoftJson.Generation; using System.Collections.Generic; using System.Threading.Tasks; using Xunit; diff --git a/src/NJsonSchema.Tests/Generation/EnumGenerationTests.cs b/src/NJsonSchema.Tests/Generation/EnumGenerationTests.cs index 25a89dca3..212c32fc8 100644 --- a/src/NJsonSchema.Tests/Generation/EnumGenerationTests.cs +++ b/src/NJsonSchema.Tests/Generation/EnumGenerationTests.cs @@ -4,7 +4,6 @@ using System.Threading.Tasks; using Newtonsoft.Json; using Newtonsoft.Json.Converters; -using NJsonSchema.Generation; using NJsonSchema.NewtonsoftJson.Generation; using Xunit; diff --git a/src/NJsonSchema.Tests/Generation/EnumTests.cs b/src/NJsonSchema.Tests/Generation/EnumTests.cs index f7c347f45..12682fcdb 100644 --- a/src/NJsonSchema.Tests/Generation/EnumTests.cs +++ b/src/NJsonSchema.Tests/Generation/EnumTests.cs @@ -4,7 +4,6 @@ using System.Threading.Tasks; using Newtonsoft.Json; using Newtonsoft.Json.Converters; -using NJsonSchema.Generation; using Xunit; using NJsonSchema.NewtonsoftJson.Generation; diff --git a/src/NJsonSchema.Tests/Generation/ExtensionDataGenerationTests.cs b/src/NJsonSchema.Tests/Generation/ExtensionDataGenerationTests.cs index 4a57b9762..77fe6b8fb 100644 --- a/src/NJsonSchema.Tests/Generation/ExtensionDataGenerationTests.cs +++ b/src/NJsonSchema.Tests/Generation/ExtensionDataGenerationTests.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using System.Threading.Tasks; using Newtonsoft.Json; -using NJsonSchema.Generation; using NJsonSchema.NewtonsoftJson.Generation; using Xunit; diff --git a/src/NJsonSchema.Tests/Generation/FlattenInheritanceHierarchyTests.cs b/src/NJsonSchema.Tests/Generation/FlattenInheritanceHierarchyTests.cs index 3755a0e10..9b623914c 100644 --- a/src/NJsonSchema.Tests/Generation/FlattenInheritanceHierarchyTests.cs +++ b/src/NJsonSchema.Tests/Generation/FlattenInheritanceHierarchyTests.cs @@ -2,7 +2,6 @@ using System.Threading.Tasks; using Newtonsoft.Json.Converters; using NJsonSchema.Annotations; -using NJsonSchema.Generation; using NJsonSchema.NewtonsoftJson.Generation; using Xunit; diff --git a/src/NJsonSchema.Tests/Generation/InheritanceTests.cs b/src/NJsonSchema.Tests/Generation/InheritanceTests.cs index ccd864336..144bca65d 100644 --- a/src/NJsonSchema.Tests/Generation/InheritanceTests.cs +++ b/src/NJsonSchema.Tests/Generation/InheritanceTests.cs @@ -4,7 +4,6 @@ using System.Runtime.Serialization; using System.Threading.Tasks; using Newtonsoft.Json; -using NJsonSchema.Generation; using NJsonSchema.Generation.SchemaProcessors; using NJsonSchema.NewtonsoftJson.Converters; using NJsonSchema.NewtonsoftJson.Generation; diff --git a/src/NJsonSchema.Tests/Generation/InterfaceTests.cs b/src/NJsonSchema.Tests/Generation/InterfaceTests.cs index 20f9a7041..fd459e663 100644 --- a/src/NJsonSchema.Tests/Generation/InterfaceTests.cs +++ b/src/NJsonSchema.Tests/Generation/InterfaceTests.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using System.Threading.Tasks; -using NJsonSchema.Generation; using NJsonSchema.NewtonsoftJson.Generation; using Xunit; diff --git a/src/NJsonSchema.Tests/Generation/JsonPropertyAttributeTests.cs b/src/NJsonSchema.Tests/Generation/JsonPropertyAttributeTests.cs index 79e96e08b..d07cd5d02 100644 --- a/src/NJsonSchema.Tests/Generation/JsonPropertyAttributeTests.cs +++ b/src/NJsonSchema.Tests/Generation/JsonPropertyAttributeTests.cs @@ -1,7 +1,6 @@ using System.Threading.Tasks; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -using NJsonSchema.Generation; using NJsonSchema.NewtonsoftJson.Generation; using Xunit; diff --git a/src/NJsonSchema.Tests/Generation/JsonSchemaExtensionDataAttributeGeneratorTests.cs b/src/NJsonSchema.Tests/Generation/JsonSchemaExtensionDataAttributeGeneratorTests.cs index a587b2f9b..ce8b05cbe 100644 --- a/src/NJsonSchema.Tests/Generation/JsonSchemaExtensionDataAttributeGeneratorTests.cs +++ b/src/NJsonSchema.Tests/Generation/JsonSchemaExtensionDataAttributeGeneratorTests.cs @@ -1,5 +1,4 @@ using NJsonSchema.Annotations; -using NJsonSchema.Generation; using NJsonSchema.NewtonsoftJson.Generation; using System; using System.Globalization; diff --git a/src/NJsonSchema.Tests/Generation/KnownTypeGenerationTests.cs b/src/NJsonSchema.Tests/Generation/KnownTypeGenerationTests.cs index be0ad8793..187af502d 100644 --- a/src/NJsonSchema.Tests/Generation/KnownTypeGenerationTests.cs +++ b/src/NJsonSchema.Tests/Generation/KnownTypeGenerationTests.cs @@ -1,6 +1,5 @@ using NJsonSchema.NewtonsoftJson.Generation; using System; -using System.Linq; using System.Runtime.Serialization; using System.Threading.Tasks; using Xunit; diff --git a/src/NJsonSchema.Tests/Generation/PrimitiveTypeGenerationTests.cs b/src/NJsonSchema.Tests/Generation/PrimitiveTypeGenerationTests.cs index a3f7b7f02..0d6d6b345 100644 --- a/src/NJsonSchema.Tests/Generation/PrimitiveTypeGenerationTests.cs +++ b/src/NJsonSchema.Tests/Generation/PrimitiveTypeGenerationTests.cs @@ -2,7 +2,6 @@ using System.ComponentModel.DataAnnotations; using System.Threading.Tasks; using Newtonsoft.Json; -using NJsonSchema.Annotations; using NJsonSchema.NewtonsoftJson.Generation; using NodaTime; using Xunit; diff --git a/src/NJsonSchema.Tests/Generation/PropertyNamesGenerationTests.cs b/src/NJsonSchema.Tests/Generation/PropertyNamesGenerationTests.cs index 623ca3e22..cf1e33a69 100644 --- a/src/NJsonSchema.Tests/Generation/PropertyNamesGenerationTests.cs +++ b/src/NJsonSchema.Tests/Generation/PropertyNamesGenerationTests.cs @@ -2,7 +2,6 @@ using System.Threading.Tasks; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -using NJsonSchema.Generation; using NJsonSchema.NewtonsoftJson.Generation; using Xunit; diff --git a/src/NJsonSchema.Tests/Generation/SampleJsonSchemaGeneratorTests.cs b/src/NJsonSchema.Tests/Generation/SampleJsonSchemaGeneratorTests.cs index 8b73760db..2053e3a4f 100644 --- a/src/NJsonSchema.Tests/Generation/SampleJsonSchemaGeneratorTests.cs +++ b/src/NJsonSchema.Tests/Generation/SampleJsonSchemaGeneratorTests.cs @@ -1,5 +1,4 @@ -using NJsonSchema.Annotations; -using Xunit; +using Xunit; namespace NJsonSchema.Tests.Generation { diff --git a/src/NJsonSchema.Tests/Generation/SchemaGenerationTests.cs b/src/NJsonSchema.Tests/Generation/SchemaGenerationTests.cs index 9dc899457..77957e7bc 100644 --- a/src/NJsonSchema.Tests/Generation/SchemaGenerationTests.cs +++ b/src/NJsonSchema.Tests/Generation/SchemaGenerationTests.cs @@ -1,5 +1,4 @@ -using NJsonSchema.Annotations; -using NJsonSchema.NewtonsoftJson.Generation; +using NJsonSchema.NewtonsoftJson.Generation; using System; using System.Collections.Generic; using System.ComponentModel; diff --git a/src/NJsonSchema.Tests/Generation/SchemaProcessorTests.cs b/src/NJsonSchema.Tests/Generation/SchemaProcessorTests.cs index a65ab8c2a..5511293c3 100644 --- a/src/NJsonSchema.Tests/Generation/SchemaProcessorTests.cs +++ b/src/NJsonSchema.Tests/Generation/SchemaProcessorTests.cs @@ -1,5 +1,4 @@ -using System.Threading.Tasks; -using NJsonSchema.Annotations; +using NJsonSchema.Annotations; using NJsonSchema.Generation; using NJsonSchema.NewtonsoftJson.Generation; using Xunit; diff --git a/src/NJsonSchema.Tests/Generation/TypeMapperTests.cs b/src/NJsonSchema.Tests/Generation/TypeMapperTests.cs index 2b96f332d..0cb09143a 100644 --- a/src/NJsonSchema.Tests/Generation/TypeMapperTests.cs +++ b/src/NJsonSchema.Tests/Generation/TypeMapperTests.cs @@ -1,6 +1,5 @@ using System; using System.Threading.Tasks; -using NJsonSchema.Generation; using NJsonSchema.Generation.TypeMappers; using NJsonSchema.NewtonsoftJson.Generation; using Xunit; diff --git a/src/NJsonSchema.Tests/Generation/XmlObjectTests.cs b/src/NJsonSchema.Tests/Generation/XmlObjectTests.cs index fbc4a014a..08419926f 100644 --- a/src/NJsonSchema.Tests/Generation/XmlObjectTests.cs +++ b/src/NJsonSchema.Tests/Generation/XmlObjectTests.cs @@ -1,5 +1,4 @@ using Newtonsoft.Json.Linq; -using NJsonSchema.Generation; using NJsonSchema.NewtonsoftJson.Generation; using System.Collections.Generic; using System.Linq; diff --git a/src/NJsonSchema.Tests/NJsonSchema.Tests.csproj b/src/NJsonSchema.Tests/NJsonSchema.Tests.csproj index f6a57c033..b5ddbded6 100644 --- a/src/NJsonSchema.Tests/NJsonSchema.Tests.csproj +++ b/src/NJsonSchema.Tests/NJsonSchema.Tests.csproj @@ -1,7 +1,7 @@ - net8.0;net462 + net8.0;net472 false false disable @@ -10,6 +10,8 @@ bin\Debug\$(TargetFramework)\NJsonSchema.Tests.xml $(NoWarn),618,1587,1998,1591 + + $(NoWarn),CA1707 @@ -21,8 +23,10 @@ - - + + + + diff --git a/src/NJsonSchema.Tests/Validation/CustomValidationTests.cs b/src/NJsonSchema.Tests/Validation/CustomValidationTests.cs index 2aa32cf9e..495375434 100644 --- a/src/NJsonSchema.Tests/Validation/CustomValidationTests.cs +++ b/src/NJsonSchema.Tests/Validation/CustomValidationTests.cs @@ -1,5 +1,4 @@ using Newtonsoft.Json.Linq; -using NJsonSchema.Annotations; using NJsonSchema.Validation; using NJsonSchema.Validation.FormatValidators; using System; diff --git a/src/NJsonSchema.Tests/Validation/FormatBase64Tests.cs b/src/NJsonSchema.Tests/Validation/FormatBase64Tests.cs index 3366829e2..78976a636 100644 --- a/src/NJsonSchema.Tests/Validation/FormatBase64Tests.cs +++ b/src/NJsonSchema.Tests/Validation/FormatBase64Tests.cs @@ -1,7 +1,6 @@ using System; using System.Linq; using Newtonsoft.Json.Linq; -using NJsonSchema.Annotations; using NJsonSchema.Validation; using Xunit; diff --git a/src/NJsonSchema.Tests/Validation/FormatDateTests.cs b/src/NJsonSchema.Tests/Validation/FormatDateTests.cs index 7ffd9d1bf..b7d7586ae 100644 --- a/src/NJsonSchema.Tests/Validation/FormatDateTests.cs +++ b/src/NJsonSchema.Tests/Validation/FormatDateTests.cs @@ -1,6 +1,5 @@ using System.Linq; using Newtonsoft.Json.Linq; -using NJsonSchema.Annotations; using NJsonSchema.Validation; using Xunit; diff --git a/src/NJsonSchema.Tests/Validation/FormatDateTimeTests.cs b/src/NJsonSchema.Tests/Validation/FormatDateTimeTests.cs index 894b9a25b..a8377c38e 100644 --- a/src/NJsonSchema.Tests/Validation/FormatDateTimeTests.cs +++ b/src/NJsonSchema.Tests/Validation/FormatDateTimeTests.cs @@ -1,6 +1,5 @@ using System.Linq; using Newtonsoft.Json.Linq; -using NJsonSchema.Annotations; using NJsonSchema.Validation; using Xunit; diff --git a/src/NJsonSchema.Tests/Validation/FormatEmailTests.cs b/src/NJsonSchema.Tests/Validation/FormatEmailTests.cs index 8082d19d1..1152a2976 100644 --- a/src/NJsonSchema.Tests/Validation/FormatEmailTests.cs +++ b/src/NJsonSchema.Tests/Validation/FormatEmailTests.cs @@ -1,6 +1,5 @@ using System.Linq; using Newtonsoft.Json.Linq; -using NJsonSchema.Annotations; using NJsonSchema.Validation; using Xunit; diff --git a/src/NJsonSchema.Tests/Validation/FormatGuidTests.cs b/src/NJsonSchema.Tests/Validation/FormatGuidTests.cs index ff22d0180..8e9067c2a 100644 --- a/src/NJsonSchema.Tests/Validation/FormatGuidTests.cs +++ b/src/NJsonSchema.Tests/Validation/FormatGuidTests.cs @@ -1,7 +1,6 @@ using System; using System.Linq; using Newtonsoft.Json.Linq; -using NJsonSchema.Annotations; using NJsonSchema.Validation; using Xunit; diff --git a/src/NJsonSchema.Tests/Validation/FormatHostnameTests.cs b/src/NJsonSchema.Tests/Validation/FormatHostnameTests.cs index 9f5fdbb9d..ec2bf8301 100644 --- a/src/NJsonSchema.Tests/Validation/FormatHostnameTests.cs +++ b/src/NJsonSchema.Tests/Validation/FormatHostnameTests.cs @@ -1,6 +1,5 @@ using System.Linq; using Newtonsoft.Json.Linq; -using NJsonSchema.Annotations; using NJsonSchema.Validation; using Xunit; diff --git a/src/NJsonSchema.Tests/Validation/FormatIpV4Tests.cs b/src/NJsonSchema.Tests/Validation/FormatIpV4Tests.cs index 6a764c371..c3070d032 100644 --- a/src/NJsonSchema.Tests/Validation/FormatIpV4Tests.cs +++ b/src/NJsonSchema.Tests/Validation/FormatIpV4Tests.cs @@ -1,6 +1,5 @@ using System.Linq; using Newtonsoft.Json.Linq; -using NJsonSchema.Annotations; using NJsonSchema.Validation; using Xunit; diff --git a/src/NJsonSchema.Tests/Validation/FormatIpV6Tests.cs b/src/NJsonSchema.Tests/Validation/FormatIpV6Tests.cs index 01e7a37e7..f143ab13e 100644 --- a/src/NJsonSchema.Tests/Validation/FormatIpV6Tests.cs +++ b/src/NJsonSchema.Tests/Validation/FormatIpV6Tests.cs @@ -1,6 +1,5 @@ using System.Linq; using Newtonsoft.Json.Linq; -using NJsonSchema.Annotations; using NJsonSchema.Validation; using Xunit; diff --git a/src/NJsonSchema.Tests/Validation/FormatTimeSpanTests.cs b/src/NJsonSchema.Tests/Validation/FormatTimeSpanTests.cs index 21cf64406..c6e1d43f4 100644 --- a/src/NJsonSchema.Tests/Validation/FormatTimeSpanTests.cs +++ b/src/NJsonSchema.Tests/Validation/FormatTimeSpanTests.cs @@ -1,6 +1,5 @@ using System.Linq; using Newtonsoft.Json.Linq; -using NJsonSchema.Annotations; using NJsonSchema.Validation; using Xunit; diff --git a/src/NJsonSchema.Tests/Validation/FormatTimeTests.cs b/src/NJsonSchema.Tests/Validation/FormatTimeTests.cs index f6741f00c..3e5c38412 100644 --- a/src/NJsonSchema.Tests/Validation/FormatTimeTests.cs +++ b/src/NJsonSchema.Tests/Validation/FormatTimeTests.cs @@ -1,6 +1,5 @@ using System.Linq; using Newtonsoft.Json.Linq; -using NJsonSchema.Annotations; using NJsonSchema.Validation; using Xunit; diff --git a/src/NJsonSchema.Tests/Validation/FormatUriTests.cs b/src/NJsonSchema.Tests/Validation/FormatUriTests.cs index 4e1d694b4..b3e056905 100644 --- a/src/NJsonSchema.Tests/Validation/FormatUriTests.cs +++ b/src/NJsonSchema.Tests/Validation/FormatUriTests.cs @@ -1,6 +1,5 @@ using System.Linq; using Newtonsoft.Json.Linq; -using NJsonSchema.Annotations; using NJsonSchema.Validation; using Xunit; diff --git a/src/NJsonSchema.Tests/Validation/FormatUuidTests.cs b/src/NJsonSchema.Tests/Validation/FormatUuidTests.cs index 11fd9116f..ae88bc9da 100644 --- a/src/NJsonSchema.Tests/Validation/FormatUuidTests.cs +++ b/src/NJsonSchema.Tests/Validation/FormatUuidTests.cs @@ -1,7 +1,6 @@ using System; using System.Linq; using Newtonsoft.Json.Linq; -using NJsonSchema.Annotations; using NJsonSchema.Validation; using Xunit; diff --git a/src/NJsonSchema.Tests/Validation/NullPropertyTests.cs b/src/NJsonSchema.Tests/Validation/NullPropertyTests.cs index 8505d28d9..7c1eb4631 100644 --- a/src/NJsonSchema.Tests/Validation/NullPropertyTests.cs +++ b/src/NJsonSchema.Tests/Validation/NullPropertyTests.cs @@ -1,4 +1,3 @@ -using NJsonSchema.Generation; using NJsonSchema.NewtonsoftJson.Generation; using System; using System.Threading.Tasks; diff --git a/src/NJsonSchema.Yaml.Tests/NJsonSchema.Yaml.Tests.csproj b/src/NJsonSchema.Yaml.Tests/NJsonSchema.Yaml.Tests.csproj index 1c0df7d85..80e3e24f5 100644 --- a/src/NJsonSchema.Yaml.Tests/NJsonSchema.Yaml.Tests.csproj +++ b/src/NJsonSchema.Yaml.Tests/NJsonSchema.Yaml.Tests.csproj @@ -1,18 +1,22 @@ - net8.0;net462 + net8.0;net472 false false disable + + + $(NoWarn),CA1707 + + - diff --git a/src/NJsonSchema.sln b/src/NJsonSchema.sln index 0f04d31e5..2763070c3 100644 --- a/src/NJsonSchema.sln +++ b/src/NJsonSchema.sln @@ -32,6 +32,7 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "00 Build", "00 Build", "{863B2D88-A0BD-4466-8583-AAD0B8D3F182}" ProjectSection(SolutionItems) = preProject ..\Directory.Build.props = ..\Directory.Build.props + ..\Directory.Packages.props = ..\Directory.Packages.props EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "_build", "..\build\_build.csproj", "{8E4E5A64-B5B7-4718-A92F-CB6B08512264}" diff --git a/src/NJsonSchema/Generation/JsonSchemaGeneratorSettings.cs b/src/NJsonSchema/Generation/JsonSchemaGeneratorSettings.cs index 12b270fa2..63519b068 100644 --- a/src/NJsonSchema/Generation/JsonSchemaGeneratorSettings.cs +++ b/src/NJsonSchema/Generation/JsonSchemaGeneratorSettings.cs @@ -64,7 +64,7 @@ public JsonSchemaGeneratorSettings(IReflectionService reflectionService) /// Gets or sets a value indicating whether to generate xmlObject representation for definitions (default: false). public bool GenerateXmlObjects { get; set; } - /// Gets or sets a value indicating whether to ignore properties with the . + /// Gets or sets a value indicating whether to ignore properties with the . public bool IgnoreObsoleteProperties { get; set; } /// Gets or sets a value indicating whether to use $ref references even if additional properties are diff --git a/src/NJsonSchema/NJsonSchema.csproj b/src/NJsonSchema/NJsonSchema.csproj index fce7d7ac3..b334b4535 100644 --- a/src/NJsonSchema/NJsonSchema.csproj +++ b/src/NJsonSchema/NJsonSchema.csproj @@ -17,7 +17,7 @@ - +