Merge pull request #707 from JetBrains/232-mb-681

Azure Web App/Function App Deployments not working without solution file #681
JetBrains · Aug 9, 2023 · 243d030 · 243d030
2 parents 30b099d + b086a76
commit 243d030
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/resources/META-INF/platformPlugin.xml b/PluginsAndFeatures/azure-toolkit-for-intellij/resources/META-INF/platformPlugin.xml
@@ -10,6 +10,10 @@
           <li>Azure Functions: Support debugging .NET 4.8 isolated worker projects (<a href="https://github.com/JetBrains/azure-tools-for-intellij/issues/691">#691</a>)</li>
           <li>Update Azure logo for Rider's Azure Toolkit icons (<a href="https://youtrack.jetbrains.com/issue/RIDER-78226">RIDER-78226</a>)</li>
         </ul>
+        <h4>Fixed bugs:</h4>
+        <ul>
+          <li>Azure Web App/Function App Deployments not working without solution file (<a href="https://github.com/JetBrains/azure-tools-for-intellij/issues/681">#681</a>)</li>
+        </ul>
     </html>
     ]]>
   </change-notes>

diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/rider/resources/META-INF/plugin.xml b/PluginsAndFeatures/azure-toolkit-for-intellij/rider/resources/META-INF/plugin.xml
@@ -29,6 +29,10 @@
           <li>Azure Functions: Support debugging .NET 4.8 isolated worker projects (<a href="https://github.com/JetBrains/azure-tools-for-intellij/issues/691">#691</a>)</li>
           <li>Update Azure logo for Rider's Azure Toolkit icons (<a href="https://youtrack.jetbrains.com/issue/RIDER-78226">RIDER-78226</a>)</li>
         </ul>
+        <h4>Fixed bugs:</h4>
+        <ul>
+          <li>Azure Web App/Function App Deployments not working without solution file (<a href="https://github.com/JetBrains/azure-tools-for-intellij/issues/681">#681</a>)</li>
+        </ul>
         <p>[3.50.0-2023.1]</p>
         <ul>
           <li>Compatibility with Rider 2023.1</li>

diff --git a/...om/microsoft/intellij/ui/component/PublishableProjectConfigurationAndPlatformComponent.kt b/...om/microsoft/intellij/ui/component/PublishableProjectConfigurationAndPlatformComponent.kt
@@ -44,11 +44,11 @@ class PublishableProjectConfigurationAndPlatformComponent(private val project: P
         add(cbConfigurationAndPlatform, "growx")
     }
 
-    fun getSelectedConfiguration() = getSelectedConfigurationAndPlatform().configuration
-    fun getSelectedPlatform() = getSelectedConfigurationAndPlatform().platform
+    fun getSelectedConfiguration() = getSelectedConfigurationAndPlatform()?.configuration ?: ""
+    fun getSelectedPlatform() = getSelectedConfigurationAndPlatform()?.platform ?: ""
 
-    private fun getSelectedConfigurationAndPlatform() : PublishRuntimeSettingsCoreHelper.ConfigurationAndPlatform =
-            cbConfigurationAndPlatform.component.selectedItem as PublishRuntimeSettingsCoreHelper.ConfigurationAndPlatform
+    private fun getSelectedConfigurationAndPlatform() : PublishRuntimeSettingsCoreHelper.ConfigurationAndPlatform? =
+            cbConfigurationAndPlatform.component.selectedItem as? PublishRuntimeSettingsCoreHelper.ConfigurationAndPlatform
 
     fun setSelectedConfigurationAndPlatform(configuration: String, platform: String) {
         cbConfigurationAndPlatform.component.model