From 31acbe53afa8c88630b401751c6ed90eaa365d10 Mon Sep 17 00:00:00 2001 From: Ulrich Buchgraber Date: Wed, 29 Jan 2025 16:37:55 +0100 Subject: [PATCH] !WIP! Add ReSharper and Rider 2024.3 support --- .github/workflows/build.yml | 2 +- History.md | 3 +++ Roflcopter.sln | 8 ++++---- Src/RiderPlugin/gradle.properties | 4 ++-- ...0243.csproj => Roflcopter.Plugin.Tests.RD20251.csproj} | 2 +- ...0243.csproj => Roflcopter.Plugin.Tests.RS20251.csproj} | 2 +- ...in.RD20243.csproj => Roflcopter.Plugin.RD20251.csproj} | 0 ...in.RS20243.csproj => Roflcopter.Plugin.RS20251.csproj} | 0 8 files changed, 12 insertions(+), 9 deletions(-) rename Src/Roflcopter.Plugin.Tests/{Roflcopter.Plugin.Tests.RD20243.csproj => Roflcopter.Plugin.Tests.RD20251.csproj} (97%) rename Src/Roflcopter.Plugin.Tests/{Roflcopter.Plugin.Tests.RS20243.csproj => Roflcopter.Plugin.Tests.RS20251.csproj} (97%) rename Src/Roflcopter.Plugin/{Roflcopter.Plugin.RD20243.csproj => Roflcopter.Plugin.RD20251.csproj} (100%) rename Src/Roflcopter.Plugin/{Roflcopter.Plugin.RS20243.csproj => Roflcopter.Plugin.RS20251.csproj} (100%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ea7150c..4094b36 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,7 +6,7 @@ on: env: BuildConfiguration: Release - BuildVersion: 1.23.0.${{ github.run_number }} + BuildVersion: 1.24.0.${{ github.run_number }} jobs: build: diff --git a/History.md b/History.md index e09356e..7066c82 100644 --- a/History.md +++ b/History.md @@ -1,3 +1,6 @@ +### 1.24.0 ### +- ReSharper and Rider 2025.1 support + ### 1.23.0 ### - ReSharper and Rider 2024.3 support diff --git a/Roflcopter.sln b/Roflcopter.sln index bb3e339..43ad5d3 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.RS20243", "Src\Roflcopter.Plugin\Roflcopter.Plugin.RS20243.csproj", "{9E2BBE59-1972-45B2-836B-802479CFEB6D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Roflcopter.Plugin.RS20251", "Src\Roflcopter.Plugin\Roflcopter.Plugin.RS20251.csproj", "{9E2BBE59-1972-45B2-836B-802479CFEB6D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Roflcopter.Plugin.Tests.RS20243", "Src\Roflcopter.Plugin.Tests\Roflcopter.Plugin.Tests.RS20243.csproj", "{6AFE9FA3-33A0-43B2-9C04-05A4C6A57A2D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Roflcopter.Plugin.Tests.RS20251", "Src\Roflcopter.Plugin.Tests\Roflcopter.Plugin.Tests.RS20251.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.RD20243", "Src\Roflcopter.Plugin\Roflcopter.Plugin.RD20243.csproj", "{B81B447C-A4D0-419A-BD44-8D8836272C3D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Roflcopter.Plugin.RD20251", "Src\Roflcopter.Plugin\Roflcopter.Plugin.RD20251.csproj", "{B81B447C-A4D0-419A-BD44-8D8836272C3D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Roflcopter.Plugin.Tests.RD20243", "Src\Roflcopter.Plugin.Tests\Roflcopter.Plugin.Tests.RD20243.csproj", "{E8FBF9D8-FDD3-4755-85D6-351600B6DB49}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Roflcopter.Plugin.Tests.RD20251", "Src\Roflcopter.Plugin.Tests\Roflcopter.Plugin.Tests.RD20251.csproj", "{E8FBF9D8-FDD3-4755-85D6-351600B6DB49}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Src/RiderPlugin/gradle.properties b/Src/RiderPlugin/gradle.properties index 484193e..9cb0411 100644 --- a/Src/RiderPlugin/gradle.properties +++ b/Src/RiderPlugin/gradle.properties @@ -1,12 +1,12 @@ RiderPluginProjectName=rider-Roflcopter ResharperPluginProjectName=Roflcopter.Plugin -ReSharperVersionIdentifier=RD20243 +ReSharperVersionIdentifier=RD20251 PluginVersion=0.0.0.1 BuildConfiguration=Debug # https://www.jetbrains.com/intellij-repository/releases or https://www.jetbrains.com/intellij-repository/snapshots -ProductVersion=2024.3 +ProductVersion=2025.1-SNAPSHOT # Kotlin 1.4 will bundle the stdlib dependency by default, causing problems with the version bundled with the IDE # https://blog.jetbrains.com/kotlin/2020/07/kotlin-1-4-rc-released/#stdlib-default diff --git a/Src/Roflcopter.Plugin.Tests/Roflcopter.Plugin.Tests.RD20243.csproj b/Src/Roflcopter.Plugin.Tests/Roflcopter.Plugin.Tests.RD20251.csproj similarity index 97% rename from Src/Roflcopter.Plugin.Tests/Roflcopter.Plugin.Tests.RD20243.csproj rename to Src/Roflcopter.Plugin.Tests/Roflcopter.Plugin.Tests.RD20251.csproj index 0777ab5..34377bf 100644 --- a/Src/Roflcopter.Plugin.Tests/Roflcopter.Plugin.Tests.RD20243.csproj +++ b/Src/Roflcopter.Plugin.Tests/Roflcopter.Plugin.Tests.RD20251.csproj @@ -23,7 +23,7 @@ - + diff --git a/Src/Roflcopter.Plugin.Tests/Roflcopter.Plugin.Tests.RS20243.csproj b/Src/Roflcopter.Plugin.Tests/Roflcopter.Plugin.Tests.RS20251.csproj similarity index 97% rename from Src/Roflcopter.Plugin.Tests/Roflcopter.Plugin.Tests.RS20243.csproj rename to Src/Roflcopter.Plugin.Tests/Roflcopter.Plugin.Tests.RS20251.csproj index c6bee8b..176d02c 100644 --- a/Src/Roflcopter.Plugin.Tests/Roflcopter.Plugin.Tests.RS20243.csproj +++ b/Src/Roflcopter.Plugin.Tests/Roflcopter.Plugin.Tests.RS20251.csproj @@ -23,7 +23,7 @@ - + diff --git a/Src/Roflcopter.Plugin/Roflcopter.Plugin.RD20243.csproj b/Src/Roflcopter.Plugin/Roflcopter.Plugin.RD20251.csproj similarity index 100% rename from Src/Roflcopter.Plugin/Roflcopter.Plugin.RD20243.csproj rename to Src/Roflcopter.Plugin/Roflcopter.Plugin.RD20251.csproj diff --git a/Src/Roflcopter.Plugin/Roflcopter.Plugin.RS20243.csproj b/Src/Roflcopter.Plugin/Roflcopter.Plugin.RS20251.csproj similarity index 100% rename from Src/Roflcopter.Plugin/Roflcopter.Plugin.RS20243.csproj rename to Src/Roflcopter.Plugin/Roflcopter.Plugin.RS20251.csproj