Merge pull request #798 from JetBrains/241.ra/target-eap6

Target 2024.1 EAP 6

BuildPlugin

@@ -38,7 +38,7 @@ tc_open "Initializing build script"
     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=2024.1.4
+    IJ_SCALA_VERSION_LATEST=2024.1.6
 
     while getopts ":hqvBC:e:" option; do
         case $option in

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

@@ -5,16 +5,16 @@ org.gradle.jvmargs='-Duser.language=en'
 sources=false
 
 #https://www.jetbrains.com/intellij-repository/snapshots
-intellij_version=IC-241.12662-EAP-CANDIDATE-SNAPSHOT
-rider_version=RD-2024.1-SNAPSHOT
+intellij_version=IC-241.14024-EAP-CANDIDATE-SNAPSHOT
+rider_version=RD-2024.1-EAP6-SNAPSHOT
 #rider_version=RD-2023.3
 build_common_code_with=rider
 intellij_plugin_name=azure-toolkit-for-intellij
 rider_plugin_name=azure-toolkit-for-rider
 rider_backend_build_configuration=Debug
 
 #https://plugins.jetbrains.com/plugin/1347-scala/versions/stable
-dep_plugins=org.intellij.scala:2024.1.4
+dep_plugins=org.intellij.scala:2024.1.6
 applicationinsights.key=57cc111a-36a8-44b3-b044-25d293b8b77c
 
 updateVersionRange=false
@@ -33,7 +33,7 @@ aspectj_version=6.6.1
 aspectj_tools_version=1.9.19
 
 #https://central.sonatype.com/artifact/com.jetbrains.rd/rd-gen
-rd_version=2023.3.2
+rd_version=2024.1.1
 
 rider_test_local_env_run=true
 

PluginsAndFeatures/azure-toolkit-for-intellij/resources/AzureIconMappings.json

@@ -0,0 +1,9 @@
+{
+  "icons": {
+    "expui": {
+      "Rider": {
+        "AzureToolWindow.svg": "icons/ToolWindow/AzureToolWindow.svg"
+      }
+    }
+  }
+}

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

@@ -8,6 +8,8 @@
         <ul>
           <li>Compatibility with Rider 2024.1</li>
           <li>Enable "Start Azurite" task for all run configurations (<a href="https://github.com/JetBrains/azure-tools-for-intellij/issues/780">#780</a>)</li>
+          <li>New Azure Explorer icon</li>
+          <li>Support for the New Solution dialog (<a href="https://github.com/JetBrains/azure-tools-for-intellij/issues/793">#793</a>)</li>
         </ul>
     </html>
     ]]>
@@ -71,6 +73,7 @@
     <completion.contributor language="JSON" order="first"
                             implementationClass="com.microsoft.intellij.language.arm.codeinsight.ARMCompletionContributor"/>
 
+      <iconMapper mappingFile="AzureIconMappings.json"/>
   </extensions>
 
   <extensions defaultExtensionNs="com.microsoft.intellij">

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

@@ -27,6 +27,8 @@
         <ul>
           <li>Compatibility with Rider 2024.1</li>
           <li>Enable "Start Azurite" task for all run configurations (<a href="https://github.com/JetBrains/azure-tools-for-intellij/issues/780">#780</a>)</li>
+          <li>New Azure Explorer icon</li>
+          <li>Support for the New Solution dialog (<a href="https://github.com/JetBrains/azure-tools-for-intellij/issues/793">#793</a>)</li>
         </ul>
         <p>[3.50.0-2023.3]</p>
         <ul>

PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/org/jetbrains/plugins/azure/functions/projectTemplating/FunctionsCoreToolsTemplateCustomizer.kt

@@ -77,6 +77,7 @@ class AzureProjectTemplateType : PredefinedProjectTemplateType() {
             return template.id
         }
 
-        override fun typeComparator(): Comparator<String> = compareBy ({ !it.contains(isolatedWorker, true) }, { it })
+        //todo: uncomment in EAP 7
+        //override fun typeComparator(): Comparator<String> = compareBy ({ !it.contains(isolatedWorker, true) }, { it })
     }
 }