From 233592581995296e739c72eedae746722236dec3 Mon Sep 17 00:00:00 2001 From: Ulrich Buchgraber Date: Wed, 1 Nov 2023 16:48:20 +0100 Subject: [PATCH] Add ReSharper and Rider 2023.3 support --- .github/workflows/build.yml | 2 +- History.md | 3 +++ Roflcopter.sln | 8 ++++---- Src/RiderPlugin/settings.gradle | 4 ++-- ....csproj => Roflcopter.Plugin.Tests.RD20233.csproj} | 2 +- ....csproj => Roflcopter.Plugin.Tests.RS20233.csproj} | 2 +- .../ConvertToParameterizedTestContextActionTest.cs | 4 ++-- .../UnitTesting/UseNUnitPackageAttribute.cs | 11 ----------- ...D20232.csproj => Roflcopter.Plugin.RD20233.csproj} | 0 ...S20232.csproj => Roflcopter.Plugin.RS20233.csproj} | 0 10 files changed, 14 insertions(+), 22 deletions(-) rename Src/Roflcopter.Plugin.Tests/{Roflcopter.Plugin.Tests.RD20232.csproj => Roflcopter.Plugin.Tests.RD20233.csproj} (97%) rename Src/Roflcopter.Plugin.Tests/{Roflcopter.Plugin.Tests.RS20232.csproj => Roflcopter.Plugin.Tests.RS20233.csproj} (97%) delete mode 100644 Src/Roflcopter.Plugin.Tests/UnitTesting/UseNUnitPackageAttribute.cs rename Src/Roflcopter.Plugin/{Roflcopter.Plugin.RD20232.csproj => Roflcopter.Plugin.RD20233.csproj} (100%) rename Src/Roflcopter.Plugin/{Roflcopter.Plugin.RS20232.csproj => Roflcopter.Plugin.RS20233.csproj} (100%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5f9c52f..1800fba 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: 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/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/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 @@ - + 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 @@ - + diff --git a/Src/Roflcopter.Plugin.Tests/UnitTesting/ConvertToParameterizedTestContextActionTest.cs b/Src/Roflcopter.Plugin.Tests/UnitTesting/ConvertToParameterizedTestContextActionTest.cs index de6a111..39a4a89 100644 --- a/Src/Roflcopter.Plugin.Tests/UnitTesting/ConvertToParameterizedTestContextActionTest.cs +++ b/Src/Roflcopter.Plugin.Tests/UnitTesting/ConvertToParameterizedTestContextActionTest.cs @@ -8,7 +8,7 @@ namespace Roflcopter.Plugin.Tests.UnitTesting { [TestNetFramework46] - [UseNUnitPackage] + [TestPackages("NUnit")] public class ConvertToParameterizedTestContextActionTest : CSharpContextActionExecuteTestBase { protected override string RelativeTestDataPath => this.CalculateRelativeTestDataPath(); @@ -20,7 +20,7 @@ public class ConvertToParameterizedTestContextActionTest : CSharpContextActionEx public void TestMethodWithoutParameters() => DoNamedTest(); [TestNetFramework46] - [UseNUnitPackage] + [TestPackages("NUnit")] public class AvailabilityTest : CSharpContextActionAvailabilityTestBase { protected override string RelativeTestDataPath => this.CalculateRelativeTestDataPath(); 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