diff --git a/Directory.Build.props b/Directory.Build.props index 2d9797109..06796bc37 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -47,41 +47,15 @@ latest-Recommended true - $(NoWarn);IDE0005;IDE0008;IDE0017;IDE0021;IDE0022;IDE0029;IDE0032;IDE0039;IDE0045;IDE0046;IDE0056;IDE0057;IDE0060;IDE0090;IDE0130;IDE0160;IDE0200;IDE0270;IDE0290;IDE0330 - $(NoWarn);CA1200;CA1510;CA1514;CA1710;CA1716;CA1720;CA1725;CA1845;CA1870;CA2263;SYSLIB0012 + $(NoWarn);CA1200;CA1510;CA1716;CA1720;CA1725;CA1845;SYSLIB0012 diff --git a/src/NSwag.CodeGeneration.CSharp.Tests/ControllerGenerationFormatTests.cs b/src/NSwag.CodeGeneration.CSharp.Tests/ControllerGenerationFormatTests.cs index f4f5fb396..8a9d311c9 100644 --- a/src/NSwag.CodeGeneration.CSharp.Tests/ControllerGenerationFormatTests.cs +++ b/src/NSwag.CodeGeneration.CSharp.Tests/ControllerGenerationFormatTests.cs @@ -267,7 +267,7 @@ private static OpenApiDocument GetOpenApiDocument() complexTypeReponseSchema.Properties["Prop3"] = new JsonSchemaProperty { Type = JsonObjectType.Boolean, IsRequired = true }; complexTypeReponseSchema.Properties["Prop4"] = new JsonSchemaProperty { Type = JsonObjectType.Object, Reference = complexTypeSchema, IsRequired = true }; - var typeString = NewtonsoftJsonSchemaGenerator.FromType(typeof(string)); + var typeString = NewtonsoftJsonSchemaGenerator.FromType(); var document = new OpenApiDocument(); document.Paths["Foo"] = new OpenApiPathItem diff --git a/src/NSwag.CodeGeneration/OperationNameGenerators/MultipleClientsFromOperationIdOperationNameGenerator.cs b/src/NSwag.CodeGeneration/OperationNameGenerators/MultipleClientsFromOperationIdOperationNameGenerator.cs index acb555941..373d1ee48 100644 --- a/src/NSwag.CodeGeneration/OperationNameGenerators/MultipleClientsFromOperationIdOperationNameGenerator.cs +++ b/src/NSwag.CodeGeneration/OperationNameGenerators/MultipleClientsFromOperationIdOperationNameGenerator.cs @@ -99,7 +99,7 @@ private static ReadOnlySpan GetClientName(OpenApiOperation operation) operationIdSpan = operationIdSpan.Slice(0, idxLast); int idxSecondLast = operationIdSpan.LastIndexOf(underscoreSeparator); - return operationIdSpan.Slice(idxSecondLast + 1, operationIdSpan.Length - idxSecondLast - 1); + return operationIdSpan.Slice(idxSecondLast + 1); } private static ReadOnlySpan GetOperationName(OpenApiOperation operation) diff --git a/src/NSwag.Commands/Commands/InputOutputCommandBase.cs b/src/NSwag.Commands/Commands/InputOutputCommandBase.cs index 7caba1eb1..66d832f49 100644 --- a/src/NSwag.Commands/Commands/InputOutputCommandBase.cs +++ b/src/NSwag.Commands/Commands/InputOutputCommandBase.cs @@ -56,7 +56,9 @@ protected async Task GetInputSwaggerDocument() if (ServiceSchemes != null && ServiceSchemes.Length > 0) { - document.Schemes = ServiceSchemes.Select(s => (OpenApiSchema)Enum.Parse(typeof(OpenApiSchema), s, true)).ToList(); +#pragma warning disable CA2263 + document.Schemes = ServiceSchemes.Select(s => (OpenApiSchema) Enum.Parse(typeof(OpenApiSchema), s, ignoreCase: true)).ToList(); +#pragma warning restore CA2263 } } diff --git a/src/NSwag.Core/OpenApiCallback.cs b/src/NSwag.Core/OpenApiCallback.cs index bd1a1ad0f..44ede1afd 100644 --- a/src/NSwag.Core/OpenApiCallback.cs +++ b/src/NSwag.Core/OpenApiCallback.cs @@ -13,7 +13,9 @@ namespace NSwag { /// Describes an OpenAPI callback. +#pragma warning disable CA1710 public class OpenApiCallback : JsonReferenceBase, IJsonReference, IDictionary +#pragma warning restore CA1710 { #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member diff --git a/src/NSwag.Core/OpenApiPathItem.cs b/src/NSwag.Core/OpenApiPathItem.cs index d74ef60bc..b036b2f61 100644 --- a/src/NSwag.Core/OpenApiPathItem.cs +++ b/src/NSwag.Core/OpenApiPathItem.cs @@ -165,19 +165,19 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist if (propertyName == "summary") { - operations.Summary = (string)serializer.Deserialize(reader, typeof(string)); + operations.Summary = serializer.Deserialize(reader); } else if (propertyName == "description") { - operations.Description = (string)serializer.Deserialize(reader, typeof(string)); + operations.Description = serializer.Deserialize(reader); } else if (propertyName == "parameters") { - operations.Parameters = (Collection)serializer.Deserialize(reader, typeof(Collection)); + operations.Parameters = serializer.Deserialize>(reader); } else if (propertyName == "servers") { - operations.Servers = (Collection)serializer.Deserialize(reader, typeof(Collection)); + operations.Servers = serializer.Deserialize>(reader); } else if (propertyName.StartsWith("x-", StringComparison.OrdinalIgnoreCase)) { @@ -191,7 +191,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist } else { - var value = (OpenApiOperation)serializer.Deserialize(reader, typeof(OpenApiOperation)); + var value = serializer.Deserialize(reader); operations.Add(propertyName, value); } }