diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b6c7fc3..e90b5ad 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -6,7 +6,7 @@ on:
 
 env:
   BuildConfiguration: Release
-  BuildVersion: 1.19.0.${{ github.run_number }}
+  BuildVersion: 1.20.0.${{ github.run_number }}
 
 jobs:
   build:
@@ -20,7 +20,12 @@ jobs:
           submodules: true
 
       - name: Run Build.ps1
-        run: ./Build/Build.ps1 -Configuration ${{ env.BuildConfiguration }} -Version "${{ env.BuildVersion }}" -BranchName "${{ github.ref_name }}" -CoverageBadgeUploadToken ${{ secrets.COVERAGE_BADGE_UPLOAD_TOKEN }}
+        run: >
+          ./Build/Build.ps1
+          -Configuration "${{ env.BuildConfiguration }}"
+          -Version "${{ env.BuildVersion }}"
+          -BranchName "${{ github.ref_name }}"
+          -CoverageBadgeUploadToken "${{ secrets.COVERAGE_BADGE_UPLOAD_TOKEN }}"
 
       - name: Upload Packages artifacts
         uses: actions/upload-artifact@v3
diff --git a/History.md b/History.md
index 4dc5c5a..cad4030 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,6 @@
+### 1.20.0 ###
+- ReSharper and Rider 2023.3 support
+
 ### 1.19.0 ###
 - ReSharper and Rider 2023.2 support
 - Add missing 'displayName' for options page in Rider plugin metadata
diff --git a/Roflcopter.sln b/Roflcopter.sln
index cfe82b0..bcb0462 100644
--- a/Roflcopter.sln
+++ b/Roflcopter.sln
@@ -7,15 +7,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Src", "Src", "{26B55A35-CCB
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SolutionItems", "SolutionItems.csproj", "{6ADCE94D-EF87-42F6-A68B-69DA6FD90DE6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Roflcopter.Plugin.RS20232", "Src\Roflcopter.Plugin\Roflcopter.Plugin.RS20232.csproj", "{9E2BBE59-1972-45B2-836B-802479CFEB6D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Roflcopter.Plugin.RS20233", "Src\Roflcopter.Plugin\Roflcopter.Plugin.RS20233.csproj", "{9E2BBE59-1972-45B2-836B-802479CFEB6D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Roflcopter.Plugin.Tests.RS20232", "Src\Roflcopter.Plugin.Tests\Roflcopter.Plugin.Tests.RS20232.csproj", "{6AFE9FA3-33A0-43B2-9C04-05A4C6A57A2D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Roflcopter.Plugin.Tests.RS20233", "Src\Roflcopter.Plugin.Tests\Roflcopter.Plugin.Tests.RS20233.csproj", "{6AFE9FA3-33A0-43B2-9C04-05A4C6A57A2D}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Roflcopter.Sample", "Src\Roflcopter.Plugin.Tests\test\data\Roflcopter.Sample.csproj", "{DA8C3190-009E-430B-95B5-7AFF7AA0A55F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Roflcopter.Plugin.RD20232", "Src\Roflcopter.Plugin\Roflcopter.Plugin.RD20232.csproj", "{B81B447C-A4D0-419A-BD44-8D8836272C3D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Roflcopter.Plugin.RD20233", "Src\Roflcopter.Plugin\Roflcopter.Plugin.RD20233.csproj", "{B81B447C-A4D0-419A-BD44-8D8836272C3D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Roflcopter.Plugin.Tests.RD20232", "Src\Roflcopter.Plugin.Tests\Roflcopter.Plugin.Tests.RD20232.csproj", "{E8FBF9D8-FDD3-4755-85D6-351600B6DB49}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Roflcopter.Plugin.Tests.RD20233", "Src\Roflcopter.Plugin.Tests\Roflcopter.Plugin.Tests.RD20233.csproj", "{E8FBF9D8-FDD3-4755-85D6-351600B6DB49}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Shared b/Shared
index 53a1c90..2cd5ec0 160000
--- a/Shared
+++ b/Shared
@@ -1 +1 @@
-Subproject commit 53a1c90e2c78eb0359f1c443037c90a7a625ff97
+Subproject commit 2cd5ec0b5fe7cbc63b384bfff7d939a555c5045d
diff --git a/Src/RiderPlugin/settings.gradle b/Src/RiderPlugin/settings.gradle
index 7cea286..fe972c3 100644
--- a/Src/RiderPlugin/settings.gradle
+++ b/Src/RiderPlugin/settings.gradle
@@ -1,4 +1,4 @@
 rootProject.name = 'rider-Roflcopter'
 gradle.ext.resharperPluginProjectName = 'Roflcopter.Plugin'
-gradle.ext.productVersion = '2023.2' // https://www.jetbrains.com/intellij-repository/releases
-gradle.ext.reSharperVersionIdentifier = 'RD20232'
+gradle.ext.productVersion = '2023.3-SNAPSHOT' // https://www.jetbrains.com/intellij-repository/releases
+gradle.ext.reSharperVersionIdentifier = 'RD20233'
diff --git a/Src/Roflcopter.Plugin.Tests/AssertionMessages/InvalidAssertionMessageHighlightingTests.cs b/Src/Roflcopter.Plugin.Tests/AssertionMessages/InvalidAssertionMessageHighlightingTests.cs
index 12b1eb4..31d7cd2 100644
--- a/Src/Roflcopter.Plugin.Tests/AssertionMessages/InvalidAssertionMessageHighlightingTests.cs
+++ b/Src/Roflcopter.Plugin.Tests/AssertionMessages/InvalidAssertionMessageHighlightingTests.cs
@@ -6,7 +6,6 @@
 namespace Roflcopter.Plugin.Tests.AssertionMessages
 {
     [TestFixture]
-    [TestNetFramework46]
     public class InvalidAssertionMessageHighlightingTests : CSharpHighlightingTestBase
     {
         [Test]
diff --git a/Src/Roflcopter.Plugin.Tests/Macros/GetBranchNameMacroImplementationTest.cs b/Src/Roflcopter.Plugin.Tests/Macros/GetBranchNameMacroImplementationTest.cs
index d94ca83..e5ed639 100644
--- a/Src/Roflcopter.Plugin.Tests/Macros/GetBranchNameMacroImplementationTest.cs
+++ b/Src/Roflcopter.Plugin.Tests/Macros/GetBranchNameMacroImplementationTest.cs
@@ -12,7 +12,7 @@
 namespace Roflcopter.Plugin.Tests.Macros
 {
     [TestFixture]
-    [TestNetFramework46]
+    [TestNet60]
     public class GetBranchNameMacroImplementationTest : MacroImplTestBase
     {
         private GitRepositoryProvider _gitRepositoryProvider;
diff --git a/Src/Roflcopter.Plugin.Tests/MismatchedFileNames/MismatchedFileNameHighlightingQuickFixTest.cs b/Src/Roflcopter.Plugin.Tests/MismatchedFileNames/MismatchedFileNameHighlightingQuickFixTest.cs
index 94a0f1d..66a5627 100644
--- a/Src/Roflcopter.Plugin.Tests/MismatchedFileNames/MismatchedFileNameHighlightingQuickFixTest.cs
+++ b/Src/Roflcopter.Plugin.Tests/MismatchedFileNames/MismatchedFileNameHighlightingQuickFixTest.cs
@@ -11,7 +11,7 @@
 namespace Roflcopter.Plugin.Tests.MismatchedFileNames
 {
     [TestFixture]
-    [TestNetFramework46]
+    [TestNet60]
     public class MismatchedFileNameHighlightingQuickFixTest : CSharpQuickFixTestBase<MismatchedFileNameHighlightingQuickFixTest.TestQuickFix>
     {
         private TestQuickFix _quickFix;
diff --git a/Src/Roflcopter.Plugin.Tests/MismatchedFileNames/MismatchedFileNameHighlightingTests.cs b/Src/Roflcopter.Plugin.Tests/MismatchedFileNames/MismatchedFileNameHighlightingTests.cs
index 72c5b0b..eb99687 100644
--- a/Src/Roflcopter.Plugin.Tests/MismatchedFileNames/MismatchedFileNameHighlightingTests.cs
+++ b/Src/Roflcopter.Plugin.Tests/MismatchedFileNames/MismatchedFileNameHighlightingTests.cs
@@ -7,7 +7,6 @@
 namespace Roflcopter.Plugin.Tests.MismatchedFileNames
 {
     [TestFixture]
-    [TestNetFramework46]
     public class MismatchedFileNameHighlightingTests : CSharpHighlightingTestBase
     {
         [Test]
diff --git a/Src/Roflcopter.Plugin.Tests/Roflcopter.Plugin.Tests.RD20232.csproj b/Src/Roflcopter.Plugin.Tests/Roflcopter.Plugin.Tests.RD20233.csproj
similarity index 97%
rename from Src/Roflcopter.Plugin.Tests/Roflcopter.Plugin.Tests.RD20232.csproj
rename to Src/Roflcopter.Plugin.Tests/Roflcopter.Plugin.Tests.RD20233.csproj
index 284aab6..5dea1de 100644
--- a/Src/Roflcopter.Plugin.Tests/Roflcopter.Plugin.Tests.RD20232.csproj
+++ b/Src/Roflcopter.Plugin.Tests/Roflcopter.Plugin.Tests.RD20233.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Roflcopter.Plugin\Roflcopter.Plugin.RD20232.csproj" />
+    <ProjectReference Include="..\Roflcopter.Plugin\Roflcopter.Plugin.RD20233.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Src/Roflcopter.Plugin.Tests/Roflcopter.Plugin.Tests.RS20232.csproj b/Src/Roflcopter.Plugin.Tests/Roflcopter.Plugin.Tests.RS20233.csproj
similarity index 97%
rename from Src/Roflcopter.Plugin.Tests/Roflcopter.Plugin.Tests.RS20232.csproj
rename to Src/Roflcopter.Plugin.Tests/Roflcopter.Plugin.Tests.RS20233.csproj
index 922ad3e..fb294df 100644
--- a/Src/Roflcopter.Plugin.Tests/Roflcopter.Plugin.Tests.RS20232.csproj
+++ b/Src/Roflcopter.Plugin.Tests/Roflcopter.Plugin.Tests.RS20233.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Roflcopter.Plugin\Roflcopter.Plugin.RS20232.csproj" />
+    <ProjectReference Include="..\Roflcopter.Plugin\Roflcopter.Plugin.RS20233.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Src/Roflcopter.Plugin.Tests/TodoItems/TodoItemsCountTests.cs b/Src/Roflcopter.Plugin.Tests/TodoItems/TodoItemsCountTests.cs
index d97c4b4..290c6b1 100644
--- a/Src/Roflcopter.Plugin.Tests/TodoItems/TodoItemsCountTests.cs
+++ b/Src/Roflcopter.Plugin.Tests/TodoItems/TodoItemsCountTests.cs
@@ -12,7 +12,7 @@
 namespace Roflcopter.Plugin.Tests.TodoItems
 {
     [TestFixture]
-    [TestNetFramework46]
+    [TestNet60]
     public class TodoItemsCountTests : BaseTestWithSingleProject
     {
         protected override string RelativeTestDataPath => Path.Combine(base.RelativeTestDataPath, "..");
diff --git a/Src/Roflcopter.Plugin.Tests/UnitTesting/ConvertToParameterizedTestContextActionTest.cs b/Src/Roflcopter.Plugin.Tests/UnitTesting/ConvertToParameterizedTestContextActionTest.cs
index de6a111..11a4b59 100644
--- a/Src/Roflcopter.Plugin.Tests/UnitTesting/ConvertToParameterizedTestContextActionTest.cs
+++ b/Src/Roflcopter.Plugin.Tests/UnitTesting/ConvertToParameterizedTestContextActionTest.cs
@@ -7,8 +7,8 @@
 
 namespace Roflcopter.Plugin.Tests.UnitTesting
 {
-    [TestNetFramework46]
-    [UseNUnitPackage]
+    [TestNet60]
+    [TestPackages("NUnit")]
     public class ConvertToParameterizedTestContextActionTest : CSharpContextActionExecuteTestBase<ConvertToParameterizedTestContextAction>
     {
         protected override string RelativeTestDataPath => this.CalculateRelativeTestDataPath();
@@ -19,8 +19,8 @@ public class ConvertToParameterizedTestContextActionTest : CSharpContextActionEx
         [Test]
         public void TestMethodWithoutParameters() => DoNamedTest();
 
-        [TestNetFramework46]
-        [UseNUnitPackage]
+        [TestNet60]
+        [TestPackages("NUnit")]
         public class AvailabilityTest : CSharpContextActionAvailabilityTestBase<ConvertToParameterizedTestContextAction>
         {
             protected override string RelativeTestDataPath => this.CalculateRelativeTestDataPath();
diff --git a/Src/Roflcopter.Plugin.Tests/UnitTesting/UnitTestRunFileActionTest.cs b/Src/Roflcopter.Plugin.Tests/UnitTesting/UnitTestRunFileActionTest.cs
index f7dd899..ae8ac58 100644
--- a/Src/Roflcopter.Plugin.Tests/UnitTesting/UnitTestRunFileActionTest.cs
+++ b/Src/Roflcopter.Plugin.Tests/UnitTesting/UnitTestRunFileActionTest.cs
@@ -16,7 +16,7 @@
 namespace Roflcopter.Plugin.Tests.UnitTesting
 {
     [TestFixture]
-    [TestNetFramework46]
+    [TestNet60]
     public class UnitTestRunFileActionTest : BaseTestWithSingleProject
     {
         // IDEA: Refactor to BaseTestWithTextControl and use the real test elements
diff --git a/Src/Roflcopter.Plugin.Tests/UnitTesting/UseNUnitPackageAttribute.cs b/Src/Roflcopter.Plugin.Tests/UnitTesting/UseNUnitPackageAttribute.cs
deleted file mode 100644
index e2e0add..0000000
--- a/Src/Roflcopter.Plugin.Tests/UnitTesting/UseNUnitPackageAttribute.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using JetBrains.ReSharper.TestFramework;
-
-namespace Roflcopter.Plugin.Tests.UnitTesting
-{
-    public class UseNUnitPackageAttribute : TestPackagesAttribute
-    {
-        public UseNUnitPackageAttribute() : base("NUnit")
-        {
-        }
-    }
-}
diff --git a/Src/Roflcopter.Plugin/Roflcopter.Plugin.RD20232.csproj b/Src/Roflcopter.Plugin/Roflcopter.Plugin.RD20233.csproj
similarity index 100%
rename from Src/Roflcopter.Plugin/Roflcopter.Plugin.RD20232.csproj
rename to Src/Roflcopter.Plugin/Roflcopter.Plugin.RD20233.csproj
diff --git a/Src/Roflcopter.Plugin/Roflcopter.Plugin.RS20232.csproj b/Src/Roflcopter.Plugin/Roflcopter.Plugin.RS20233.csproj
similarity index 100%
rename from Src/Roflcopter.Plugin/Roflcopter.Plugin.RS20232.csproj
rename to Src/Roflcopter.Plugin/Roflcopter.Plugin.RS20233.csproj