Reverting 9407 origin/users/magleaso/try catch fix (#9490)

* Revert "Adding dockercli installer task in task list (#9358)" This reverts commit d15ac70. * Revert "Porting L0 fixed in m146 (#9424)" This reverts commit 68c9576. * Revert "Fix Failing Catch Block (#9385) (#9407)" This reverts commit b50a4a7. * Bump version
microsoft · Feb 1, 2019 · 47de988 · 47de988
1 parent 87386a4
commit 47de988
Show file tree

Hide file tree

Showing 24 changed files with 83 additions and 38 deletions.
diff --git a/Tasks/DotNetCoreCLIV2/pushcommand.ts b/Tasks/DotNetCoreCLIV2/pushcommand.ts
@@ -15,9 +15,13 @@ export async function run(): Promise<void> {
     try {
         packagingLocation = await pkgLocationUtils.getPackagingUris(pkgLocationUtils.ProtocolType.NuGet);
     } catch (error) {
-        tl.debug('Unable to get packaging URIs');
+        tl.debug('Unable to get packaging URIs, using default collection URI');
         tl.debug(JSON.stringify(error));
-        throw new Error(error);
+        const collectionUrl = tl.getVariable('System.TeamFoundationCollectionUri');
+        packagingLocation = {
+            PackagingUris: [collectionUrl],
+            DefaultPackagingUri: collectionUrl
+        };
     }
 
     const buildIdentityDisplayName: string = null;

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

diff --git a/Tasks/DotNetCoreCLIV2/task.json b/Tasks/DotNetCoreCLIV2/task.json
@@ -18,7 +18,7 @@
     "version": {
         "Major": 2,
         "Minor": 147,
-        "Patch": 1
+        "Patch": 2
     },
     "minimumAgentVersion": "2.115.0",
     "instanceNameFormat": "dotnet $(command)",

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

diff --git a/Tasks/MavenV2/task.json b/Tasks/MavenV2/task.json
@@ -18,7 +18,7 @@
     "version": {
         "Major": 2,
         "Minor": 147,
-        "Patch": 0
+        "Patch": 1
     },
     "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/mavenutil.ts b/Tasks/MavenV3/mavenutil.ts
@@ -199,9 +199,11 @@ async function collectFeedRepositories(pomContents:string): Promise<any> {
         try {
             packagingLocation = await pkgLocationUtils.getPackagingUris(pkgLocationUtils.ProtocolType.Maven);
         } catch (error) {
-            tl.debug("Unable to get packaging URIs");
+            tl.debug("Unable to get packaging URIs, using default collection URI");
             tl.debug(JSON.stringify(error));
-            throw new Error(error);
+            packagingLocation = {
+                PackagingUris: [collectionUrl],
+                DefaultPackagingUri: collectionUrl};
         }
 
         let packageUrl = packagingLocation.DefaultPackagingUri;

diff --git a/Tasks/MavenV3/task.json b/Tasks/MavenV3/task.json
@@ -18,7 +18,7 @@
     "version": {
         "Major": 3,
         "Minor": 147,
-        "Patch": 0
+        "Patch": 1
     },
     "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/NpmAuthenticateV0/npmauth.ts b/Tasks/NpmAuthenticateV0/npmauth.ts
@@ -71,9 +71,13 @@ async function main(): Promise<void> {
     try {
         packagingLocation = await pkgLocationUtils.getPackagingUris(pkgLocationUtils.ProtocolType.Npm);
     } catch (error) {
-        tl.debug('Unable to get packaging URIs');
+        tl.debug('Unable to get packaging URIs, using default collection URI');
         tl.debug(JSON.stringify(error));
-        throw new Error(error);
+        const collectionUrl = tl.getVariable('System.TeamFoundationCollectionUri');
+        packagingLocation = {
+            PackagingUris: [collectionUrl],
+            DefaultPackagingUri: collectionUrl
+        };
     }
     let LocalNpmRegistries = await npmutil.getLocalNpmRegistries(workingDirectory, packagingLocation.PackagingUris);
 

diff --git a/Tasks/NpmAuthenticateV0/task.json b/Tasks/NpmAuthenticateV0/task.json
@@ -10,7 +10,7 @@
     "version": {
         "Major": 0,
         "Minor": 147,
-        "Patch": 1
+        "Patch": 2
     },
     "runsOn": [
         "Agent",

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

diff --git a/Tasks/NpmV0/task.json b/Tasks/NpmV0/task.json
@@ -10,7 +10,7 @@
     "version": {
         "Major": 0,
         "Minor": 147,
-        "Patch": 0
+        "Patch": 1
     },
     "runsOn": [
         "Agent",

diff --git a/Tasks/NpmV1/npm.ts b/Tasks/NpmV1/npm.ts
@@ -17,9 +17,13 @@ async function main(): Promise<void> {
     try {
         packagingLocation = await pkgLocationUtils.getPackagingUris(pkgLocationUtils.ProtocolType.Npm);
     } catch (error) {
-        tl.debug('Unable to get packaging URIs');
+        tl.debug('Unable to get packaging URIs, using default collection URI');
         tl.debug(JSON.stringify(error));
-        throw new Error(error);
+        const collectionUrl = tl.getVariable('System.TeamFoundationCollectionUri');
+        packagingLocation = {
+            PackagingUris: [collectionUrl],
+            DefaultPackagingUri: collectionUrl
+        };
     }
     const forcedUrl = tl.getVariable('Npm.PackagingCollectionUrl');
     if (forcedUrl) {

diff --git a/Tasks/NpmV1/task.json b/Tasks/NpmV1/task.json
@@ -10,7 +10,7 @@
     "version": {
         "Major": 1,
         "Minor": 147,
-        "Patch": 3
+        "Patch": 4
     },
     "runsOn": [
         "Agent",

diff --git a/Tasks/NuGetCommandV2/nugetcustom.ts b/Tasks/NuGetCommandV2/nugetcustom.ts
@@ -22,9 +22,12 @@ export async function run(nuGetPath: string): Promise<void> {
     try {
         packagingLocation = await pkgLocationUtils.getPackagingUris(pkgLocationUtils.ProtocolType.NuGet);
     } catch (error) {
-        tl.debug("Unable to get packaging URIs");
+        tl.debug("Unable to get packaging URIs, using default collection URI");
         tl.debug(JSON.stringify(error));
-        throw new Error(error);
+        const collectionUrl = tl.getVariable("System.TeamFoundationCollectionUri");
+        packagingLocation = {
+            PackagingUris: [collectionUrl],
+            DefaultPackagingUri: collectionUrl};
     }
 
     nutil.setConsoleCodePage();

diff --git a/Tasks/NuGetCommandV2/nugetpublisher.ts b/Tasks/NuGetCommandV2/nugetpublisher.ts
@@ -39,9 +39,12 @@ export async function run(nuGetPath: string): Promise<void> {
     try {
         packagingLocation = await pkgLocationUtils.getPackagingUris(pkgLocationUtils.ProtocolType.NuGet);
     } catch (error) {
-        tl.debug("Unable to get packaging URIs");
+        tl.debug("Unable to get packaging URIs, using default collection URI");
         tl.debug(JSON.stringify(error));
-        throw new Error(error);
+        const collectionUrl = tl.getVariable("System.TeamFoundationCollectionUri");
+        packagingLocation = {
+            PackagingUris: [collectionUrl],
+            DefaultPackagingUri: collectionUrl};
     }
 
     const buildIdentityDisplayName: string = null;

diff --git a/Tasks/NuGetCommandV2/nugetrestore.ts b/Tasks/NuGetCommandV2/nugetrestore.ts
@@ -31,9 +31,12 @@ export async function run(nuGetPath: string): Promise<void> {
     try {
         packagingLocation = await pkgLocationUtils.getPackagingUris(pkgLocationUtils.ProtocolType.NuGet);
     } catch (error) {
-        tl.debug("Unable to get packaging URIs");
+        tl.debug("Unable to get packaging URIs, using default collection URI");
         tl.debug(JSON.stringify(error));
-        throw new Error(error);
+        const collectionUrl = tl.getVariable("System.TeamFoundationCollectionUri");
+        packagingLocation = {
+            PackagingUris: [collectionUrl],
+            DefaultPackagingUri: collectionUrl};
     }
 
     const buildIdentityDisplayName: string = null;

diff --git a/Tasks/NuGetCommandV2/task.json b/Tasks/NuGetCommandV2/task.json
@@ -10,7 +10,7 @@
     "version": {
         "Major": 2,
         "Minor": 147,
-        "Patch": 3
+        "Patch": 4
     },
     "runsOn": [
         "Agent",

diff --git a/Tasks/NuGetInstallerV0/nugetinstaller.ts b/Tasks/NuGetInstallerV0/nugetinstaller.ts
@@ -28,9 +28,12 @@ async function main(): Promise<void> {
     try {
         packagingLocation = await pkgLocationUtils.getPackagingUris(pkgLocationUtils.ProtocolType.NuGet);
     } catch (error) {
-        tl.debug("Unable to get packaging URIs");
+        tl.debug("Unable to get packaging URIs, using default collection URI");
         tl.debug(JSON.stringify(error));
-        throw new Error(error);
+        const collectionUrl = tl.getVariable("System.TeamFoundationCollectionUri");
+        packagingLocation = {
+            PackagingUris: [collectionUrl],
+            DefaultPackagingUri: collectionUrl};
     }
 
     let buildIdentityDisplayName: string = null;

diff --git a/Tasks/NuGetPublisherV0/nugetpublisher.ts b/Tasks/NuGetPublisherV0/nugetpublisher.ts
@@ -27,9 +27,12 @@ async function main(): Promise<void> {
     try {
         packagingLocation = await pkgLocationUtils.getPackagingUris(pkgLocationUtils.ProtocolType.NuGet);
     } catch (error) {
-        tl.debug("Unable to get packaging URIs");
+        tl.debug("Unable to get packaging URIs, using default collection URI");
         tl.debug(JSON.stringify(error));
-        throw new Error(error);
+        const collectionUrl = tl.getVariable("System.TeamFoundationCollectionUri");
+        packagingLocation = {
+            PackagingUris: [collectionUrl],
+            DefaultPackagingUri: collectionUrl};
     }
 
     let buildIdentityDisplayName: string = null;

diff --git a/Tasks/NuGetPublisherV0/task.json b/Tasks/NuGetPublisherV0/task.json
@@ -10,7 +10,7 @@
     "version": {
         "Major": 0,
         "Minor": 147,
-        "Patch": 0
+        "Patch": 1
     },
     "runsOn": [
         "Agent",

diff --git a/Tasks/NuGetRestoreV1/nugetinstaller.ts b/Tasks/NuGetRestoreV1/nugetinstaller.ts
@@ -33,9 +33,12 @@ async function main(): Promise<void> {
         tl.debug("getting the uris");
         packagingLocation = await pkgLocationUtils.getPackagingUris(pkgLocationUtils.ProtocolType.NuGet);
     } catch (error) {
-        tl.debug("Unable to get packaging URIs");
+        tl.debug("Unable to get packaging URIs, using default collection URI");
         tl.debug(JSON.stringify(error));
-        throw new Error(error);
+        const collectionUrl = tl.getVariable("System.TeamFoundationCollectionUri");
+        packagingLocation = {
+            PackagingUris: [collectionUrl],
+            DefaultPackagingUri: collectionUrl};
     }
     tl.debug("got the uris");
     let buildIdentityDisplayName: string = null;

diff --git a/Tasks/NuGetRestoreV1/task.json b/Tasks/NuGetRestoreV1/task.json
@@ -10,7 +10,7 @@
     "version": {
         "Major": 1,
         "Minor": 147,
-        "Patch": 0
+        "Patch": 1
     },
     "runsOn": [
         "Agent",

diff --git a/Tasks/NuGetV0/nuget.ts b/Tasks/NuGetV0/nuget.ts
@@ -22,9 +22,12 @@ async function main(): Promise<void> {
     try {
         packagingLocation = await pkgLocationUtils.getPackagingUris(pkgLocationUtils.ProtocolType.NuGet);
     } catch (error) {
-        tl.debug("Unable to get packaging URIs");
+        tl.debug("Unable to get packaging URIs, using default collection URI");
         tl.debug(JSON.stringify(error));
-        throw new Error(error);
+        const collectionUrl = tl.getVariable("System.TeamFoundationCollectionUri");
+        packagingLocation = {
+            PackagingUris: [collectionUrl],
+            DefaultPackagingUri: collectionUrl};
     }
 
     tl.setResourcePath(path.join(__dirname, "task.json"));

diff --git a/Tasks/NuGetV0/task.json b/Tasks/NuGetV0/task.json
@@ -11,7 +11,7 @@
     "version": {
         "Major": 0,
         "Minor": 147,
-        "Patch": 0
+        "Patch": 1
     },
     "runsOn": [
         "Agent",