EES-5366 Updating Swashbuckle.AspNetCore

dfe-analytical-services · Aug 1, 2024 · 76e56c5 · 76e56c5
1 parent 536731b
commit 76e56c5
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 9 deletions.
diff --git a/....ExploreEducationStatistics.Admin/GovUk.Education.ExploreEducationStatistics.Admin.csproj b/....ExploreEducationStatistics.Admin/GovUk.Education.ExploreEducationStatistics.Admin.csproj
@@ -43,7 +43,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="8.0.4" />
     <PackageReference Include="NWebsec.AspNetCore.Middleware" Version="3.0.0" />
     <PackageReference Include="System.Linq.Async" Version="6.0.1" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
     <PackageReference Include="Thinktecture.EntityFrameworkCore.SqlServer" Version="8.1.1" />
     <PackageReference Include="Cronos" Version="0.8.4" />
     <PackageReference Include="Microsoft.Identity.Web" Version="2.18.1" />

diff --git a/...ationStatistics.Content.Api/GovUk.Education.ExploreEducationStatistics.Content.Api.csproj b/...ationStatistics.Content.Api/GovUk.Education.ExploreEducationStatistics.Content.Api.csproj
@@ -20,7 +20,7 @@
         <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="8.0.4" />
         <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.4" />
         <PackageReference Include="NWebsec.AspNetCore.Middleware" Version="3.0.0" />
-        <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
+        <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/...reEducationStatistics.Data.Api/GovUk.Education.ExploreEducationStatistics.Data.Api.csproj b/...reEducationStatistics.Data.Api/GovUk.Education.ExploreEducationStatistics.Data.Api.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
@@ -24,7 +24,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.4" />
     <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="8.0.4" />
     <PackageReference Include="NWebsec.AspNetCore.Middleware" Version="3.0.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
     <PackageReference Include="Thinktecture.EntityFrameworkCore.SqlServer" Version="8.1.1" />
   </ItemGroup>
 

diff --git a/...oreEducationStatistics.Public.Data.Api.Tests/Swagger/RequiredPropertySchemaFilterTests.cs b/...oreEducationStatistics.Public.Data.Api.Tests/Swagger/RequiredPropertySchemaFilterTests.cs
@@ -15,6 +15,7 @@ public class RequiredPropertySchemaFilterTests
         {
             UseAllOfToExtendReferenceSchemas = true,
             SchemaFilters = [new RequiredPropertySchemaFilter()],
+            SupportNonNullableReferenceTypes = true
         },
         new JsonSerializerDataContractResolver(new JsonSerializerOptions
         {
@@ -45,12 +46,22 @@ public void SomeRequiredPropertiesMarkedAsRequired()
     }
 
     [Fact]
-    public void RequiredNonNullableReferenceTypeMarkedAsRequired()
+    public void RequiredReferenceTypePropertiesMarkedAsRequired()
     {
         var schema = GenerateSchema<TestClassReferenceTypes>();
 
-        Assert.Single(schema.Required);
+        Assert.Equal(2, schema.Required.Count);
         Assert.Contains(nameof(TestClassReferenceTypes.RequiredNonNullable).ToLowerFirst(), schema.Required);
+        Assert.Contains(nameof(TestClassReferenceTypes.RequiredNullable).ToLowerFirst(), schema.Required);
+    }
+
+    [Fact]
+    public void RequiredNullableReferenceTypeMarkedAsNullable()
+    {
+        var schema = GenerateSchema<TestClassReferenceTypes>();
+
+        Assert.True(schema.Properties[nameof(TestClassReferenceTypes.RequiredNullable).ToLowerFirst()].Nullable);
+        Assert.False(schema.Properties[nameof(TestClassReferenceTypes.RequiredNonNullable).ToLowerFirst()].Nullable);
     }
 
     [Fact]

diff --git a/...tistics.Public.Data.Api/GovUk.Education.ExploreEducationStatistics.Public.Data.Api.csproj b/...tistics.Public.Data.Api/GovUk.Education.ExploreEducationStatistics.Public.Data.Api.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
         <TargetFramework>net8.0</TargetFramework>
@@ -39,8 +39,8 @@
         <PackageReference Include="MiniProfiler.EntityFrameworkCore" Version="4.3.8" />
         <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.2" />
         <PackageReference Include="NWebsec.AspNetCore.Middleware" Version="3.0.0" />
-        <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
-        <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />
+        <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
+        <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.6.2" />
     </ItemGroup>
 
     <ItemGroup>