made compatible with Rider 2024.1.5

.gitignore

@@ -19,4 +19,5 @@ output
 /.idea/.idea.*/.idea/*.xml
 .vs
 _ReSharper*
-_dotTrace*
+_dotTrace*
+packages/

build.gradle

@@ -3,9 +3,9 @@ import org.apache.tools.ant.taskdefs.condition.Os
 
 plugins {
     id 'java'
-    id 'org.jetbrains.kotlin.jvm' version '1.7.20'
-    id 'org.jetbrains.intellij' version '1.11.0'     // https://github.com/JetBrains/gradle-intellij-plugin/releases
-    id 'com.jetbrains.rdgen' version '2022.3.4'     // https://github.com/JetBrains/rd/releases
+    id 'org.jetbrains.kotlin.jvm' version '2.0.10'
+    id 'org.jetbrains.intellij' version '1.17.4'     // https://github.com/JetBrains/gradle-intellij-plugin/releases
+    id 'com.jetbrains.rdgen' version '2024.1.1'     // https://github.com/JetBrains/rd/releases
     id 'me.filippov.gradle.jvm.wrapper' version '0.14.0'
 }
 
@@ -22,7 +22,7 @@ repositories {
 }
 
 wrapper {
-    gradleVersion = '7.1'
+    gradleVersion = '8.8'
     distributionType = Wrapper.DistributionType.ALL
     distributionUrl = "https://cache-redirector.jetbrains.com/services.gradle.org/distributions/gradle-${gradleVersion}-all.zip"
 }
@@ -42,7 +42,7 @@ sourceSets {
 }
 
 compileKotlin {
-    kotlinOptions { jvmTarget = "17" }
+    kotlinOptions { jvmTarget = "22" }
 }
 
 task setBuildTool {

gradle.properties

@@ -4,7 +4,7 @@
 DotnetPluginId=ReSharperPlugin.SharpCoachPlugin
 DotnetSolution=ReSharperPlugin.SharpCoachPlugin.sln
 RiderPluginId=sharpcoachplugin
-PluginVersion=1.3.1
+PluginVersion=1.4.1
 
 BuildConfiguration=Debug
 
@@ -14,7 +14,7 @@ PublishToken="PUBLISH_TOKEN"
 #   Release:  2020.2
 #   Nightly:  2020.3-SNAPSHOT
 #   EAP:      2020.3-EAP2-SNAPSHOT
-ProductVersion=2023.1
+ProductVersion=2024.1.5
 
 # 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

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://cache-redirector.jetbrains.com/services.gradle.org/distributions/gradle-7.3-all.zip
+distributionUrl=https\://cache-redirector.jetbrains.com/services.gradle.org/distributions/gradle-8.8-all.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/dotnet/Plugin.props

@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <SdkVersion>2021.1.5</SdkVersion>
+    <SdkVersion>2024.1.5</SdkVersion>
 
     <Title>CoachSharp</Title>
     <Description>Useful features for C# development</Description>

src/dotnet/ReSharperPlugin.SharpCoachPlugin.Core/ReSharperPlugin.SharpCoachPlugin.Core.csproj

@@ -7,8 +7,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="JetBrains.Psi.Features.Core" Version="211.0.20210722.92107" />
-      <PackageReference Include="JetBrains.ReSharper.SDK" Version="2021.1.5">
+      <PackageReference Include="JetBrains.Psi.Features.Core" Version="241.0.20240802.132211" />
+      <PackageReference Include="JetBrains.ReSharper.SDK" Version="2024.1.5">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       </PackageReference>

src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/ReSharperPlugin.SharpCoachPlugin.Tests.csproj

@@ -1,14 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
+  
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="JetBrains.ReSharper.SDK.Tests" Version="$(SdkVersion)" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
   </ItemGroup>
-
+  
   <ItemGroup>
     <ProjectReference Include="..\ReSharperPlugin.SharpCoachPlugin\ReSharperPlugin.SharpCoachPlugin.csproj" />
   </ItemGroup>

src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/data/Intentions/ContextActions/Actions/Class/MapClassToClassActionTest.cs.gold

@@ -4,7 +4,7 @@ public class MapClassToClassActionTest
 {
     public static UserResponse ToResponse{caret}(UserRequest request)
     {
-      return new UserResponse() {UserDto = new UserResponse.User() {Id = request.UserDto.Id, Name = request.UserDto.Name}};
+      return new UserResponse() { UserDto = new UserResponse.User() { Id = request.UserDto.Id, Name = request.UserDto.Name } };
     }
 }
 

src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/data/Intentions/ContextActions/Actions/Collection/MapCollectionOfClassesActionTest.cs.gold

@@ -4,7 +4,7 @@ public class MapCollectionOfClassesActionTest
 {
     public static UserResponse ToResponse{caret}(UserRequest request)
     {
-      return new UserResponse() {Users = request.Users?.Select(tmpUsers => new UserResponse.User() {Id = tmpUsers.Id, Name = tmpUsers.Name}).ToArray()};
+      return new UserResponse() { Users = request.Users?.Select(tmpUsers => new UserResponse.User() { Id = tmpUsers.Id, Name = tmpUsers.Name }).ToArray() };
     }
 }
 

src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/data/Intentions/ContextActions/Actions/Enum/MapEnumToNumericActionTest.cs.gold

@@ -4,7 +4,7 @@ public class MapEnumToNumericActionTest
 {
     public static UserResponse ToResponse{caret}(UserRequest request)
     {
-      return new UserResponse() {AgeType = (long) request.AgeType};
+      return new UserResponse() { AgeType = (long)request.AgeType };
     }
 }
 

src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/data/Intentions/ContextActions/Actions/Enum/MapEnumToStringActionTest.cs.gold

@@ -4,7 +4,7 @@ public class MapEnumToStringActionTest
 {
     public static UserResponse ToResponse{caret}(UserRequest request)
     {
-      return new UserResponse() {AgeType = request.AgeType.ToString()};
+      return new UserResponse() { AgeType = request.AgeType.ToString() };
     }
 }
 

src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/data/Intentions/ContextActions/Actions/ExtensionMethod/ExtensionMethodTest.cs.gold

@@ -6,7 +6,7 @@ namespace Library.Models.Mapping
     {
         static UserResponse ToResponse{caret}(this UserRequest request)
         {
-          return new UserResponse() {Prop = request.Prop};
+          return new UserResponse() { Prop = request.Prop };
         }
     }
 

src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/data/Intentions/ContextActions/Actions/FullModelNameTests/FullInputModelNameTest.cs.gold

@@ -6,7 +6,7 @@ namespace Library.Models.Mapping
     {
         static UserResponse ToResponse{caret}(Library.Models.Mapping.UserRequest request)
         {
-          return new UserResponse() {Prop = request.Prop};
+          return new UserResponse() { Prop = request.Prop };
         }
     }
 

src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/data/Intentions/ContextActions/Actions/FullModelNameTests/FullOutputModelNameTest.cs.gold

@@ -6,7 +6,7 @@ namespace Library.Models.Mapping
     {
         static Library.Models.Mapping.UserResponse ToResponse{caret}(UserRequest request)
         {
-          return new Library.Models.Mapping.UserResponse() {Prop = request.Prop};
+          return new Library.Models.Mapping.UserResponse() { Prop = request.Prop };
         }
     }
 

src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/data/Intentions/ContextActions/Actions/LocalFunction/LocalFunctionLaunchTest.cs.gold

@@ -9,7 +9,7 @@ public class LocalFunctionLaunchTest
 
         static UserResponse ToResponse{caret}(UserRequest request)
         {
-          return new UserResponse() {Prop = request.Prop};
+          return new UserResponse() { Prop = request.Prop };
         }
     }
 }

src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/data/Intentions/ContextActions/Actions/Numeric/MapNumericToEnumActionTest.cs.gold

@@ -4,7 +4,7 @@ public class MapNumericToEnumActionTest
 {
     public static UserResponse ToResponse{caret}(UserRequest request)
     {
-      return new UserResponse() {AgeType = (UserResponse.Age) request.AgeType};
+      return new UserResponse() { AgeType = (UserResponse.Age)request.AgeType };
     }
 }
 

src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/data/Intentions/ContextActions/Actions/Numeric/MapNumericToStringActionTest.cs.gold

@@ -4,7 +4,7 @@ public class MapNumericToStringActionTest
 {
     public static UserResponse ToResponse{caret}(UserRequest request)
     {
-      return new UserResponse() {Age = request.Age.ToString()};
+      return new UserResponse() { Age = request.Age.ToString() };
     }
 }
 

src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/data/Intentions/ContextActions/Actions/Numeric/MapSameTypeAndNameProperties.cs.gold

@@ -4,7 +4,7 @@ public class TestMapSameTypeAndNameProperties
 {
     public static UserResponse ToResponse{caret}(UserRequest request)
     {
-      return new UserResponse() {Id = request.Id, Name = request.Name, IsActive = request.IsActive, StockIds = request.StockIds};
+      return new UserResponse() { Id = request.Id, Name = request.Name, IsActive = request.IsActive, StockIds = request.StockIds };
     }
 }
 

src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/data/Intentions/ContextActions/Actions/String/MapStringToEnumActionTest.cs.gold

@@ -4,7 +4,7 @@ public class MapStringToEnumActionTest
 {
     public static UserResponse ToResponse{caret}(UserRequest request)
     {
-      return new UserResponse() {AgeType = Enum.TryParse<UserResponse.Age>(request.AgeType, out var tmpCastedValue) ? tmpCastedValue : default};
+      return new UserResponse() { AgeType = Enum.TryParse<UserResponse.Age>(request.AgeType, out var tmpCastedValue) ? tmpCastedValue : default };
     }
 }
 

src/dotnet/ReSharperPlugin.SharpCoachPlugin.Tests/test/data/Intentions/ContextActions/Actions/String/MapStringToNumericActionTest.cs.gold

@@ -4,7 +4,7 @@ public class MapStringToNumericActionTest
 {
     public static UserResponse ToResponse{caret}(UserRequest request)
     {
-      return new UserResponse() {Age = long.TryParse(request.Age, out var tmpCastedValue) ? tmpCastedValue : default};
+      return new UserResponse() { Age = long.TryParse(request.Age, out var tmpCastedValue) ? tmpCastedValue : default };
     }
 }
 

src/dotnet/ReSharperPlugin.SharpCoachPlugin.Ui/ReSharperPlugin.SharpCoachPlugin.Ui.csproj

@@ -14,11 +14,10 @@
       <Reference Include="WindowsBase" />
     </ItemGroup>
 
+
     <ItemGroup>
-      <PackageReference Include="JetBrains.Platform.Core.Shell" Version="211.0.20210716.95744" />
-      <PackageReference Include="JetBrains.Platform.Lib.VisualStudio.AnyVs.ShellInterop.PrivateBuild" Version="2.0.20141005.1" />
-      <PackageReference Include="JetBrains.Platform.UIInteractive.Shell" Version="211.0.20210722.90748" />
-      <PackageReference Include="JetBrains.Psi.Features.Core" Version="211.0.20210722.92107" />
+        <PackageReference Include="JetBrains.Platform.Core.Shell" Version="241.0.20240802.131630" />
+        <PackageReference Include="JetBrains.Psi.Features.Core" Version="241.0.20240802.132211" />        
     </ItemGroup>
 
     <ItemGroup>

src/dotnet/ReSharperPlugin.SharpCoachPlugin.Ui/ToolWindows/MapModelsLogsToolWindowUI.cs

@@ -88,7 +88,7 @@ private static BeGrid BuildOperationsGrid(IEnumerable<MappingOperationResult> ma
                     inputPropertiesGrid.AddElement("Input class properties".GetBeLabel().WithCustomTextSize(BeFontSize.BIGGER));
                     foreach (var errorInputProperty in mappingResult.FailedToMapPropertiesContainer.FromClassPropertyNames)
                     {
-                        var propertyNameText = BeControls.GetTextControl(errorInputProperty).InBorder(BeShowBorders.All);
+                        var propertyNameText = BeControls.GetTextControl(errorInputProperty).WithLineBorder(BeShowBorders.All);
                         inputPropertiesGrid.AddElement(propertyNameText);
                     }
 
@@ -97,7 +97,7 @@ private static BeGrid BuildOperationsGrid(IEnumerable<MappingOperationResult> ma
                     outputPropertiesGrid.AddElement("Output class properties".GetBeLabel().WithCustomTextSize(BeFontSize.BIGGER));
                     foreach (var errorOutputProperty in mappingResult.FailedToMapPropertiesContainer.ToClassPropertyNames)
                     {
-                        var propertyNameText = BeControls.GetTextControl(errorOutputProperty).InBorder(BeShowBorders.All);
+                        var propertyNameText = BeControls.GetTextControl(errorOutputProperty).WithLineBorder(BeShowBorders.All);
                         outputPropertiesGrid.AddElement(propertyNameText);
                     }
 

src/dotnet/ReSharperPlugin.SharpCoachPlugin/ReSharperPlugin.SharpCoachPlugin.Rider.csproj

@@ -17,7 +17,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Platform.Core.Shell" Version="211.0.20210716.95744" />
     <PackageReference Include="JetBrains.Rider.SDK" Version="$(SdkVersion)" />
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net472" Version="1.0.0">
       <PrivateAssets>all</PrivateAssets>

src/dotnet/ReSharperPlugin.SharpCoachPlugin/ReSharperPlugin.SharpCoachPlugin.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <PackageId>deaglegross.SharpCoachPlugin</PackageId>
-    <Version>1.3.1</Version>
+    <Version>1.4.1</Version>
     <Authors>deaglegross</Authors>
     <Company>deaglegross</Company>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -24,7 +24,6 @@
 
   <ItemGroup>
     <PackageReference Include="JetBrains.ReSharper.SDK" Version="$(SdkVersion)" PrivateAssets="all" />
-    <PackageReference Include="JetBrains.ReSharperAutomationTools.src.ReSharperHost" Version="211.0.20210722.100041" />
     <!-- TODO: https://github.com/NuGet/Home/issues/7154 -->
     <PackageReference Include="Wave" Version="[$(WaveVersion),$(UpperWaveVersion))" />
   </ItemGroup>

src/rider/main/resources/META-INF/plugin.xml

@@ -1,7 +1,7 @@
 <idea-plugin require-restart="true">
   <id>deaglegross.coachsharp</id>
   <name>CoachSharp</name>
-  <version>1.3.1</version>
+  <version>1.4.1</version>
   <vendor url="https://github.com/DeagleGross/SharpCoachPlugin">deaglegross</vendor>
   <depends>com.intellij.modules.rider</depends>
 
@@ -11,7 +11,7 @@
       untilBuild.set('223.*')
     }
   -->
-  <idea-version since-build="231" until-build="231.*" />
+  <idea-version since-build="241" until-build="241.*" />
 
   <description>
 <![CDATA[