Fix Failing Catch Block (#9385) (#9407)

* Removed call in catch blocks that would always fail, resulting in obfuscating error

* Bumped version

Author: magleaso

Tasks/DotNetCoreCLIV2/pushcommand.ts

@@ -14,13 +14,9 @@ export async function run(): Promise<void> {
     try {
         packagingLocation = await pkgLocationUtils.getPackagingUris(pkgLocationUtils.ProtocolType.NuGet);
     } catch (error) {
-        tl.debug('Unable to get packaging URIs, using default collection URI');
+        tl.debug('Unable to get packaging URIs');
         tl.debug(JSON.stringify(error));
-        const collectionUrl = tl.getVariable('System.TeamFoundationCollectionUri');
-        packagingLocation = {
-            PackagingUris: [collectionUrl],
-            DefaultPackagingUri: collectionUrl
-        };
+        throw new Error(error);
     }
 
     const buildIdentityDisplayName: string = null;

Tasks/DotNetCoreCLIV2/restorecommand.ts

@@ -14,13 +14,9 @@ export async function run(): Promise<void> {
     try {
         packagingLocation = await pkgLocationUtils.getPackagingUris(pkgLocationUtils.ProtocolType.NuGet);
     } catch (error) {
-        tl.debug('Unable to get packaging URIs, using default collection URI');
+        tl.debug('Unable to get packaging URIs');
         tl.debug(JSON.stringify(error));
-        const collectionUrl = tl.getVariable('System.TeamFoundationCollectionUri');
-        packagingLocation = {
-            PackagingUris: [collectionUrl],
-            DefaultPackagingUri: collectionUrl
-        };
+        throw new Error(error);
     }
 
     const buildIdentityDisplayName: string = null;

Tasks/DotNetCoreCLIV2/task.json

@@ -16,8 +16,8 @@
     "demands": [],
     "version": {
         "Major": 2,
-        "Minor": 145,
-        "Patch": 4
+        "Minor": 146,
+        "Patch": 0
     },
     "minimumAgentVersion": "2.115.0",
     "instanceNameFormat": "dotnet $(command)",

Tasks/MavenV2/mavenutil.ts

@@ -199,12 +199,9 @@ async function collectFeedRepositories(pomContents:string): Promise<any> {
     try {
         packagingLocation = await pkgLocationUtils.getPackagingUris(pkgLocationUtils.ProtocolType.Maven);
     } catch (error) {
-        tl.debug("Unable to get packaging URIs, using default collection URI");
+        tl.debug("Unable to get packaging URIs");
         tl.debug(JSON.stringify(error));
-        packagingLocation = {
-            PackagingUris: [collectionUrl],
-            DefaultPackagingUri: collectionUrl
-        };
+        throw new Error(error);
     }
 
     let packageUrl = packagingLocation.DefaultPackagingUri;

Tasks/MavenV2/task.json

@@ -16,8 +16,8 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 2,
-        "Minor": 143,
-        "Patch": 3
+        "Minor": 146,
+        "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": [

Tasks/MavenV3/mavenutil.ts

@@ -199,11 +199,9 @@ async function collectFeedRepositories(pomContents:string): Promise<any> {
         try {
             packagingLocation = await pkgLocationUtils.getPackagingUris(pkgLocationUtils.ProtocolType.Maven);
         } catch (error) {
-            tl.debug("Unable to get packaging URIs, using default collection URI");
+            tl.debug("Unable to get packaging URIs");
             tl.debug(JSON.stringify(error));
-            packagingLocation = {
-                PackagingUris: [collectionUrl],
-                DefaultPackagingUri: collectionUrl};
+            throw new Error(error);
         }
 
         let packageUrl = packagingLocation.DefaultPackagingUri;

Tasks/MavenV3/task.json

@@ -16,8 +16,8 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 3,
-        "Minor": 143,
-        "Patch": 3
+        "Minor": 146,
+        "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": [

Tasks/NpmAuthenticateV0/npmauth.ts

@@ -71,13 +71,9 @@ async function main(): Promise<void> {
     try {
         packagingLocation = await pkgLocationUtils.getPackagingUris(pkgLocationUtils.ProtocolType.Npm);
     } catch (error) {
-        tl.debug('Unable to get packaging URIs, using default collection URI');
+        tl.debug('Unable to get packaging URIs');
         tl.debug(JSON.stringify(error));
-        const collectionUrl = tl.getVariable('System.TeamFoundationCollectionUri');
-        packagingLocation = {
-            PackagingUris: [collectionUrl],
-            DefaultPackagingUri: collectionUrl
-        };
+        throw new Error(error);
     }
     let LocalNpmRegistries = await npmutil.getLocalNpmRegistries(workingDirectory, packagingLocation.PackagingUris);
 

Tasks/NpmAuthenticateV0/task.json

@@ -8,7 +8,7 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 0,
-        "Minor": 145,
+        "Minor": 146,
         "Patch": 0
     },
     "runsOn": [

Tasks/NpmV0/npmtask.ts

@@ -198,12 +198,9 @@ async function addBuildCredProviderEnv(env: EnvironmentDictionary) : Promise<Env
     try {
         packagingLocation = await pkgLocationUtils.getPackagingUris(pkgLocationUtils.ProtocolType.Npm);
     } catch (error) {
-        tl.debug("Unable to get packaging URIs, using default collection URI");
+        tl.debug("Unable to get packaging URIs");
         tl.debug(JSON.stringify(error));
-        const collectionUrl = tl.getVariable("System.TeamFoundationCollectionUri");
-        packagingLocation = {
-            PackagingUris: [collectionUrl],
-            DefaultPackagingUri: collectionUrl};
+        throw new Error(error);
     }
 
     var urlPrefixes : string[] = packagingLocation.PackagingUris;