diff --git a/Tasks/Common/packaging-common/locationUtilities.ts b/Tasks/Common/packaging-common/locationUtilities.ts
index db6e61d66071..d96c6087b4e9 100644
--- a/Tasks/Common/packaging-common/locationUtilities.ts
+++ b/Tasks/Common/packaging-common/locationUtilities.ts
@@ -238,8 +238,7 @@ export async function getFeedRegistryUrl(
             [vssConnection.authHandler],
             vssConnection.options);
     }
-
-    const data = await vssConnection.vsoClient.getVersioningData(loc.apiVersion, loc.area, loc.locationId, { feedId: sessionId, project: project });
+    const data = await retryOnExceptionHelper(() =>  vssConnection.vsoClient.getVersioningData(loc.apiVersion, loc.area, loc.locationId, { feedId: sessionId, project: project }), 3, 1000);
 
     tl.debug("Feed registry url: " + data.requestUrl);
     return data.requestUrl;
diff --git a/Tasks/DotNetCoreCLIV2/task.json b/Tasks/DotNetCoreCLIV2/task.json
index f0a530372454..8d772d0ff211 100644
--- a/Tasks/DotNetCoreCLIV2/task.json
+++ b/Tasks/DotNetCoreCLIV2/task.json
@@ -17,8 +17,8 @@
     "demands": [],
     "version": {
         "Major": 2,
-        "Minor": 156,
-        "Patch": 2
+        "Minor": 158,
+        "Patch": 0
     },
     "minimumAgentVersion": "2.115.0",
     "instanceNameFormat": "dotnet $(command)",
diff --git a/Tasks/DotNetCoreCLIV2/task.loc.json b/Tasks/DotNetCoreCLIV2/task.loc.json
index 1e4035426478..717d6e98c9cd 100644
--- a/Tasks/DotNetCoreCLIV2/task.loc.json
+++ b/Tasks/DotNetCoreCLIV2/task.loc.json
@@ -17,8 +17,8 @@
   "demands": [],
   "version": {
     "Major": 2,
-    "Minor": 156,
-    "Patch": 2
+    "Minor": 158,
+    "Patch": 0
   },
   "minimumAgentVersion": "2.115.0",
   "instanceNameFormat": "ms-resource:loc.instanceNameFormat",
diff --git a/Tasks/DownloadPackageV0/task.json b/Tasks/DownloadPackageV0/task.json
index d04208bd9be6..c391fdd73346 100644
--- a/Tasks/DownloadPackageV0/task.json
+++ b/Tasks/DownloadPackageV0/task.json
@@ -9,8 +9,8 @@
     "author": "ms-vscs-rm",
     "version": {
         "Major": 0,
-        "Minor": 156,
-        "Patch": 1
+        "Minor": 158,
+        "Patch": 0
     },
     "demands": [],
     "minimumAgentVersion": "1.99.0",
diff --git a/Tasks/DownloadPackageV0/task.loc.json b/Tasks/DownloadPackageV0/task.loc.json
index 4489a121e7f1..47ec9ba587cf 100644
--- a/Tasks/DownloadPackageV0/task.loc.json
+++ b/Tasks/DownloadPackageV0/task.loc.json
@@ -9,8 +9,8 @@
   "author": "ms-vscs-rm",
   "version": {
     "Major": 0,
-    "Minor": 156,
-    "Patch": 1
+    "Minor": 158,
+    "Patch": 0
   },
   "demands": [],
   "minimumAgentVersion": "1.99.0",
diff --git a/Tasks/DownloadPackageV1/task.json b/Tasks/DownloadPackageV1/task.json
index b5ec321c099e..e1276c792334 100644
--- a/Tasks/DownloadPackageV1/task.json
+++ b/Tasks/DownloadPackageV1/task.json
@@ -9,8 +9,8 @@
     "author": "ms-vscs-rm",
     "version": {
         "Major": 1,
-        "Minor": 156,
-        "Patch": 2
+        "Minor": 158,
+        "Patch": 0
     },
     "demands": [],
     "releaseNotes": "Adds support to download Maven, Python, Universal and Npm packages.",
diff --git a/Tasks/DownloadPackageV1/task.loc.json b/Tasks/DownloadPackageV1/task.loc.json
index d4605774c0b8..8ecf6813b380 100644
--- a/Tasks/DownloadPackageV1/task.loc.json
+++ b/Tasks/DownloadPackageV1/task.loc.json
@@ -9,8 +9,8 @@
   "author": "ms-vscs-rm",
   "version": {
     "Major": 1,
-    "Minor": 156,
-    "Patch": 2
+    "Minor": 158,
+    "Patch": 0
   },
   "demands": [],
   "releaseNotes": "ms-resource:loc.releaseNotes",
diff --git a/Tasks/MavenV2/task.json b/Tasks/MavenV2/task.json
index baa8f7527c03..e92a73f42d01 100644
--- a/Tasks/MavenV2/task.json
+++ b/Tasks/MavenV2/task.json
@@ -17,8 +17,8 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 2,
-        "Minor": 156,
-        "Patch": 1
+        "Minor": 158,
+        "Patch": 0
     },
     "releaseNotes": "Configuration of the SonarQube analysis was moved to the [SonarQube](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarqube) or [SonarCloud](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarcloud) extensions, in task `Prepare Analysis Configuration`",
     "demands": [
diff --git a/Tasks/MavenV2/task.loc.json b/Tasks/MavenV2/task.loc.json
index 2e251038383f..c783d9435066 100644
--- a/Tasks/MavenV2/task.loc.json
+++ b/Tasks/MavenV2/task.loc.json
@@ -17,8 +17,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 2,
-    "Minor": 156,
-    "Patch": 1
+    "Minor": 158,
+    "Patch": 0
   },
   "releaseNotes": "ms-resource:loc.releaseNotes",
   "demands": [
diff --git a/Tasks/MavenV3/task.json b/Tasks/MavenV3/task.json
index 51273139371e..77adc5e6843d 100644
--- a/Tasks/MavenV3/task.json
+++ b/Tasks/MavenV3/task.json
@@ -17,8 +17,8 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 3,
-        "Minor": 156,
-        "Patch": 1
+        "Minor": 158,
+        "Patch": 0
     },
     "releaseNotes": "Configuration of the SonarQube analysis was moved to the [SonarQube](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarqube) or [SonarCloud](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarcloud) extensions, in task `Prepare Analysis Configuration`",
     "demands": [
diff --git a/Tasks/MavenV3/task.loc.json b/Tasks/MavenV3/task.loc.json
index e00974d251da..0bef0d8bd573 100644
--- a/Tasks/MavenV3/task.loc.json
+++ b/Tasks/MavenV3/task.loc.json
@@ -17,8 +17,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 3,
-    "Minor": 156,
-    "Patch": 1
+    "Minor": 158,
+    "Patch": 0
   },
   "releaseNotes": "ms-resource:loc.releaseNotes",
   "demands": [
diff --git a/Tasks/NpmAuthenticateV0/task.json b/Tasks/NpmAuthenticateV0/task.json
index d8a5c5b40728..996d31fec042 100644
--- a/Tasks/NpmAuthenticateV0/task.json
+++ b/Tasks/NpmAuthenticateV0/task.json
@@ -9,8 +9,8 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 0,
-        "Minor": 156,
-        "Patch": 1
+        "Minor": 158,
+        "Patch": 0
     },
     "runsOn": [
         "Agent",
diff --git a/Tasks/NpmAuthenticateV0/task.loc.json b/Tasks/NpmAuthenticateV0/task.loc.json
index 45c7a9362e33..7b46e1314067 100644
--- a/Tasks/NpmAuthenticateV0/task.loc.json
+++ b/Tasks/NpmAuthenticateV0/task.loc.json
@@ -9,8 +9,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 0,
-    "Minor": 156,
-    "Patch": 1
+    "Minor": 158,
+    "Patch": 0
   },
   "runsOn": [
     "Agent",
diff --git a/Tasks/NpmV1/task.json b/Tasks/NpmV1/task.json
index 08b8b2da6c52..015fd80c0df4 100644
--- a/Tasks/NpmV1/task.json
+++ b/Tasks/NpmV1/task.json
@@ -9,8 +9,8 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 1,
-        "Minor": 157,
-        "Patch": 1
+        "Minor": 158,
+        "Patch": 0
     },
     "runsOn": [
         "Agent",
diff --git a/Tasks/NpmV1/task.loc.json b/Tasks/NpmV1/task.loc.json
index f0a348370dd8..35ab814239a7 100644
--- a/Tasks/NpmV1/task.loc.json
+++ b/Tasks/NpmV1/task.loc.json
@@ -9,8 +9,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 1,
-    "Minor": 157,
-    "Patch": 1
+    "Minor": 158,
+    "Patch": 0
   },
   "runsOn": [
     "Agent",
@@ -197,4 +197,4 @@
     "WorkingDirectoryNotDirectory": "ms-resource:loc.messages.WorkingDirectoryNotDirectory",
     "NGCommon_AreaNotFoundInSps": "ms-resource:loc.messages.NGCommon_AreaNotFoundInSps"
   }
-}
\ No newline at end of file
+}
diff --git a/Tasks/NuGetCommandV2/task.json b/Tasks/NuGetCommandV2/task.json
index 8f54097efebf..aaa063b80092 100644
--- a/Tasks/NuGetCommandV2/task.json
+++ b/Tasks/NuGetCommandV2/task.json
@@ -9,8 +9,8 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 2,
-        "Minor": 156,
-        "Patch": 1
+        "Minor": 158,
+        "Patch": 0
     },
     "runsOn": [
         "Agent",
diff --git a/Tasks/NuGetCommandV2/task.loc.json b/Tasks/NuGetCommandV2/task.loc.json
index 2fa647cc7907..6c1c21c0e920 100644
--- a/Tasks/NuGetCommandV2/task.loc.json
+++ b/Tasks/NuGetCommandV2/task.loc.json
@@ -9,8 +9,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 2,
-    "Minor": 156,
-    "Patch": 1
+    "Minor": 158,
+    "Patch": 0
   },
   "runsOn": [
     "Agent",
diff --git a/Tasks/NuGetPublisherV0/task.json b/Tasks/NuGetPublisherV0/task.json
index bf6ea219fc25..f9dc48c05ba2 100644
--- a/Tasks/NuGetPublisherV0/task.json
+++ b/Tasks/NuGetPublisherV0/task.json
@@ -9,8 +9,8 @@
     "author": "Lawrence Gripper",
     "version": {
         "Major": 0,
-        "Minor": 156,
-        "Patch": 1
+        "Minor": 158,
+        "Patch": 0
     },
     "runsOn": [
         "Agent",
diff --git a/Tasks/NuGetPublisherV0/task.loc.json b/Tasks/NuGetPublisherV0/task.loc.json
index 69c0ca0c276d..0cd7bdcfc859 100644
--- a/Tasks/NuGetPublisherV0/task.loc.json
+++ b/Tasks/NuGetPublisherV0/task.loc.json
@@ -9,8 +9,8 @@
   "author": "Lawrence Gripper",
   "version": {
     "Major": 0,
-    "Minor": 156,
-    "Patch": 1
+    "Minor": 158,
+    "Patch": 0
   },
   "runsOn": [
     "Agent",
diff --git a/Tasks/NuGetToolInstallerV0/task.json b/Tasks/NuGetToolInstallerV0/task.json
index 69e74d1da58e..3f9f26ed5ca1 100644
--- a/Tasks/NuGetToolInstallerV0/task.json
+++ b/Tasks/NuGetToolInstallerV0/task.json
@@ -14,8 +14,8 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 0,
-        "Minor": 156,
-        "Patch": 1
+        "Minor": 158,
+        "Patch": 0
     },
     "preview": false,
     "satisfies": [
diff --git a/Tasks/NuGetToolInstallerV0/task.loc.json b/Tasks/NuGetToolInstallerV0/task.loc.json
index 9a32f0b00d79..4b48c62725ba 100644
--- a/Tasks/NuGetToolInstallerV0/task.loc.json
+++ b/Tasks/NuGetToolInstallerV0/task.loc.json
@@ -14,8 +14,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 0,
-    "Minor": 156,
-    "Patch": 1
+    "Minor": 158,
+    "Patch": 0
   },
   "preview": false,
   "satisfies": [
diff --git a/Tasks/NuGetToolInstallerV1/task.json b/Tasks/NuGetToolInstallerV1/task.json
index d162c6280f5e..0e0eac009cea 100644
--- a/Tasks/NuGetToolInstallerV1/task.json
+++ b/Tasks/NuGetToolInstallerV1/task.json
@@ -14,8 +14,8 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 1,
-        "Minor": 156,
-        "Patch": 1
+        "Minor": 158,
+        "Patch": 0
     },
     "preview": false,
     "satisfies": [
diff --git a/Tasks/NuGetToolInstallerV1/task.loc.json b/Tasks/NuGetToolInstallerV1/task.loc.json
index 48fb97a649b3..c314a802dc99 100644
--- a/Tasks/NuGetToolInstallerV1/task.loc.json
+++ b/Tasks/NuGetToolInstallerV1/task.loc.json
@@ -14,8 +14,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 1,
-    "Minor": 156,
-    "Patch": 1
+    "Minor": 158,
+    "Patch": 0
   },
   "preview": false,
   "satisfies": [
diff --git a/Tasks/NuGetV0/task.json b/Tasks/NuGetV0/task.json
index f42e51b16bc6..8e8db44f6fbe 100644
--- a/Tasks/NuGetV0/task.json
+++ b/Tasks/NuGetV0/task.json
@@ -10,8 +10,8 @@
     "helpMarkDown": "",
     "version": {
         "Major": 0,
-        "Minor": 156,
-        "Patch": 1
+        "Minor": 158,
+        "Patch": 0
     },
     "runsOn": [
         "Agent",
diff --git a/Tasks/NuGetV0/task.loc.json b/Tasks/NuGetV0/task.loc.json
index 634ae198848a..f9d9c9be91e5 100644
--- a/Tasks/NuGetV0/task.loc.json
+++ b/Tasks/NuGetV0/task.loc.json
@@ -10,8 +10,8 @@
   "helpMarkDown": "ms-resource:loc.helpMarkDown",
   "version": {
     "Major": 0,
-    "Minor": 156,
-    "Patch": 1
+    "Minor": 158,
+    "Patch": 0
   },
   "runsOn": [
     "Agent",
diff --git a/Tasks/PipAuthenticateV0/task.json b/Tasks/PipAuthenticateV0/task.json
index 2875b5d916c3..6f22342e9ac8 100644
--- a/Tasks/PipAuthenticateV0/task.json
+++ b/Tasks/PipAuthenticateV0/task.json
@@ -9,8 +9,8 @@
     "category": "Package",
     "version": {
         "Major": 0,
-        "Minor": 156,
-        "Patch": 1
+        "Minor": 158,
+        "Patch": 0
     },
     "runsOn": [
         "Agent",
diff --git a/Tasks/PipAuthenticateV0/task.loc.json b/Tasks/PipAuthenticateV0/task.loc.json
index cfa9ebac7a40..7f80d690e8ff 100644
--- a/Tasks/PipAuthenticateV0/task.loc.json
+++ b/Tasks/PipAuthenticateV0/task.loc.json
@@ -9,8 +9,8 @@
   "category": "Package",
   "version": {
     "Major": 0,
-    "Minor": 156,
-    "Patch": 1
+    "Minor": 158,
+    "Patch": 0
   },
   "runsOn": [
     "Agent",
diff --git a/Tasks/TwineAuthenticateV0/task.json b/Tasks/TwineAuthenticateV0/task.json
index d30f28a10f94..78c5379e7d2d 100644
--- a/Tasks/TwineAuthenticateV0/task.json
+++ b/Tasks/TwineAuthenticateV0/task.json
@@ -9,8 +9,8 @@
     "category": "Package",
     "version": {
         "Major": 0,
-        "Minor": 156,
-        "Patch": 1
+        "Minor": 158,
+        "Patch": 0
     },
     "runsOn": [
         "Agent",
diff --git a/Tasks/TwineAuthenticateV0/task.loc.json b/Tasks/TwineAuthenticateV0/task.loc.json
index cb1918ac16f3..f516ca099f62 100644
--- a/Tasks/TwineAuthenticateV0/task.loc.json
+++ b/Tasks/TwineAuthenticateV0/task.loc.json
@@ -9,8 +9,8 @@
   "category": "Package",
   "version": {
     "Major": 0,
-    "Minor": 156,
-    "Patch": 1
+    "Minor": 158,
+    "Patch": 0
   },
   "runsOn": [
     "Agent",
diff --git a/Tasks/UniversalPackagesV0/task.json b/Tasks/UniversalPackagesV0/task.json
index 2ff22711dee2..f2bf62a43083 100644
--- a/Tasks/UniversalPackagesV0/task.json
+++ b/Tasks/UniversalPackagesV0/task.json
@@ -9,7 +9,7 @@
     "category": "Package",
     "version": {
         "Major": 0,
-        "Minor": 157,
+        "Minor": 158,
         "Patch": 0
     },
     "runsOn": [
diff --git a/Tasks/UniversalPackagesV0/task.loc.json b/Tasks/UniversalPackagesV0/task.loc.json
index c6c4a4df87e8..b39520f54590 100644
--- a/Tasks/UniversalPackagesV0/task.loc.json
+++ b/Tasks/UniversalPackagesV0/task.loc.json
@@ -9,7 +9,7 @@
   "category": "Package",
   "version": {
     "Major": 0,
-    "Minor": 157,
+    "Minor": 158,
     "Patch": 0
   },
   "runsOn": [
@@ -439,4 +439,4 @@
     "Error_UniversalPackagesNotSupportedOnPrem": "ms-resource:loc.messages.Error_UniversalPackagesNotSupportedOnPrem",
     "Error_ProcessorArchitectureNotSupported": "ms-resource:loc.messages.Error_ProcessorArchitectureNotSupported"
   }
-}
\ No newline at end of file
+}
diff --git a/Tasks/UseDotNetV2/task.json b/Tasks/UseDotNetV2/task.json
index 1bfd12359ba8..e67d511b76d8 100644
--- a/Tasks/UseDotNetV2/task.json
+++ b/Tasks/UseDotNetV2/task.json
@@ -14,7 +14,7 @@
     "version": {
         "Major": 2,
         "Minor": 0,
-        "Patch": 17
+        "Patch": 18
     },
    "satisfies": [
         "DotNetCore"
diff --git a/Tasks/UseDotNetV2/task.loc.json b/Tasks/UseDotNetV2/task.loc.json
index dbbb2a2b2923..6a97d62b29be 100644
--- a/Tasks/UseDotNetV2/task.loc.json
+++ b/Tasks/UseDotNetV2/task.loc.json
@@ -14,7 +14,7 @@
   "version": {
     "Major": 2,
     "Minor": 0,
-    "Patch": 17
+    "Patch": 18
   },
   "satisfies": [
     "DotNetCore"
@@ -178,4 +178,4 @@
     "VersionNumberHasTheWrongFormat": "ms-resource:loc.messages.VersionNumberHasTheWrongFormat",
     "OnlyExplicitVersionAllowed": "ms-resource:loc.messages.OnlyExplicitVersionAllowed"
   }
-}
\ No newline at end of file
+}
diff --git a/Tasks/UseNodeV1/task.json b/Tasks/UseNodeV1/task.json
index c12f47ceff2a..f43850f80ae6 100644
--- a/Tasks/UseNodeV1/task.json
+++ b/Tasks/UseNodeV1/task.json
@@ -16,8 +16,8 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 1,
-        "Minor": 156,
-        "Patch": 2
+        "Minor": 158,
+        "Patch": 0
     },
     "satisfies": [
         "Node",
diff --git a/Tasks/UseNodeV1/task.loc.json b/Tasks/UseNodeV1/task.loc.json
index 6b4cc863e88f..2dd660fb1ce3 100644
--- a/Tasks/UseNodeV1/task.loc.json
+++ b/Tasks/UseNodeV1/task.loc.json
@@ -16,8 +16,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 1,
-    "Minor": 156,
-    "Patch": 2
+    "Minor": 158,
+    "Patch": 0
   },
   "satisfies": [
     "Node",