Merge branch 'endgame-202206' into endgame-202206.next

Author: wangmingliang-ms

PluginsAndFeatures/AddLibrary/AzureLibraries/pom.xml

@@ -41,7 +41,7 @@
   <properties>
     <azuretool.version>3.66.0</azuretool.version>
     <azuretool.sdk.version>3.32.0.qualifier</azuretool.sdk.version>
-    <azure.toolkit-lib.version>0.22.0</azure.toolkit-lib.version>
+    <azure.toolkit-lib.version>0.22.1</azure.toolkit-lib.version>
   </properties>
   <dependencyManagement>
     <dependencies>

PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.appservice/META-INF/MANIFEST.MF

@@ -54,4 +54,4 @@ Export-Package: com.microsoft.azuretools.appservice,
  com.microsoft.azuretools.appservice.handlers,
  com.microsoft.azuretools.appservice.ui
 Bundle-ClassPath: .,
- target/lib/azure-toolkit-ide-appservice-lib-0.22.0.jar
+ target/lib/azure-toolkit-ide-appservice-lib-0.22.1.jar

PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.appservice/pom.xml

@@ -13,7 +13,7 @@
     <dependency>
       <groupId>com.microsoft.azure</groupId>
       <artifactId>azure-toolkit-ide-appservice-lib</artifactId>
-      <version>0.22.0</version>
+      <version>0.22.1</version>
     </dependency>
   </dependencies>
   <repositories>

PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.springcloud/META-INF/MANIFEST.MF

@@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.ui,
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .,
- target/lib/azure-toolkit-ide-springcloud-lib-0.22.0.jar
+ target/lib/azure-toolkit-ide-springcloud-lib-0.22.1.jar
 Import-Package: com.microsoft.azuretools.core.actions,
  org.eclipse.core.expressions,
  org.eclipse.jface.text.hyperlink,

PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.springcloud/pom.xml

@@ -13,7 +13,7 @@
     <dependency>
       <groupId>com.microsoft.azure</groupId>
       <artifactId>azure-toolkit-ide-springcloud-lib</artifactId>
-      <version>0.22.0</version>
+      <version>0.22.1</version>
     </dependency>
   </dependencies>
   <build>

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-base/build.gradle

@@ -4,7 +4,7 @@ plugins {
     id "io.freefair.aspectj.post-compile-weaving" version "6.0.0-m2"
 }
 ext {
-    azureToolkitVersion = "0.22.0"
+    azureToolkitVersion = "0.22.1"
 }
 group 'com.microsoft.azure.toolkit'
 apply plugin: 'java'
@@ -75,7 +75,7 @@ subprojects {
     apply plugin: 'io.freefair.aspectj.post-compile-weaving'
     apply plugin: 'io.spring.dependency-management'
     ext {
-        azureToolkitVersion = "0.22.0"
+        azureToolkitVersion = "0.22.1"
     }
 
     sourceCompatibility = javaVersion

PluginsAndFeatures/azure-toolkit-for-intellij/build.gradle

@@ -8,7 +8,7 @@ plugins {
 }
 
 ext {
-    azureToolkitVersion = "0.22.0"
+    azureToolkitVersion = "0.22.1"
     azureToolkitUtilsVersion = "3.66.0"
 }
 
@@ -82,7 +82,7 @@ subprojects {
     apply plugin: 'io.freefair.aspectj.post-compile-weaving'
     apply plugin: 'io.spring.dependency-management'
     ext {
-        azureToolkitVersion = "0.22.0"
+        azureToolkitVersion = "0.22.1"
         azureToolkitUtilsVersion = "3.66.0"
     }
 

Utils/azure-toolkit-ide-libs/azure-toolkit-ide-applicationinsights-lib/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>azure-toolkit-ide-libs</artifactId>
         <groupId>com.microsoft.azure</groupId>
-        <version>0.22.0</version>
+        <version>0.22.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

Utils/azure-toolkit-ide-libs/azure-toolkit-ide-appservice-lib/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>azure-toolkit-ide-libs</artifactId>
         <groupId>com.microsoft.azure</groupId>
-        <version>0.22.0</version>
+        <version>0.22.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

Utils/azure-toolkit-ide-libs/azure-toolkit-ide-appservice-lib/src/main/java/com/microsoft/tooling/msservices/serviceexplorer/azure/webapp/base/WebAppBasePropertyViewPresenter.java

@@ -175,6 +175,6 @@ protected void sendTelemetry(@Nonnull final String actionName, @Nonnull final Ma
         }
         telemetryMap.put("operationName", actionName);
         telemetryMap.put("serviceName", "WebApp");
-        AzureTelemeter.log(AzureTelemetry.Type.INFO, telemetryMap);
+        AzureTelemeter.log(AzureTelemetry.Type.OP_END, telemetryMap);
     }
 }