Fix .NET 8 things

Author: verdie-g

package-versions.props

@@ -4,7 +4,7 @@
     <CodeAnalysisFrozenVersion>4.1.0</CodeAnalysisFrozenVersion>
     <DemystifierFrozenVersion>0.4.1</DemystifierFrozenVersion>
     <HumanizerFrozenVersion>2.14.1</HumanizerFrozenVersion>
-    <SwashbuckleFrozenVersion>6.6.1</SwashbuckleFrozenVersion>
+    <SwashbuckleFrozenVersion>6.6.2</SwashbuckleFrozenVersion>
     <NewtonsoftJsonFrozenVersion>13.0.3</NewtonsoftJsonFrozenVersion>
 
     <!-- Non-published dependencies (these are safe to update, won't cause a breaking change) -->

test/OpenApiTests/ModelStateValidation/GeneratedSwagger/net8.0/swagger.g.json

@@ -405,6 +405,8 @@
             "nullable": true
           },
           "firstName": {
+            "maxLength": 20,
+            "minLength": 2,
             "type": "string",
             "nullable": true
           },
@@ -459,6 +461,8 @@
             "nullable": true
           },
           "tags": {
+            "maxItems": 10,
+            "minItems": 1,
             "type": "array",
             "items": {
               "type": "string"
@@ -508,6 +512,8 @@
             "nullable": true
           },
           "firstName": {
+            "maxLength": 20,
+            "minLength": 2,
             "type": "string",
             "nullable": true
           },
@@ -562,6 +568,8 @@
             "nullable": true
           },
           "tags": {
+            "maxItems": 10,
+            "minItems": 1,
             "type": "array",
             "items": {
               "type": "string"
@@ -608,6 +616,8 @@
             "nullable": true
           },
           "firstName": {
+            "maxLength": 20,
+            "minLength": 2,
             "type": "string",
             "nullable": true
           },
@@ -662,6 +672,8 @@
             "nullable": true
           },
           "tags": {
+            "maxItems": 10,
+            "minItems": 1,
             "type": "array",
             "items": {
               "type": "string"

test/OpenApiTests/ModelStateValidation/ModelStateValidationTests.cs

@@ -42,15 +42,19 @@ public async Task Guid_type_produces_expected_schema(string modelName)
 
     [Theory]
     [MemberData(nameof(ModelNames))]
-    public async Task Length_annotation_on_resource_property_produces_expected_schema(string modelName)
+    public async Task Length_annotation_on_resource_string_property_produces_expected_schema(string modelName)
     {
         // Act
         JsonElement document = await _testContext.GetSwaggerDocumentAsync();
 
         // Assert
-        document.Should().ContainPath($"components.schemas.{modelName}.properties.firstName").With(firstName =>
+        document.Should().ContainPath($"components.schemas.{modelName}.properties.firstName").With(firstNameElement =>
         {
-            firstName.Should().HaveProperty("type", "string");
+#if !NET6_0
+            firstNameElement.Should().HaveProperty("maxLength", 20);
+            firstNameElement.Should().HaveProperty("minLength", 2);
+#endif
+            firstNameElement.Should().HaveProperty("type", "string");
         });
     }
 
@@ -224,14 +228,18 @@ public async Task Uri_type_produces_expected_schema(string modelName)
 
     [Theory]
     [MemberData(nameof(ModelNames))]
-    public async Task HashSet_type_produces_expected_schema(string modelName)
+    public async Task Length_annotation_on_resource_list_property_produces_expected_schema(string modelName)
     {
         // Act
         JsonElement document = await _testContext.GetSwaggerDocumentAsync();
 
         // Assert
         document.Should().ContainPath($"components.schemas.{modelName}.properties.tags").With(tagsElement =>
         {
+#if !NET6_0
+            tagsElement.Should().HaveProperty("maxItems", 10);
+            tagsElement.Should().HaveProperty("minItems", 1);
+#endif
             tagsElement.Should().HaveProperty("type", "array");
             tagsElement.Should().ContainPath("items").With(itemsEl =>
             {
@@ -242,7 +250,21 @@ public async Task HashSet_type_produces_expected_schema(string modelName)
 
     [Theory]
     [MemberData(nameof(ModelNames))]
-    public async Task Allowed_denied_annotations_on_resource_property_produces_expected_schema(string modelName)
+    public async Task AllowedValues_annotation_on_resource_list_property_produces_expected_schema(string modelName)
+    {
+        // Act
+        JsonElement document = await _testContext.GetSwaggerDocumentAsync();
+
+        // Assert
+        document.Should().ContainPath($"components.schemas.{modelName}.properties.countryCode").With(countryCodeElement =>
+        {
+            countryCodeElement.Should().HaveProperty("type", "string");
+        });
+    }
+
+    [Theory]
+    [MemberData(nameof(ModelNames))]
+    public async Task DeniedValues_annotation_on_resource_property_produces_expected_schema(string modelName)
     {
         // Act
         JsonElement document = await _testContext.GetSwaggerDocumentAsync();