From 61c8b7ad7585b626fb61219748c993b5bb2b3ecf Mon Sep 17 00:00:00 2001 From: Hanxiao Liu Date: Mon, 9 Nov 2020 15:47:59 +0800 Subject: [PATCH] Fix issues found in end game (#4734) * Bump azure to 1.36.3 * Fix create VM next step button enable with wrong condition * Update whats new document * Update whats new document content --- .../ui/config/messages.properties | 2 +- .../wasdkjava/ui/classpath/messages.properties | 2 +- .../azuretools/core/utils/messages.properties | 2 +- .../resources/whatsnew/whatsnew.md | 14 +++++++++++++- .../com/microsoft/intellij/util/PluginHelper.java | 2 +- .../wizards/createarmvm/SelectImageStep.java | 4 ++++ Utils/pom.xml | 2 +- 7 files changed, 22 insertions(+), 6 deletions(-) diff --git a/PluginsAndFeatures/AddLibrary/AppInsights/com.microsoft.applicationinsights.ui/src/main/java/com/microsoft/applicationinsights/ui/config/messages.properties b/PluginsAndFeatures/AddLibrary/AppInsights/com.microsoft.applicationinsights.ui/src/main/java/com/microsoft/applicationinsights/ui/config/messages.properties index a2d6cd7ca3..0afc787233 100644 --- a/PluginsAndFeatures/AddLibrary/AppInsights/com.microsoft.applicationinsights.ui/src/main/java/com/microsoft/applicationinsights/ui/config/messages.properties +++ b/PluginsAndFeatures/AddLibrary/AppInsights/com.microsoft.applicationinsights.ui/src/main/java/com/microsoft/applicationinsights/ui/config/messages.properties @@ -14,7 +14,7 @@ depLocation=dependencies/ excp=Exception in getClasspathEntries azureSDKcontainerID=com.microsoft.azuretools.SDK_CONTAINER sdkID=com.microsoft.azuretools.sdk -sdkJar=dependencies/azure-1.36.2.jar +sdkJar=dependencies/azure-1.36.3.jar jstDep=org.eclipse.jst.component.dependency aiCheckBoxTxt=Enable telemetry with Application Insights webxmlPath=WebContent/WEB-INF/web.xml diff --git a/PluginsAndFeatures/AddLibrary/AzureLibraries/com.microsoft.azuretools.wasdkjava.ui/src/main/java/com/microsoft/azuretools/wasdkjava/ui/classpath/messages.properties b/PluginsAndFeatures/AddLibrary/AzureLibraries/com.microsoft.azuretools.wasdkjava.ui/src/main/java/com/microsoft/azuretools/wasdkjava/ui/classpath/messages.properties index 76d29787e2..4655da4c11 100644 --- a/PluginsAndFeatures/AddLibrary/AzureLibraries/com.microsoft.azuretools.wasdkjava.ui/src/main/java/com/microsoft/azuretools/wasdkjava/ui/classpath/messages.properties +++ b/PluginsAndFeatures/AddLibrary/AzureLibraries/com.microsoft.azuretools.wasdkjava.ui/src/main/java/com/microsoft/azuretools/wasdkjava/ui/classpath/messages.properties @@ -7,7 +7,7 @@ lblVersion=Version : libNotAvail=Library is not available. notFound=Not found sdkID=com.microsoft.azuretools.sdk -sdkJar=dependencies/azure-1.36.2.jar +sdkJar=dependencies/azure-1.36.3.jar title=Microsoft Azure Libraries for Java verNotAvail=The selected version is not available. version1=Microsoft Azure Libraries for Java, version %s.%s.%s diff --git a/PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.core/src/com/microsoft/azuretools/core/utils/messages.properties b/PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.core/src/com/microsoft/azuretools/core/utils/messages.properties index e6cf8a171c..4bc7b0a178 100644 --- a/PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.core/src/com/microsoft/azuretools/core/utils/messages.properties +++ b/PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.core/src/com/microsoft/azuretools/core/utils/messages.properties @@ -56,7 +56,7 @@ err=Error prefFileName=WAEclipsePlugin bundleName=org.eclipse.core.runtime sdkLibBundleName=com.microsoftopentechnologies.windowsazure.tools.sdk -sdkLibBaseJar=dependencies/azure-1.36.2.jar +sdkLibBaseJar=dependencies/azure-1.36.3.jar SDKLocErrMsg=Error occurred while retrieving path of Azure libraries resCLExWkspRfrsh=Exception while refresh of workspace. cmhLblStrgAcc=Storage Accounts diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/resources/whatsnew/whatsnew.md b/PluginsAndFeatures/azure-toolkit-for-intellij/resources/whatsnew/whatsnew.md index 6669476bda..37ea3b4e2d 100644 --- a/PluginsAndFeatures/azure-toolkit-for-intellij/resources/whatsnew/whatsnew.md +++ b/PluginsAndFeatures/azure-toolkit-for-intellij/resources/whatsnew/whatsnew.md @@ -1,7 +1,19 @@ - + # What's new in Azure Toolkit for IntelliJ ## 3.45.0 +Flight recorder support was added in the latest Azure Toolkit for IntelliJ v3.45.0! You may monitor your online app + service in Azure explorer with single click and analyze the report with [Zulu Mission Control](https://www.azul.com/products/zulu-mission-control/) or IntelliJ (requires 2020.2 above Ultimate). + + + +Besides, file explorer is also added to Azure explorer, you could view and manage your files and logs in app service + with this new feature. + +![File Explorer](https://user-images.githubusercontent.com/12445236/98444253-93bf8c80-214b-11eb-8759-8176b520d515.png) + +For all the updates and fixes in this release, please refer the release notes below. + ### Added - Add file explorer for Web App and Function App in Azure explorer - Support flight recorder for Web App diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/util/PluginHelper.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/util/PluginHelper.java index 49546d3f86..3fb9d1fcc9 100644 --- a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/util/PluginHelper.java +++ b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/util/PluginHelper.java @@ -29,7 +29,7 @@ public class PluginHelper { - private static final String AZURE_ARTIFACT = "azure-1.36.2.jar"; + private static final String AZURE_ARTIFACT = "azure-1.36.3.jar"; /** * @return resource filename in plugin's directory diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/wizards/createarmvm/SelectImageStep.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/wizards/createarmvm/SelectImageStep.java index 8f46596af9..060afd2889 100644 --- a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/wizards/createarmvm/SelectImageStep.java +++ b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/wizards/createarmvm/SelectImageStep.java @@ -262,6 +262,10 @@ public JComponent prepare(WizardNavigationState wizardNavigationState) { fillRegions(); } } + if ((knownImageBtn.isSelected() && knownImageComboBox.getSelectedItem() == null) || + (customImageBtn.isSelected() && imageLabelList.getSelectedValue() == null)) { + disableNext(); + } return rootPanel; } diff --git a/Utils/pom.xml b/Utils/pom.xml index 47f35552ca..5937357aeb 100644 --- a/Utils/pom.xml +++ b/Utils/pom.xml @@ -36,7 +36,7 @@ 1.3.72 1.8 2.11.1 - 1.36.2 + 1.36.3 8.16.0 1.7.5 8.6.4