Merge pull request #1077 from JetBrains/rival/target-252

Support for Rider 2025.2 EAP 4

Author: rafaelldi

PluginsAndFeatures/azure-toolkit-for-rider/CHANGELOG.md

@@ -4,6 +4,10 @@
 
 ## [Unreleased]
 
+### Changed
+
+- Support for Rider 2025.2 EAP 4
+
 ## [4.4.8] - 2025-04-16
 
 ### Added

PluginsAndFeatures/azure-toolkit-for-rider/azure-intellij-plugin-appservice-dotnet-aspire/src/main/kotlin/com/microsoft/azure/toolkit/intellij/aspire/FunctionSessionExecutableFactory.kt

@@ -40,7 +40,6 @@ import com.microsoft.azure.toolkit.intellij.legacy.function.launchProfiles.getAp
 import com.microsoft.azure.toolkit.intellij.legacy.function.launchProfiles.getWorkingDirectory
 import com.microsoft.azure.toolkit.intellij.legacy.function.localsettings.FunctionLocalSettings
 import com.microsoft.azure.toolkit.intellij.legacy.function.runner.localRun.FunctionCoreToolsExecutableService
-import java.io.File
 import java.nio.file.Path
 import kotlin.io.path.Path
 import kotlin.io.path.absolutePathString
@@ -218,8 +217,8 @@ class FunctionSessionExecutableFactory(private val project: Project) {
         targetFramework: RdTargetFrameworkId?
     ): ExecutableParameterProcessingResult {
         val processOptions = ProjectProcessOptions(
-            sessionProjectPath.toFile(),
-            File(workingDirectory)
+            sessionProjectPath,
+            Path(workingDirectory)
         )
         val runParameters = ExecutableRunParameters(
             coreToolsExecutablePath,

PluginsAndFeatures/azure-toolkit-for-rider/azure-intellij-plugin-appservice-dotnet/src/main/kotlin/com/microsoft/azure/toolkit/intellij/legacy/function/runner/localRun/FunctionRunExecutorFactory.kt

@@ -34,7 +34,6 @@ import com.jetbrains.rider.runtime.msNet.MsNetRuntime
 import com.microsoft.azure.toolkit.intellij.legacy.function.daemon.AzureRunnableProjectKinds
 import com.microsoft.azure.toolkit.intellij.legacy.function.launchProfiles.*
 import com.microsoft.azure.toolkit.intellij.legacy.function.localsettings.FunctionLocalSettings
-import java.io.File
 import java.nio.file.Path
 import kotlin.io.path.Path
 import kotlin.io.path.absolutePathString
@@ -128,8 +127,8 @@ class FunctionRunExecutorFactory(
             else parameters.startBrowserParameters.startAfterLaunch
 
         val projectProcessOptions = ProjectProcessOptions(
-            File(runnableProject.projectFilePath),
-            File(effectiveWorkingDirectory)
+            Path(runnableProject.projectFilePath),
+            Path(effectiveWorkingDirectory)
         )
 
         val runParameters = ExecutableRunParameters(

PluginsAndFeatures/azure-toolkit-for-rider/gradle.properties

@@ -4,18 +4,17 @@ pluginGroup = com.jetbrains
 pluginName = Azure Toolkit for Rider
 pluginRepositoryUrl = https://github.com/JetBrains/azure-tools-for-intellij
 # SemVer format -> https://semver.org
-pluginVersion = 4.4.8
+pluginVersion = 4.5.0
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
-pluginSinceBuild = 251
-pluginUntilBuild = 251.*
+pluginSinceBuild = 252
 
 # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
 # Examples:
 #   Release:  2020.2
 #   EAP:      2020.3-EAP2-SNAPSHOT
 #   Nightly:  2020.3-SNAPSHOT
-platformVersion = 2025.1
+platformVersion = 2025.2-EAP4-SNAPSHOT
 
 dotnetBuildConfiguration=Release
 

PluginsAndFeatures/azure-toolkit-for-rider/gradle/libs.versions.toml

@@ -1,12 +1,13 @@
 [versions]
 # libraries
 # https://search.maven.org/artifact/com.jetbrains.rd/rd-gen
-rdGen = "2025.1.1"
+rdGen = "2025.2.0"
 opentest4j = "1.3.0"
 azureToolkitLibs = "0.51.0"
 azureToolkitHdinsightLibs = "0.1.1"
 javaWebSocket = "1.5.1"
 coroutines = "1.8.1"
+serialization = "1.8.1"
 ktor = "3.1.3"
 lombok = "1.18.24"
 snakeyaml = "2.2"
@@ -15,7 +16,6 @@ jedis = "3.6.3"
 
 # plugins
 kotlin = "2.1.21"
-serialization = "1.8.1"
 changelog = "2.2.1"
 intelliJPlatform = "2.6.0"
 qodana = "2025.1.1"

PluginsAndFeatures/azure-toolkit-for-rider/settings.gradle.kts

@@ -16,7 +16,7 @@ pluginManagement {
 }
 
 plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
 }
 
 fun intellijModule(name: String) {

PluginsAndFeatures/azure-toolkit-for-rider/src/dotnet/ReSharper.Azure/Azure.Daemon/Azure.Daemon.csproj

@@ -8,7 +8,7 @@
     <Import Project="$(JetBrainsRiderBackendReference)" Condition="Exists('$(JetBrainsRiderBackendReference)')" />
 
     <ItemGroup>
-        <PackageReference Include="CronExpressionDescriptor" Version="2.36.0" />
+        <PackageReference Include="CronExpressionDescriptor" Version="2.41.0" />
         <PackageReference Include="NCrontab.Signed" Version="3.3.3" />
     </ItemGroup>
 

PluginsAndFeatures/azure-toolkit-for-rider/src/dotnet/ReSharper.Azure/Azure.Daemon/Errors/FunctionAppErrors.Generated.cs

@@ -73,7 +73,7 @@ public bool IsValid()
 
 #region Configurable Severity Registrar
   [RegisterConfigurableSeverity(TimerTriggerCronExpressionError.HIGHLIGHTING_ID, null, null, null, AzureHighlightingGroupIds.FunctionApp, "Invalid Function App Timer Trigger Cron expression", null, null, "Function App Timer Trigger Cron expression is not valid and can not be used.", null, null, Severity.ERROR)]
-  public class RegisterSeverityComponentF2D89CEB237C9F45229FA58A4F70E92782B3BB5A3AB13BBCC1616EB04ACB104F
+  public class RegisterSeverityComponentCAC4631F674C122DAC43AAECF236F252D2734D93052808AE491FDDD72FB80E4C
   {
   }
 #endregion

PluginsAndFeatures/azure-toolkit-for-rider/src/dotnet/ReSharper.Azure/Azure.Intellisense/Azure.Intellisense.csproj

@@ -8,7 +8,7 @@
     <Import Project="$(JetBrainsRiderRdBackendCommonReference)" Condition="Exists('$(JetBrainsRiderRdBackendCommonReference)')" />
 
     <ItemGroup>
-        <PackageReference Include="CitizenMatt.ReSharper.LiveTemplateCompiler" Version="3.6.0">
+        <PackageReference Include="CitizenMatt.ReSharper.LiveTemplateCompiler" Version="3.7.0">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>