Fix SF powershell and compose deploy tasks (#7538)

microsoft · Jun 21, 2018 · 9385eab · 9385eab
1 parent 9cf6210
commit 9385eab
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 4 deletions.
diff --git a/Tasks/ServiceFabricComposeDeployV0/ServiceFabricComposeDeploy.ps1 b/Tasks/ServiceFabricComposeDeployV0/ServiceFabricComposeDeploy.ps1
@@ -5,6 +5,8 @@
 param()
 
 Trace-VstsEnteringInvocation $MyInvocation
+Import-Module $PSScriptRoot\ps_modules\TelemetryHelper
+
 try
 {
     # Import the localized strings.
@@ -273,6 +275,12 @@ try
     }
 
 }
+catch
+{
+    $exceptionData = Get-ExceptionData $_
+    Write-Telemetry "Task_InternalError" "$global:operationId|$exceptionData"
+    throw
+}
 finally
 {
     Trace-VstsLeavingInvocation $MyInvocation

diff --git a/Tasks/ServiceFabricComposeDeployV0/task.json b/Tasks/ServiceFabricComposeDeployV0/task.json
@@ -17,7 +17,7 @@
     "version": {
         "Major": 0,
         "Minor": 3,
-        "Patch": 1
+        "Patch": 2
     },
     "demands": [
         "Cmd"

diff --git a/Tasks/ServiceFabricComposeDeployV0/task.loc.json b/Tasks/ServiceFabricComposeDeployV0/task.loc.json
@@ -17,7 +17,7 @@
   "version": {
     "Major": 0,
     "Minor": 3,
-    "Patch": 1
+    "Patch": 2
   },
   "demands": [
     "Cmd"

diff --git a/Tasks/ServiceFabricPowerShellV1/ServiceFabricPowerShell.ps1 b/Tasks/ServiceFabricPowerShellV1/ServiceFabricPowerShell.ps1
@@ -25,6 +25,8 @@ if ($scriptArguments -match '[\r\n]')
     throw (Get-VstsLocString -Key InvalidScriptArguments0 -ArgumentList $scriptArguments)
 }
 
+Import-Module $PSScriptRoot\ps_modules\TelemetryHelper
+
 try
 {
     # Initialize Service Fabric.

diff --git a/Tasks/ServiceFabricPowerShellV1/task.json b/Tasks/ServiceFabricPowerShellV1/task.json
@@ -17,7 +17,7 @@
     "version": {
         "Major": 1,
         "Minor": 0,
-        "Patch": 10
+        "Patch": 11
     },
     "demands": [
         "Cmd"

diff --git a/Tasks/ServiceFabricPowerShellV1/task.loc.json b/Tasks/ServiceFabricPowerShellV1/task.loc.json
@@ -17,7 +17,7 @@
   "version": {
     "Major": 1,
     "Minor": 0,
-    "Patch": 10
+    "Patch": 11
   },
   "demands": [
     "Cmd"
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,6 +25,8 @@ if ($scriptArguments -match '[\r\n]') @@
         throw (Get-VstsLocString -Key InvalidScriptArguments0 -ArgumentList $scriptArguments)
     }
+    Import-Module $PSScriptRoot\ps_modules\TelemetryHelper
     try
     {
         # Initialize Service Fabric.
@@ Expand Down @@