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
microsoft · Nov 9, 2020 · 61c8b7a · 61c8b7a
1 parent 943901a
commit 61c8b7a
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 6 deletions.
diff --git a/...insights.ui/src/main/java/com/microsoft/applicationinsights/ui/config/messages.properties b/...insights.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/...java.ui/src/main/java/com/microsoft/azuretools/wasdkjava/ui/classpath/messages.properties b/...java.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/...com.microsoft.azuretools.core/src/com/microsoft/azuretools/core/utils/messages.properties b/...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
@@ -1,7 +1,19 @@
-<!-- Version: 3.44.0 -->
+<!-- Version: 3.45.0 -->
 # 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).
+
+<img src="https://user-images.githubusercontent.com/12445236/98444079-b0a79000-214a-11eb-8015-51cd2a05a1c1.gif" width="800" height="600" />
+
+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/...sAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/util/PluginHelper.java b/...sAndFeatures/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/...-toolkit-for-intellij/src/com/microsoft/intellij/wizards/createarmvm/SelectImageStep.java b/...-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
@@ -36,7 +36,7 @@
         <kotlin.version>1.3.72</kotlin.version>
         <kotlin.jvmTargetVersion>1.8</kotlin.jvmTargetVersion>
         <jackson.version>2.11.1</jackson.version>
-        <azure.version>1.36.2</azure.version>
+        <azure.version>1.36.3</azure.version>
         <docker.client.version>8.16.0</docker.client.version>
         <azure.client.version>1.7.5</azure.client.version>
         <azure.storage.version>8.6.4</azure.storage.version>