diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/.idea/gradle.xml b/PluginsAndFeatures/azure-toolkit-for-intellij/.idea/gradle.xml
index 3c68121528..a81ccaebf8 100644
--- a/PluginsAndFeatures/azure-toolkit-for-intellij/.idea/gradle.xml
+++ b/PluginsAndFeatures/azure-toolkit-for-intellij/.idea/gradle.xml
@@ -4,8 +4,17 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="delegatedBuild" value="true" />
-        <option name="testRunner" value="GRADLE" />
+        <compositeConfiguration>
+          <compositeBuild compositeDefinitionSource="SCRIPT">
+            <builds>
+              <build path="$PROJECT_DIR$/buildSrc" name="buildSrc">
+                <projects>
+                  <project path="$PROJECT_DIR$/buildSrc" />
+                </projects>
+              </build>
+            </builds>
+          </compositeBuild>
+        </compositeConfiguration>
         <option name="distributionType" value="WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/gradle.properties b/PluginsAndFeatures/azure-toolkit-for-intellij/gradle.properties
index 17b74563f0..ab6c2bfaf6 100644
--- a/PluginsAndFeatures/azure-toolkit-for-intellij/gradle.properties
+++ b/PluginsAndFeatures/azure-toolkit-for-intellij/gradle.properties
@@ -5,7 +5,7 @@ org.gradle.jvmargs='-Duser.language=en'
 sources=false
 
 intellij_version=IC-232.6095-EAP-CANDIDATE-SNAPSHOT
-rider_version=RD-2023.2-EAP5-SNAPSHOT
+rider_version=RD-2023.2-EAP6-SNAPSHOT
 #rider_version=RD-2023.1
 build_common_code_with=rider
 intellij_plugin_name=azure-toolkit-for-intellij
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/com/microsoft/intellij/runner/functionapp/config/ui/PublishFunctionAppPanel.kt b/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/com/microsoft/intellij/runner/functionapp/config/ui/PublishFunctionAppPanel.kt
index 33b88f5b1a..a1159f3d87 100644
--- a/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/com/microsoft/intellij/runner/functionapp/config/ui/PublishFunctionAppPanel.kt
+++ b/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/com/microsoft/intellij/runner/functionapp/config/ui/PublishFunctionAppPanel.kt
@@ -106,7 +106,7 @@ class PublishFunctionAppPanel(private val lifetime: Lifetime,
             add(tpRoot, "growx")
         }
 
-        UiNotifyConnector.Once(mainPanel, this)
+        UiNotifyConnector.Once.installOn(mainPanel, this)
 
         presenter.onAttachView(this)
 
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/com/microsoft/intellij/runner/webapp/config/ui/WebAppPublishPanel.kt b/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/com/microsoft/intellij/runner/webapp/config/ui/WebAppPublishPanel.kt
index af94747f0b..72dfd6e260 100644
--- a/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/com/microsoft/intellij/runner/webapp/config/ui/WebAppPublishPanel.kt
+++ b/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/com/microsoft/intellij/runner/webapp/config/ui/WebAppPublishPanel.kt
@@ -105,7 +105,7 @@ class WebAppPublishPanel(private val lifetime: Lifetime,
             add(tpRoot, "growx")
         }
 
-        UiNotifyConnector.Once(mainPanel, this)
+        UiNotifyConnector.Once.installOn(mainPanel, this)
 
         presenter.onAttachView(this)
 
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/com/microsoft/intellij/ui/component/PublishableProjectComponent.kt b/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/com/microsoft/intellij/ui/component/PublishableProjectComponent.kt
index befcf1346f..cdfbe7384b 100644
--- a/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/com/microsoft/intellij/ui/component/PublishableProjectComponent.kt
+++ b/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/com/microsoft/intellij/ui/component/PublishableProjectComponent.kt
@@ -30,7 +30,7 @@ import com.intellij.openapi.ui.ComboBox
 import com.intellij.openapi.util.IconLoader
 import com.intellij.ui.LayeredIcon
 import com.intellij.ui.SimpleListCellRenderer
-import com.intellij.workspaceModel.ide.WorkspaceModel
+import com.intellij.platform.backend.workspace.WorkspaceModel
 import com.jetbrains.rider.model.PublishableProjectModel
 import com.jetbrains.rider.projectView.calculateIcon
 import com.jetbrains.rider.projectView.workspace.getProjectModelEntities
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/com/microsoft/intellij/ui/forms/appservice/functionapp/CreateFunctionAppDialog.kt b/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/com/microsoft/intellij/ui/forms/appservice/functionapp/CreateFunctionAppDialog.kt
index 02ddb311af..705cc85058 100644
--- a/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/com/microsoft/intellij/ui/forms/appservice/functionapp/CreateFunctionAppDialog.kt
+++ b/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/com/microsoft/intellij/ui/forms/appservice/functionapp/CreateFunctionAppDialog.kt
@@ -229,7 +229,7 @@ class CreateFunctionAppDialog(lifetimeDef: LifetimeDefinition,
     private fun initMainPanel() {
         panel.add(pnlCreate, "growx")
 
-        UiNotifyConnector.Once(panel, object : Activatable {
+        UiNotifyConnector.Once.installOn(panel, object : Activatable {
             override fun showNotify() {
                 presenter.onLoadSubscription(lifetimeDef)
                 presenter.onLoadPricingTier(lifetimeDef)
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/com/microsoft/intellij/ui/forms/appservice/webapp/CreateWebAppDialog.kt b/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/com/microsoft/intellij/ui/forms/appservice/webapp/CreateWebAppDialog.kt
index 69a623461e..836d7e1600 100644
--- a/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/com/microsoft/intellij/ui/forms/appservice/webapp/CreateWebAppDialog.kt
+++ b/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/com/microsoft/intellij/ui/forms/appservice/webapp/CreateWebAppDialog.kt
@@ -214,7 +214,7 @@ class CreateWebAppDialog(lifetimeDef: LifetimeDefinition,
     private fun initMainPanel() {
         panel.add(pnlCreate, "growx")
 
-        UiNotifyConnector.Once(panel, object : Activatable {
+        UiNotifyConnector.Once.installOn(panel, object : Activatable {
             override fun showNotify() {
                 presenter.onLoadSubscription(lifetimeDef)
                 presenter.onLoadPricingTier(lifetimeDef)
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/com/microsoft/intellij/ui/forms/sqldatabase/CreateSqlDatabaseOnServerDialog.kt b/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/com/microsoft/intellij/ui/forms/sqldatabase/CreateSqlDatabaseOnServerDialog.kt
index f9e82ba9e0..226a1706b9 100644
--- a/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/com/microsoft/intellij/ui/forms/sqldatabase/CreateSqlDatabaseOnServerDialog.kt
+++ b/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/com/microsoft/intellij/ui/forms/sqldatabase/CreateSqlDatabaseOnServerDialog.kt
@@ -194,7 +194,7 @@ class CreateSqlDatabaseOnServerDialog(lifetimeDef: LifetimeDefinition,
     private fun initMainPanel() {
         panel.add(pnlCreate, "growx")
 
-        UiNotifyConnector.Once(panel, object : Activatable {
+        UiNotifyConnector.Once.installOn(panel, object : Activatable {
             override fun showNotify() {
                 presenter.onLoadSubscription(lifetimeDef)
                 presenter.onLoadComputeSize()
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/com/microsoft/intellij/ui/forms/sqlserver/CreateSqlServerDialog.kt b/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/com/microsoft/intellij/ui/forms/sqlserver/CreateSqlServerDialog.kt
index 39d77b4eeb..0d1e7ac697 100644
--- a/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/com/microsoft/intellij/ui/forms/sqlserver/CreateSqlServerDialog.kt
+++ b/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/com/microsoft/intellij/ui/forms/sqlserver/CreateSqlServerDialog.kt
@@ -216,7 +216,7 @@ class CreateSqlServerDialog(lifetimeDef: LifetimeDefinition,
     private fun initMainPanel() {
         panel.add(pnlCreate, "growx")
 
-        UiNotifyConnector.Once(panel, object : Activatable {
+        UiNotifyConnector.Once.installOn(panel, object : Activatable {
             override fun showNotify() {
                 presenter.onLoadSubscription(lifetimeDef)
             }
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/org/jetbrains/plugins/azure/functions/AzureCoreToolsMissingNupkgInstaller.kt b/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/org/jetbrains/plugins/azure/functions/AzureCoreToolsMissingNupkgInstaller.kt
index bbf88c4732..e939a2905e 100644
--- a/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/org/jetbrains/plugins/azure/functions/AzureCoreToolsMissingNupkgInstaller.kt
+++ b/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/org/jetbrains/plugins/azure/functions/AzureCoreToolsMissingNupkgInstaller.kt
@@ -32,7 +32,7 @@ import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.ui.EditorNotificationPanel
 import com.intellij.ui.EditorNotificationProvider
 import com.intellij.ui.EditorNotifications
-import com.intellij.workspaceModel.ide.WorkspaceModel
+import com.intellij.platform.backend.workspace.WorkspaceModel
 import com.jetbrains.rd.util.firstOrNull
 import com.jetbrains.rdclient.util.idea.pumpMessages
 import com.jetbrains.rider.nuget.RiderNuGetFacade
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/org/jetbrains/plugins/azure/functions/run/AzureFunctionsHostConfigurationParameters.kt b/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/org/jetbrains/plugins/azure/functions/run/AzureFunctionsHostConfigurationParameters.kt
index 7cc5875b87..6c28d048ce 100644
--- a/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/org/jetbrains/plugins/azure/functions/run/AzureFunctionsHostConfigurationParameters.kt
+++ b/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/org/jetbrains/plugins/azure/functions/run/AzureFunctionsHostConfigurationParameters.kt
@@ -36,7 +36,7 @@ import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.JDOMExternalizerUtil
 import com.intellij.util.execution.ParametersListUtil
-import com.intellij.workspaceModel.ide.WorkspaceModel
+import com.intellij.platform.backend.workspace.WorkspaceModel
 import com.jetbrains.rider.model.ProjectOutput
 import com.jetbrains.rider.model.RunnableProject
 import com.jetbrains.rider.model.RunnableProjectKind
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/org/jetbrains/plugins/azure/functions/run/AzureFunctionsIsolatedDebugProfile.kt b/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/org/jetbrains/plugins/azure/functions/run/AzureFunctionsIsolatedDebugProfile.kt
index 8ba5229a52..71c9858f7f 100644
--- a/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/org/jetbrains/plugins/azure/functions/run/AzureFunctionsIsolatedDebugProfile.kt
+++ b/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/org/jetbrains/plugins/azure/functions/run/AzureFunctionsIsolatedDebugProfile.kt
@@ -141,7 +141,7 @@ class AzureFunctionsIsolatedDebugProfile(
                 .getProcessArchitecture(lifetime, processId)
         val processTargetFramework = processExecutablePath?.let {
             DebuggerHelperHost.getInstance(executionEnvironment.project)
-                    .getAssemblyTargetFramework(processExecutablePath!!, lifetime)
+                    .getAssemblyTargetFramework(it, lifetime)
         }
 
         isNetFrameworkProcess = processExecutablePath?.endsWith("dotnet.exe") == false && (processTargetFramework?.isNetFramework ?: false)
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/org/jetbrains/plugins/azure/identity/ad/actions/RegisterApplicationInAzureAdAction.kt b/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/org/jetbrains/plugins/azure/identity/ad/actions/RegisterApplicationInAzureAdAction.kt
index 8150194c63..b61c907145 100644
--- a/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/org/jetbrains/plugins/azure/identity/ad/actions/RegisterApplicationInAzureAdAction.kt
+++ b/PluginsAndFeatures/azure-toolkit-for-intellij/rider/src/org/jetbrains/plugins/azure/identity/ad/actions/RegisterApplicationInAzureAdAction.kt
@@ -38,8 +38,8 @@ import com.intellij.openapi.ui.popup.JBPopupFactory
 import com.intellij.openapi.ui.popup.PopupStep
 import com.intellij.openapi.ui.popup.util.BaseListPopupStep
 import com.intellij.openapi.vfs.VirtualFile
-import com.intellij.workspaceModel.ide.WorkspaceModel
-import com.intellij.workspaceModel.ide.virtualFile
+import com.intellij.platform.backend.workspace.WorkspaceModel
+import com.intellij.platform.backend.workspace.virtualFile
 import com.jetbrains.rider.projectView.workspace.ProjectModelEntity
 import com.jetbrains.rider.projectView.workspace.containingProjectEntity
 import com.jetbrains.rider.projectView.workspace.getProjectModelEntities