diff --git a/.azuredevops/azure-pipelines.yml b/.azuredevops/azure-pipelines.yml
index 2834c35..0648071 100644
--- a/.azuredevops/azure-pipelines.yml
+++ b/.azuredevops/azure-pipelines.yml
@@ -20,7 +20,7 @@ resources:
 extends:
   template: '.azuredevops/.NET/NuGet.yml@GodelTech'
   parameters:
-    dotNetSDKVersions: [ '6.0.x', '7.0.x', '8.0.x' ]
+    dotNetSDKVersions: [ '6.0.x', '8.0.x', '9.0.x' ]
     mutationTestingProjects:
     - displayName: 'GodelTech.Microservices.Swagger'
       folderPath: '/src/GodelTech.Microservices.Swagger'
diff --git a/.gitignore b/.gitignore
index dfcfd56..b67693e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -348,3 +348,6 @@ MigrationBackup/
 
 # Ionide (cross platform F# VS Code tools) working folder
 .ionide/
+
+# Rider
+.idea/
\ No newline at end of file
diff --git a/demo/GodelTech.Microservices.Swagger.Demo/GodelTech.Microservices.Swagger.Demo.csproj b/demo/GodelTech.Microservices.Swagger.Demo/GodelTech.Microservices.Swagger.Demo.csproj
index 7f00074..ed91253 100644
--- a/demo/GodelTech.Microservices.Swagger.Demo/GodelTech.Microservices.Swagger.Demo.csproj
+++ b/demo/GodelTech.Microservices.Swagger.Demo/GodelTech.Microservices.Swagger.Demo.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
 
     <AssemblyVersion>1.2.3.4567</AssemblyVersion>
 
@@ -21,14 +21,14 @@
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.31" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.20" />
-  </ItemGroup>
-
   <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.6" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\src\GodelTech.Microservices.Swagger\GodelTech.Microservices.Swagger.csproj" />
   </ItemGroup>
diff --git a/src/GodelTech.Microservices.Swagger/.editorconfig b/src/GodelTech.Microservices.Swagger/.editorconfig
index 0b76c42..9599abe 100644
--- a/src/GodelTech.Microservices.Swagger/.editorconfig
+++ b/src/GodelTech.Microservices.Swagger/.editorconfig
@@ -5,3 +5,6 @@ csharp_style_namespace_declarations = block_scoped
 
 # IDE0074: Use compound assignment
 dotnet_diagnostic.IDE0074.severity = none
+
+# IDE0028: Simplify collection initialization
+dotnet_diagnostic.IDE0028.severity = none
\ No newline at end of file
diff --git a/src/GodelTech.Microservices.Swagger/GodelTech.Microservices.Swagger.csproj b/src/GodelTech.Microservices.Swagger/GodelTech.Microservices.Swagger.csproj
index f406077..8ec2b24 100644
--- a/src/GodelTech.Microservices.Swagger/GodelTech.Microservices.Swagger.csproj
+++ b/src/GodelTech.Microservices.Swagger/GodelTech.Microservices.Swagger.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
     <PackageId>GodelTech.Microservices.Swagger</PackageId>
     <VersionPrefix>2.0.0</VersionPrefix>
     <Authors>Andrei Salanoi;Vladimir Rodchenko;Andrei Yaskevich</Authors>
diff --git a/test/GodelTech.Microservices.Swagger.IntegrationTests/.editorconfig b/test/GodelTech.Microservices.Swagger.IntegrationTests/.editorconfig
index ebf6a68..c26ce1e 100644
--- a/test/GodelTech.Microservices.Swagger.IntegrationTests/.editorconfig
+++ b/test/GodelTech.Microservices.Swagger.IntegrationTests/.editorconfig
@@ -8,3 +8,6 @@ dotnet_diagnostic.CA1014.severity = none
 
 # CA1707: Identifiers should not contain underscores
 dotnet_diagnostic.CA1707.severity = none
+
+# CA1515: Consider making public types internal
+dotnet_diagnostic.CA1515.severity = none
\ No newline at end of file
diff --git a/test/GodelTech.Microservices.Swagger.IntegrationTests/GodelTech.Microservices.Swagger.IntegrationTests.csproj b/test/GodelTech.Microservices.Swagger.IntegrationTests/GodelTech.Microservices.Swagger.IntegrationTests.csproj
index a04aa3b..91d46d2 100644
--- a/test/GodelTech.Microservices.Swagger.IntegrationTests/GodelTech.Microservices.Swagger.IntegrationTests.csproj
+++ b/test/GodelTech.Microservices.Swagger.IntegrationTests/GodelTech.Microservices.Swagger.IntegrationTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
 
     <IsPackable>false</IsPackable>
 
@@ -15,14 +15,14 @@
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.31" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.20" />
-  </ItemGroup>
-
   <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.6" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="coverlet.collector" Version="6.0.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/test/GodelTech.Microservices.Swagger.Tests/.editorconfig b/test/GodelTech.Microservices.Swagger.Tests/.editorconfig
index 4c35c57..ef20aa0 100644
--- a/test/GodelTech.Microservices.Swagger.Tests/.editorconfig
+++ b/test/GodelTech.Microservices.Swagger.Tests/.editorconfig
@@ -8,3 +8,6 @@ dotnet_diagnostic.CA1707.severity = none
 
 # CA1861: Avoid constant arrays as arguments
 dotnet_diagnostic.CA1861.severity = none
+
+# CA1515: Consider making public types internal
+dotnet_diagnostic.CA1515.severity = none
\ No newline at end of file
diff --git a/test/GodelTech.Microservices.Swagger.Tests/GodelTech.Microservices.Swagger.Tests.csproj b/test/GodelTech.Microservices.Swagger.Tests/GodelTech.Microservices.Swagger.Tests.csproj
index e088dc4..f1ea5e8 100644
--- a/test/GodelTech.Microservices.Swagger.Tests/GodelTech.Microservices.Swagger.Tests.csproj
+++ b/test/GodelTech.Microservices.Swagger.Tests/GodelTech.Microservices.Swagger.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
 
     <IsPackable>false</IsPackable>