Merge pull request #687 from JetBrains/232.ra/target-232

Target Rider 2023.2 EAP2

BuildPlugin

@@ -33,12 +33,12 @@ tc_open "Initializing build script"
 
     INJECT_INTELLIJ_VERSION=false
 
-    IJ_VERSION_MAJOR_BUILD=231
-    IJ_VERSION_MAJOR=2023.1
+    IJ_VERSION_MAJOR_BUILD=232
+    IJ_VERSION_MAJOR=2023.2
     IJ_VERSION_MINOR=
     IJ_VERSION_LATEST=$IJ_VERSION_MAJOR.$IJ_VERSION_MINOR \
                       && [[ -z $IJ_VERSION_MINOR ]] && IJ_VERSION_LATEST=$IJ_VERSION_MAJOR
-    IJ_SCALA_VERSION_LATEST=2023.1.15
+    IJ_SCALA_VERSION_LATEST=2023.2.2
 
     while getopts ":hqvBC:e:" option; do
         case $option in
@@ -58,7 +58,7 @@ tc_open "Initializing build script"
         esac
     done
 
-    BUILD_NUMBER="3.50.0.$BUILD_COUNTER-2023.1"
+    BUILD_NUMBER="3.50.0.$BUILD_COUNTER-2023.2"
     BUILD_CONFIGURATION=Release
 
     MAVEN_LOCAL_DIR="$SCRIPTPATH"/.repository

PluginsAndFeatures/azure-toolkit-for-intellij/build.gradle

@@ -75,8 +75,8 @@ configure(mainProjects) {
         implementation group: 'org.apache.commons', name: 'commons-text', version: '1.10.0'
         implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.10'
         implementation 'net.minidev:json-smart:2.3'
-        implementation 'com.microsoft.azure:azure-client-runtime:1.7.5', { force = true }
-        implementation 'com.microsoft.azure:azure-client-authentication:1.7.5', { force = true }
+        implementation('com.microsoft.azure:azure-client-runtime') { version { strictly '1.7.5' } }
+        implementation('com.microsoft.azure:azure-client-authentication') { version { strictly '1.7.5' } }
         aspect 'com.microsoft.azure:azure-toolkit-common-lib:0.3.0'
         implementation 'com.microsoft.azuretools:azuretools-core:3.50.0', {
             exclude group: "com.microsoft.azure", module: "azure-client-authentication"

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

@@ -1,24 +1,24 @@
-buildNumber=3.50.0.9999-2023.1
+buildNumber=3.50.0.9999-2023.2
 
 javaVersion=17
 org.gradle.jvmargs='-Duser.language=en'
 sources=false
 
-intellij_version=IC-231.8109-EAP-CANDIDATE-SNAPSHOT
-#rider_version=RD-2023.1-EAP9-SNAPSHOT
-rider_version=RD-2023.1
+intellij_version=IC-232.6095-EAP-CANDIDATE-SNAPSHOT
+rider_version=RD-2023.2-EAP2-SNAPSHOT
+#rider_version=RD-2023.1
 build_common_code_with=rider
 intellij_plugin_name=azure-toolkit-for-intellij
 rider_plugin_name=azure-toolkit-for-rider
 rider_backend_build_configuration=Debug
 
-dep_plugins=org.intellij.scala:2023.1.15
+dep_plugins=org.intellij.scala:2023.2.2
 applicationinsights.key=57cc111a-36a8-44b3-b044-25d293b8b77c
 
 updateVersionRange=false
-patchPluginXmlSinceBuild=231
+patchPluginXmlSinceBuild=232
 
-kotlin_version=1.8.0
+kotlin_version=1.8.21
 # note: jackson_kotlin_version also needs updating in Utils\azuretools-core\pom.xml
 jackson_kotlin_version=2.13.4
 gradle_plugin_version=1.12.0
@@ -29,8 +29,15 @@ assertj_version=3.15.0
 lombok_version=1.18.24
 aspectj_version=6.6.1
 aspectj_tools_version=1.9.19
-kotlin.stdlib.default.dependency=false
 
-rd_version=2023.1.2
+rd_version=2023.2.1
 
-rider_test_local_env_run=true
+rider_test_local_env_run=true
+
+# Opt-out flag for bundling Kotlin standard library.
+# See https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library for details.
+# suppress inspection "UnusedProperty"
+kotlin.stdlib.default.dependency = false
+
+# https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin-faq.html#kotlin-compiler-throws-out-of-memory-java-heap-space-error
+kotlin.incremental.useClasspathSnapshot=false

PluginsAndFeatures/azure-toolkit-for-intellij/gradle/wrapper/gradle-wrapper.properties

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

PluginsAndFeatures/azure-toolkit-for-intellij/gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -32,10 +32,10 @@
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
 #         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
 #
 #   Important for patching:
 #
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -143,12 +140,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in
@@ -205,6 +210,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

PluginsAndFeatures/azure-toolkit-for-intellij/gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

PluginsAndFeatures/azure-toolkit-for-intellij/idea/build.gradle

@@ -72,7 +72,7 @@ dependencies {
 
     implementation group: 'org.dom4j', name: 'dom4j', version: '2.1.3'
     implementation group: 'jaxen', name: 'jaxen', version: '1.2.0'
-    implementation 'com.microsoft.azure:azure-toolkit-springcloud-lib:0.3.0', { force = true }
+    implementation('com.microsoft.azure:azure-toolkit-springcloud-lib') { version { strictly '0.3.0' } }
 
     // https://mvnrepository.com/artifact/org.projectlombok/lombok
     compileOnly "org.projectlombok:lombok:${lombok_version}"
@@ -104,7 +104,7 @@ test {
 }
 
 task cucumberPackJar(type: Jar) {
-    appendix = 'pathing'
+    archiveAppendix = 'pathing'
 
     doFirst {
         manifest {

PluginsAndFeatures/azure-toolkit-for-intellij/resources/META-INF/platformPlugin.xml

@@ -6,20 +6,7 @@
     <html>
         <h4>Added:</h4>
         <ul>
-          <li>Compatibility with Rider 2023.1</li>
-          <li>Azure Functions: Option to auto-start Azurite with run configurations (<a href="https://github.com/JetBrains/azure-tools-for-intellij/issues/674">#674</a>)</li>
-          <li>Azure Functions: show a warning when Azurite is not running (<a href="https://github.com/JetBrains/azure-tools-for-intellij/issues/605">#650</a>)</li>
-          <li>Azure Functions: Support Windows arm64 Azure Core Tools (<a href="https://youtrack.jetbrains.com/issue/RIDER-85548">#RIDER-85548</a>)</li>
-          <li>Azure Functions: Select solution configuration per Publish to Azure run configuration (<a href="https://github.com/JetBrains/azure-tools-for-intellij/issues/678">#678</a>)</li>
-        </ul>
-        <h4>Fixed bugs:</h4>
-        <ul>
-          <li>Azure Functions: Make error -Specify a Node.js interpreter correctly- more clear when attempting to start Azurite (<a href="https://github.com/JetBrains/azure-tools-for-intellij/issues/680">#680</a>)</li>
-          <li>Azure Functions: Publish using wrong dotnet version (<a href="https://github.com/JetBrains/azure-tools-for-intellij/issues/661">#661</a>)</li>
-          <li>Rider 2023.1 EAP 1 makes corelibs.log grow infinitely (<a href="https://github.com/JetBrains/azure-tools-for-intellij/issues/657">#657</a>)</li>
-          <li>No icons shown for item templates in Rider 2023.1 (<a href="https://github.com/JetBrains/azure-tools-for-intellij/issues/663">#663</a>)</li>
-          <li>Unable to debug Azure Function in an isolated worker launched under Rosetta (<a href="https://youtrack.jetbrains.com/issue/RIDER-92326">#RIDER-92326</a>)</li>
-          <li>Azure Functions: Fix exception when Rider cannot find the Azurite executable (<a href="https://youtrack.jetbrains.com/issue/RIDER-92826">#RIDER-92826</a>)</li>
+          <li>Compatibility with Rider 2023.2</li>
         </ul>
     </html>
     ]]>

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

@@ -4,6 +4,7 @@
         <TargetFramework>net472</TargetFramework>
         <RootNamespace>JetBrains.ReSharper.Azure.Daemon</RootNamespace>
         <AssemblyName>JetBrains.ReSharper.Azure.Daemon</AssemblyName>
+        <LangVersion>8</LangVersion>
     </PropertyGroup>
 
     <ItemGroup>

PluginsAndFeatures/azure-toolkit-for-intellij/rider/ReSharper.Azure/src/Azure.Daemon/FunctionApp/FunctionAppDaemonHost.cs

@@ -25,7 +25,7 @@
 using JetBrains.ProjectModel.MSBuild;
 using JetBrains.ProjectModel.Properties;
 using JetBrains.Rd.Tasks;
-using JetBrains.RdBackend.Common.Features;
+using JetBrains.ReSharper.Feature.Services.Protocol;
 using JetBrains.ReSharper.Resources.Shell;
 using JetBrains.Rider.Azure.Model;
 using JetBrains.Util;
@@ -43,7 +43,7 @@ public FunctionAppDaemonHost(ISolution solution)
             _solution = solution;
 
             _model = solution.GetProtocolSolution().GetFunctionAppDaemonModel();
-            _model.GetAzureFunctionsVersion.Set(GetAzureFunctionsVersionHandler);
+            _model.GetAzureFunctionsVersion.SetRdTask(GetAzureFunctionsVersionHandler);
         }
 
         public void RunFunctionApp([NotNull] string projectFilePath) => _model.RunFunctionApp(
@@ -84,7 +84,7 @@ private RdTask<string> GetAzureFunctionsVersionHandler(Lifetime lifetime, AzureF
 
                 var azureFunctionsVersion = project?.GetRequestedProjectProperties(MSBuildProjectUtil.AzureFunctionsVersionProperty).FirstOrDefault();
 
-                return RdTask<string>.Successful(azureFunctionsVersion);
+                return RdTask.Successful(azureFunctionsVersion);
             }
         }
     }

PluginsAndFeatures/azure-toolkit-for-intellij/rider/ReSharper.Azure/src/Azure.Intellisense/FunctionApp/ProjectTemplates/DotNetExtensions/Parameters/AzureFunctionsHttpPortParameter.cs

@@ -31,7 +31,7 @@ internal class AzureFunctionsHttpPortParameter : DotNetTemplateParameter
         public AzureFunctionsHttpPortParameter() : base(
             name: "FunctionsHttpPort",
             presentableName: "HTTP port", 
-            tooltip: "Port number to use for the HTTP endpoint in launchSettings.json.")
+            tooltip: "Port number to use for the HTTP endpoint.")
         {
         }
 

PluginsAndFeatures/azure-toolkit-for-intellij/rider/build.gradle

@@ -1,3 +1,4 @@
+import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.jetbrains.intellij.tasks.PrepareSandboxTask
 
 sourceSets {
@@ -100,13 +101,14 @@ task integrationTest(type: Test) {
     environment("NO_FS_ROOTS_ACCESS_CHECK", true)
     useTestNG()
 
-    testClassesDirs = sourceSets.integrationTest.output.classesDirs
+    //testClassesDirs = sourceSets.integrationTest.output.classesDirs
     classpath = sourceSets.integrationTest.runtimeClasspath
 
     jvmArgs '--illegal-access=warn', '-Didea.force.use.core.classloader=true'
 
     testLogging {
         showStandardStreams = true
+        exceptionFormat = TestExceptionFormat.FULL
     }
 
     doFirst {

PluginsAndFeatures/azure-toolkit-for-intellij/rider/resources/META-INF/plugin.xml

@@ -23,6 +23,10 @@
   <change-notes>
     <![CDATA[
       <html>
+        <p>[3.50.0-2023.2]</p>
+        <ul>
+          <li>Compatibility with Rider 2023.2</li>
+        </ul>
         <p>[3.50.0-2023.1]</p>
         <ul>
           <li>Compatibility with Rider 2023.1</li>
@@ -274,7 +278,7 @@
   <xi:include href="/META-INF/platformPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
 
   <!-- please see https://confluence.jetbrains.com/display/IDEADEV/Build+Number+Ranges for description -->
-  <idea-version since-build="231" until-build="231.*"/>
+  <idea-version since-build="232" until-build="232.*"/>
 
   <resource-bundle>messages.RiderAzureMessages</resource-bundle>
 

PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/org/jetbrains/icons/RiderIconsPatcher.kt

@@ -20,12 +20,14 @@
  * SOFTWARE.
  */
 
+@file:Suppress("UnstableApiUsage")
+
 package org.jetbrains.icons
 
 import com.intellij.httpClient.RestClientIcons
-import com.intellij.openapi.util.CachedImageIcon
 import com.intellij.openapi.util.IconLoader
 import com.intellij.openapi.util.IconPathPatcher
+import com.intellij.ui.icons.CachedImageIcon
 import icons.CommonIcons
 import javax.swing.Icon
 

PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/org/jetbrains/plugins/azure/functions/run/AzureFunctionsDotNetCoreAttachSuspendedProfileState.kt

@@ -25,6 +25,7 @@ package org.jetbrains.plugins.azure.functions.run
 import com.intellij.execution.impl.ConsoleViewImpl
 import com.intellij.execution.runners.ExecutionEnvironment
 import com.jetbrains.rd.util.lifetime.Lifetime
+import com.jetbrains.rider.model.debuggerHelper.PlatformArchitecture
 import com.jetbrains.rider.model.debuggerWorker.DebuggerStartInfoBase
 import com.jetbrains.rider.model.debuggerWorker.DotNetCoreAttachSuspendedStartInfo
 import com.jetbrains.rider.run.dotNetCore.DotNetCoreAttachProfileState
@@ -34,8 +35,9 @@ class AzureFunctionsDotNetCoreAttachSuspendedProfileState(
         private val runtime: AzureFunctionsDotNetCoreRuntime,
         private val runningAssemblyInfo: RunningAssemblyInfo,
         environment: ExecutionEnvironment,
+        targetPlatform: PlatformArchitecture,
         private val consoleInitializer: (ConsoleViewImpl) -> Unit
-) : DotNetCoreAttachProfileState(runningAssemblyInfo.processInfo, environment) {
+) : DotNetCoreAttachProfileState(runningAssemblyInfo.processInfo, environment, targetPlatform) {
 
     override fun initializeConsole(consoleView: ConsoleViewImpl) = consoleInitializer(consoleView)