diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b0dc76c..f4d3dc0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -6,7 +6,7 @@ on:
 
 env:
   BuildConfiguration: Release
-  BuildVersion: 2.21.0.${{ github.run_number }}
+  BuildVersion: 2.22.0.${{ github.run_number }}
 
 jobs:
   build:
diff --git a/History.md b/History.md
index 88bf12e..fc49b7c 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,6 @@
+### 2.22.0 ###
+- ReSharper and Rider 2024.1 support
+
 ### 2.21.0 ###
 - ReSharper and Rider 2023.3 support
 
diff --git a/Src/RiderPlugin/settings.gradle b/Src/RiderPlugin/settings.gradle
index b995703..4ba929a 100644
--- a/Src/RiderPlugin/settings.gradle
+++ b/Src/RiderPlugin/settings.gradle
@@ -1,4 +1,4 @@
 rootProject.name = 'rider-XmlDocInspections'
 gradle.ext.resharperPluginProjectName = 'XmlDocInspections.Plugin'
-gradle.ext.productVersion = '2023.3' // https://www.jetbrains.com/intellij-repository/releases
-gradle.ext.reSharperVersionIdentifier = 'RD20233'
+gradle.ext.productVersion = '2024.1-SNAPSHOT' // https://www.jetbrains.com/intellij-repository/releases
+gradle.ext.reSharperVersionIdentifier = 'RD20241'
diff --git a/Src/XmlDocInspections.Plugin.Tests/XmlDocInspections.Plugin.Tests.RD20233.csproj b/Src/XmlDocInspections.Plugin.Tests/XmlDocInspections.Plugin.Tests.RD20241.csproj
similarity index 96%
rename from Src/XmlDocInspections.Plugin.Tests/XmlDocInspections.Plugin.Tests.RD20233.csproj
rename to Src/XmlDocInspections.Plugin.Tests/XmlDocInspections.Plugin.Tests.RD20241.csproj
index 5c27fc3..ae13b96 100644
--- a/Src/XmlDocInspections.Plugin.Tests/XmlDocInspections.Plugin.Tests.RD20233.csproj
+++ b/Src/XmlDocInspections.Plugin.Tests/XmlDocInspections.Plugin.Tests.RD20241.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\XmlDocInspections.Plugin\XmlDocInspections.Plugin.RD20233.csproj" />
+    <ProjectReference Include="..\XmlDocInspections.Plugin\XmlDocInspections.Plugin.RD20241.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Src/XmlDocInspections.Plugin.Tests/XmlDocInspections.Plugin.Tests.RS20233.csproj b/Src/XmlDocInspections.Plugin.Tests/XmlDocInspections.Plugin.Tests.RS20241.csproj
similarity index 96%
rename from Src/XmlDocInspections.Plugin.Tests/XmlDocInspections.Plugin.Tests.RS20233.csproj
rename to Src/XmlDocInspections.Plugin.Tests/XmlDocInspections.Plugin.Tests.RS20241.csproj
index 37df702..cd79622 100644
--- a/Src/XmlDocInspections.Plugin.Tests/XmlDocInspections.Plugin.Tests.RS20233.csproj
+++ b/Src/XmlDocInspections.Plugin.Tests/XmlDocInspections.Plugin.Tests.RS20241.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\XmlDocInspections.Plugin\XmlDocInspections.Plugin.RS20233.csproj" />
+    <ProjectReference Include="..\XmlDocInspections.Plugin\XmlDocInspections.Plugin.RS20241.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Src/XmlDocInspections.Plugin/XmlDocInspections.Plugin.RD20233.csproj b/Src/XmlDocInspections.Plugin/XmlDocInspections.Plugin.RD20241.csproj
similarity index 100%
rename from Src/XmlDocInspections.Plugin/XmlDocInspections.Plugin.RD20233.csproj
rename to Src/XmlDocInspections.Plugin/XmlDocInspections.Plugin.RD20241.csproj
diff --git a/Src/XmlDocInspections.Plugin/XmlDocInspections.Plugin.RS20233.csproj b/Src/XmlDocInspections.Plugin/XmlDocInspections.Plugin.RS20241.csproj
similarity index 100%
rename from Src/XmlDocInspections.Plugin/XmlDocInspections.Plugin.RS20233.csproj
rename to Src/XmlDocInspections.Plugin/XmlDocInspections.Plugin.RS20241.csproj
diff --git a/XmlDocInspections.sln b/XmlDocInspections.sln
index 55e21b2..91548d0 100644
--- a/XmlDocInspections.sln
+++ b/XmlDocInspections.sln
@@ -9,13 +9,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SolutionItems", "SolutionIt
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XmlDocInspections.Sample", "Src\XmlDocInspections.Plugin.Tests\test\data\XmlDocInspections.Sample.csproj", "{4AF4FFEC-2FAC-426A-B8B2-06F4D9F52392}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XmlDocInspections.Plugin.RS20233", "Src\XmlDocInspections.Plugin\XmlDocInspections.Plugin.RS20233.csproj", "{B911381A-0D32-4D8C-A47A-D1E684FD7589}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XmlDocInspections.Plugin.RS20241", "Src\XmlDocInspections.Plugin\XmlDocInspections.Plugin.RS20241.csproj", "{B911381A-0D32-4D8C-A47A-D1E684FD7589}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XmlDocInspections.Plugin.Tests.RS20233", "Src\XmlDocInspections.Plugin.Tests\XmlDocInspections.Plugin.Tests.RS20233.csproj", "{E3DD348A-4F6B-4660-9D3F-18BFC5F2FDB1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XmlDocInspections.Plugin.Tests.RS20241", "Src\XmlDocInspections.Plugin.Tests\XmlDocInspections.Plugin.Tests.RS20241.csproj", "{E3DD348A-4F6B-4660-9D3F-18BFC5F2FDB1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XmlDocInspections.Plugin.RD20233", "Src\XmlDocInspections.Plugin\XmlDocInspections.Plugin.RD20233.csproj", "{68FD44BA-7BD7-432C-B70F-8EA851A4FD06}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XmlDocInspections.Plugin.RD20241", "Src\XmlDocInspections.Plugin\XmlDocInspections.Plugin.RD20241.csproj", "{68FD44BA-7BD7-432C-B70F-8EA851A4FD06}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XmlDocInspections.Plugin.Tests.RD20233", "Src\XmlDocInspections.Plugin.Tests\XmlDocInspections.Plugin.Tests.RD20233.csproj", "{F0AC23E0-5905-4A51-8FCE-96F87D8CF8B3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XmlDocInspections.Plugin.Tests.RD20241", "Src\XmlDocInspections.Plugin.Tests\XmlDocInspections.Plugin.Tests.RD20241.csproj", "{F0AC23E0-5905-4A51-8FCE-96F87D8CF8B3}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XmlDocInspections.Sample.AspNetCore", "Src\XmlDocInspections.Plugin.Tests\test\data\Special\AspNetCore\XmlDocInspections.Sample.AspNetCore.csproj", "{83BBF7BC-8BBA-4C4F-8143-DD3D7CDE68B1}"
 EndProject