From 6b90ad26e0f68a3c628bd23056818748d9487b24 Mon Sep 17 00:00:00 2001 From: Vineet Date: Tue, 2 Mar 2021 12:17:55 +0530 Subject: [PATCH 1/7] Fix Powershell null assignment error https://github.com/microsoft/azure-pipelines-tasks/issues/14486 --- .../ServiceFabricHelpers/Get-ServiceFabricEncryptedText.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tasks/Common/ServiceFabricHelpers/Get-ServiceFabricEncryptedText.ps1 b/Tasks/Common/ServiceFabricHelpers/Get-ServiceFabricEncryptedText.ps1 index d7166b02f8ed..d225379831d0 100644 --- a/Tasks/Common/ServiceFabricHelpers/Get-ServiceFabricEncryptedText.ps1 +++ b/Tasks/Common/ServiceFabricHelpers/Get-ServiceFabricEncryptedText.ps1 @@ -79,7 +79,7 @@ function Get-ServerCertThumbprints { $ClusterConnectionParameters ) - $serverCertThumbprints = null; + $serverCertThumbprints = $null; if ($ClusterConnectionParameters["ServerCommonName"]) { @@ -114,4 +114,4 @@ function Get-ServerCertThumbprints { } return $serverCertThumbprints -} \ No newline at end of file +} From f67d6ad4bd1f6be96ce5068d1bd122c60eb8ad0b Mon Sep 17 00:00:00 2001 From: Vineet Date: Tue, 2 Mar 2021 12:44:40 +0530 Subject: [PATCH 2/7] Update task.json --- Tasks/ServiceFabricComposeDeployV0/task.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tasks/ServiceFabricComposeDeployV0/task.json b/Tasks/ServiceFabricComposeDeployV0/task.json index 343bab9b05ca..7b5d201d4276 100644 --- a/Tasks/ServiceFabricComposeDeployV0/task.json +++ b/Tasks/ServiceFabricComposeDeployV0/task.json @@ -18,7 +18,7 @@ "version": { "Major": 0, "Minor": 5, - "Patch": 3 + "Patch": 4 }, "demands": [ "Cmd" @@ -199,4 +199,4 @@ "InvalidApplicationNameWarning": "Latest Service Fabric has stopped supporting compose application name starting with 'fabric:/' and hence compose deployment might fail with ServiceDnsName error for application name '{0}'. You can provide a different application name and re-run if required.", "UpgradeInProgress": "An upgrade for the application '{0}' is already in progress." } -} \ No newline at end of file +} From 360fa7fafa3008607b518e3d036106d45efb76b4 Mon Sep 17 00:00:00 2001 From: Vineet Date: Tue, 2 Mar 2021 12:45:21 +0530 Subject: [PATCH 3/7] Update task.loc.json --- Tasks/ServiceFabricComposeDeployV0/task.loc.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tasks/ServiceFabricComposeDeployV0/task.loc.json b/Tasks/ServiceFabricComposeDeployV0/task.loc.json index 4ea0f5012758..cae0bf7697e5 100644 --- a/Tasks/ServiceFabricComposeDeployV0/task.loc.json +++ b/Tasks/ServiceFabricComposeDeployV0/task.loc.json @@ -18,7 +18,7 @@ "version": { "Major": 0, "Minor": 5, - "Patch": 3 + "Patch": 4 }, "demands": [ "Cmd" @@ -199,4 +199,4 @@ "InvalidApplicationNameWarning": "ms-resource:loc.messages.InvalidApplicationNameWarning", "UpgradeInProgress": "ms-resource:loc.messages.UpgradeInProgress" } -} \ No newline at end of file +} From 794f78da71e33b1c9aeec350e4fc44e26be69db6 Mon Sep 17 00:00:00 2001 From: Vineet Date: Tue, 2 Mar 2021 12:45:45 +0530 Subject: [PATCH 4/7] Update task.json --- Tasks/ServiceFabricDeployV1/task.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tasks/ServiceFabricDeployV1/task.json b/Tasks/ServiceFabricDeployV1/task.json index c74c91003936..5cfb6e15ad10 100644 --- a/Tasks/ServiceFabricDeployV1/task.json +++ b/Tasks/ServiceFabricDeployV1/task.json @@ -18,7 +18,7 @@ "version": { "Major": 1, "Minor": 9, - "Patch": 3 + "Patch": 4 }, "demands": [ "Cmd" @@ -481,4 +481,4 @@ "SFSDK_RetryingGetClusterManifest": "Getting cluster manifest..", "SFSDK_RetryingRemoveApplicationPackage": "Retrying to remove application package.." } -} \ No newline at end of file +} From c3ecda27c8990e1160b12fd16037dc5b7205d1cf Mon Sep 17 00:00:00 2001 From: Vineet Date: Tue, 2 Mar 2021 12:45:52 +0530 Subject: [PATCH 5/7] Update task.loc.json --- Tasks/ServiceFabricDeployV1/task.loc.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tasks/ServiceFabricDeployV1/task.loc.json b/Tasks/ServiceFabricDeployV1/task.loc.json index 4a57d45e5718..beebf2e472cd 100644 --- a/Tasks/ServiceFabricDeployV1/task.loc.json +++ b/Tasks/ServiceFabricDeployV1/task.loc.json @@ -18,7 +18,7 @@ "version": { "Major": 1, "Minor": 9, - "Patch": 3 + "Patch": 4 }, "demands": [ "Cmd" @@ -481,4 +481,4 @@ "SFSDK_RetryingGetClusterManifest": "ms-resource:loc.messages.SFSDK_RetryingGetClusterManifest", "SFSDK_RetryingRemoveApplicationPackage": "ms-resource:loc.messages.SFSDK_RetryingRemoveApplicationPackage" } -} \ No newline at end of file +} From a45d1a353b3de826dfef4dc71f5d85394c504e0f Mon Sep 17 00:00:00 2001 From: Vineet Date: Tue, 2 Mar 2021 12:46:23 +0530 Subject: [PATCH 6/7] Update task.json --- Tasks/ServiceFabricPowerShellV1/task.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tasks/ServiceFabricPowerShellV1/task.json b/Tasks/ServiceFabricPowerShellV1/task.json index ed58d1188f30..731843f8ffe6 100644 --- a/Tasks/ServiceFabricPowerShellV1/task.json +++ b/Tasks/ServiceFabricPowerShellV1/task.json @@ -18,7 +18,7 @@ "version": { "Major": 1, "Minor": 2, - "Patch": 3 + "Patch": 4 }, "demands": [ "Cmd" @@ -94,4 +94,4 @@ "InvalidScriptArguments0": "Invalid script arguments '{0}'. Line breaks are not allowed.", "InvalidScriptPath0": "Invalid script path '{0}'. Invalid path characters specified." } -} \ No newline at end of file +} From 57b6321859e1931b08f574946d31daab257d87a0 Mon Sep 17 00:00:00 2001 From: Vineet Date: Tue, 2 Mar 2021 12:46:30 +0530 Subject: [PATCH 7/7] Update task.loc.json --- Tasks/ServiceFabricPowerShellV1/task.loc.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tasks/ServiceFabricPowerShellV1/task.loc.json b/Tasks/ServiceFabricPowerShellV1/task.loc.json index 46fd99da1f76..0e82700ca808 100644 --- a/Tasks/ServiceFabricPowerShellV1/task.loc.json +++ b/Tasks/ServiceFabricPowerShellV1/task.loc.json @@ -18,7 +18,7 @@ "version": { "Major": 1, "Minor": 2, - "Patch": 3 + "Patch": 4 }, "demands": [ "Cmd" @@ -94,4 +94,4 @@ "InvalidScriptArguments0": "ms-resource:loc.messages.InvalidScriptArguments0", "InvalidScriptPath0": "ms-resource:loc.messages.InvalidScriptPath0" } -} \ No newline at end of file +}