From b086a762e1cccdd021015fa49504069e1630051d Mon Sep 17 00:00:00 2001
From: Maarten Balliauw <maarten@maartenballiauw.be>
Date: Tue, 8 Aug 2023 21:25:54 +0200
Subject: [PATCH] Azure Web App/Function App Deployments not working without
 solution file #681

---
 .../resources/META-INF/platformPlugin.xml                 | 4 ++++
 .../rider/resources/META-INF/plugin.xml                   | 4 ++++
 ...PublishableProjectConfigurationAndPlatformComponent.kt | 8 ++++----
 3 files changed, 12 insertions(+), 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
index 24e5a72ede..d94e67ccf9 100644
--- 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
index 83bd3c8c78..566fad4ad7 100644
--- 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/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/com/microsoft/intellij/ui/component/PublishableProjectConfigurationAndPlatformComponent.kt b/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/com/microsoft/intellij/ui/component/PublishableProjectConfigurationAndPlatformComponent.kt
index 609fbc4aba..3517cecde7 100644
--- a/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/com/microsoft/intellij/ui/component/PublishableProjectConfigurationAndPlatformComponent.kt
+++ b/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/com/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