Merge pull request #693 from JetBrains/232-mb-eap6

Bump to 2023.2 EAP6
JetBrains · Jun 27, 2023 · 5df2a61 · 5df2a61
2 parents 51240ea + e1ae142
commit 5df2a61
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 15 deletions.
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/.idea/gradle.xml b/PluginsAndFeatures/azure-toolkit-for-intellij/.idea/gradle.xml
diff --git 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/.../rider/src/com/microsoft/intellij/runner/functionapp/config/ui/PublishFunctionAppPanel.kt b/.../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/...r-intellij/rider/src/com/microsoft/intellij/runner/webapp/config/ui/WebAppPublishPanel.kt b/...r-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/...for-intellij/rider/src/com/microsoft/intellij/ui/component/PublishableProjectComponent.kt b/...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/...der/src/com/microsoft/intellij/ui/forms/appservice/functionapp/CreateFunctionAppDialog.kt b/...der/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/...ntellij/rider/src/com/microsoft/intellij/ui/forms/appservice/webapp/CreateWebAppDialog.kt b/...ntellij/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/.../rider/src/com/microsoft/intellij/ui/forms/sqldatabase/CreateSqlDatabaseOnServerDialog.kt b/.../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/...for-intellij/rider/src/com/microsoft/intellij/ui/forms/sqlserver/CreateSqlServerDialog.kt b/...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/...ij/rider/src/org/jetbrains/plugins/azure/functions/AzureCoreToolsMissingNupkgInstaller.kt b/...ij/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/...rc/org/jetbrains/plugins/azure/functions/run/AzureFunctionsHostConfigurationParameters.kt b/...rc/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/...rider/src/org/jetbrains/plugins/azure/functions/run/AzureFunctionsIsolatedDebugProfile.kt b/...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/...src/org/jetbrains/plugins/azure/identity/ad/actions/RegisterApplicationInAzureAdAction.kt b/...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