Prepare 232.0.0-eap02 release

CHANGELOG.md

@@ -3,6 +3,13 @@
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [232.0.0] - 2023-05-24
+### Added
+- Enable support for Rider 2023.2 EAP 2
+
+### Fixed
+- Common: Rider version incompatibility (`EntityFrameworkCoreHost` construction has failed ...)
+
 ## [231.1.4] - 2023-05-24
 ### Fixed
 - Scaffolding: Impossible to execute scaffolding on non-empty folder (#168)
@@ -188,7 +195,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Suggesting installing dotnet `ef command` line tools if not installed (when opening solution that contains EF Core related projects)
 - Deleting used database
 
-[Unreleased]: https://github.com/seclerp/rider-efcore/compare/v231.1.4...HEAD
+[Unreleased]: https://github.com/seclerp/rider-efcore/compare/v232.0.0-eap02...HEAD
+[v232.0.0-eap02]: https://github.com/seclerp/rider-efcore/compare/v231.1.4...v232.0.0-eap02
 [231.1.4]: https://github.com/seclerp/rider-efcore/compare/v231.1.3...v231.1.4
 [231.1.3]: https://github.com/seclerp/rider-efcore/compare/v231.1.2...v231.1.3
 [231.1.2]: https://github.com/seclerp/rider-efcore/compare/v231.1.1...v231.1.2

README.md

@@ -67,7 +67,7 @@ More about features and available dialogs you could read in [**the blog post**](
 Before opening the issue, please make sure that your projects and development environment completely satisfies these requirements:
 
 - IDE
-  - JetBrains Rider **2023.1 or higher**
+  - JetBrains Rider **2023.1+ or latest EAP**
 
 - Target frameworks
   - `net8.0` (preview)

build.gradle.kts

@@ -10,7 +10,7 @@ buildscript {
 
     // https://search.maven.org/artifact/com.jetbrains.rd/rd-gen
     dependencies {
-        classpath("com.jetbrains.rd:rd-gen:2023.1.2")
+        classpath("com.jetbrains.rd:rd-gen:2023.2.1")
     }
 }
 
@@ -222,7 +222,8 @@ tasks {
     }
 
     patchPluginXml {
-        untilBuild.set("231.*")
+        sinceBuild.set("232.0")
+        untilBuild.set("232.*")
         val latestChangelog = try {
             changelog.getUnreleased()
         } catch (_: MissingVersionException) {

gradle.properties

@@ -4,7 +4,7 @@ javaVersion=17
 
 dotnetPluginId=Rider.Plugins.EfCore
 riderPluginId=me.seclerp.rider.plugins.efcore
-pluginVersion=231.1.4
+pluginVersion=232.0.0-eap02
 
 buildConfiguration=Debug
 
@@ -15,7 +15,7 @@ publishChannel=default
 #   Release:  2020.2
 #   Nightly:  2020.3-SNAPSHOT
 #   EAP:      2020.3-EAP2-SNAPSHOT
-productVersion=2023.1
+productVersion=2023.2-EAP2-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

src/dotnet/Rider.Plugins.EfCore/DbContext/DbContextProvider.cs

@@ -3,7 +3,6 @@
 using JetBrains.ProjectModel;
 using JetBrains.ReSharper.Psi;
 using JetBrains.ReSharper.Psi.Modules;
-using JetBrains.RiderTutorials.Utils;
 using Rider.Plugins.EfCore.Extensions;
 using Rider.Plugins.EfCore.Migrations;
 using Rider.Plugins.EfCore.Rd;
@@ -21,7 +20,7 @@ public IEnumerable<DbContextInfo> GetDbContexts(IProject project)
           .GetPsiModules()
           .SelectMany(module => module.FindInheritorsOf(EfCoreKnownTypeNames.DbContextBaseClass))
           // To get around of multiple modules (multiple target frameworks)
-          .Distinct(dbContextClass => dbContextClass.GetFullClrName())
+          .Distinct(dbContextClass => dbContextClass.GetClrName().FullName)
           .TrySelect<IClass, DbContextInfo>(TryGetDbContextInfo)
           .ToList();
 
@@ -36,7 +35,7 @@ private static bool TryGetDbContextInfo(IClass @class, out DbContextInfo dbConte
       if (@class.IsAbstract)
         return false;
 
-      dbContextInfo = new DbContextInfo(@class.ShortName, @class.GetFullClrName());
+      dbContextInfo = new DbContextInfo(@class.ShortName, @class.GetClrName().FullName);
 
       return true;
     }

src/dotnet/Rider.Plugins.EfCore/EntityFrameworkCoreHost.cs

@@ -7,7 +7,7 @@
 using JetBrains.ProjectModel;
 using JetBrains.ProjectModel.NuGet.DotNetTools;
 using JetBrains.Rd.Tasks;
-using JetBrains.RdBackend.Common.Features;
+using JetBrains.ReSharper.Feature.Services.Protocol;
 using JetBrains.ReSharper.Resources.Shell;
 using JetBrains.Util;
 using Rider.Plugins.EfCore.Compatibility;

src/dotnet/Rider.Plugins.EfCore/Migrations/MigrationsProvider.cs

@@ -3,7 +3,6 @@
 using JetBrains.ProjectModel;
 using JetBrains.ReSharper.Psi;
 using JetBrains.ReSharper.Psi.Modules;
-using JetBrains.RiderTutorials.Utils;
 using Rider.Plugins.EfCore.Extensions;
 using Rider.Plugins.EfCore.Rd;
 
@@ -34,7 +33,7 @@ public IEnumerable<MigrationInfo> GetMigrations(IProject project, string dbConte
           .GetPsiModules()
           .SelectMany(module => module.FindInheritorsOf(EfCoreKnownTypeNames.MigrationBaseClass))
           // To get around of multiple modules (multiple target frameworks)
-          .Distinct(migrationClass => migrationClass.GetFullClrName())
+          .Distinct(migrationClass => migrationClass.GetClrName().FullName)
           .TrySelect<IClass, MigrationInfo>(TryGetMigrationInfo)
           .Where(m => m.DbContextClassFullName == dbContextFullName)
           .ToList();

src/dotnet/Rider.Plugins.EfCore/Rider.Plugins.EfCore.csproj

@@ -16,9 +16,10 @@
 
   <ItemGroup>
     <PackageReference Include="JetBrains.Platform.Core.Ide" />
+    <PackageReference Include="JetBrains.Platform.Core.Text" />
+    <PackageReference Include="JetBrains.Platform.Core.Shell" />
     <PackageReference Include="JetBrains.Psi.Features.Core" />
     <PackageReference Include="JetBrains.Rider.RdBackend.Common" />
-    <PackageReference Include="JetBrains.Rider.RiderTutorials" />
   </ItemGroup>
 
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />