Fix for UseDotnetV2 - Fails silently to download (#20521)

* Bump tool lib + use downloadToolWithRetries * fix tests
microsoft · Oct 7, 2024 · b856335 · b856335
1 parent 591764a
commit b856335
Show file tree

Hide file tree

Showing 21 changed files with 78 additions and 46 deletions.
diff --git a/Tasks/UseDotNetV2/Tests/versionInstallerDownloadAndInstallTests.ts b/Tasks/UseDotNetV2/Tests/versionInstallerDownloadAndInstallTests.ts
@@ -36,6 +36,15 @@ mockery.registerMock('azure-pipelines-tool-lib/tool', {
  resolve("downloadPath");
  });
  },
+ downloadToolWithRetries: function (url: string, fileName?: string): Promise<string> {
+ return Promise<string>((resolve, reject) => {
+ if (process.env["__case__"] == "downloaderror") {
+ reject("downloaderror");
+ }
+
+ resolve("downloadPath");
+ });
+ },
  extractZip: function (file: string): Promise<string> {
  return Promise<string>((resolve, reject) => {
  if (process.env["__case__"] == "extracterror") {
@@ -161,6 +170,7 @@ mockery.registerMock('fs', {
 import { VersionInstaller } from "../versioninstaller";
 import { VersionInfo } from "../models";
 import { Promise } from 'q';
+import { downloadToolWithRetries } from 'azure-pipelines-tool-lib';
 let versionInstaller = new VersionInstaller("sdk", installationPath);
 
 let versionInfo = new VersionInfo(JSON.parse(`{"version":"2.2.104", "files": [{"name": "linux.tar.gz", "rid":"linux-x64", "url": "https://path.to/file.tar.gz"}, {"name": "osx.pkg", "rid":"osx-x64", "url": "https://path.to/file.pkg"}, {"name": "osx.tar.gz", "rid":"osx-x64", "url": "https://path.toMac/file.tar.gz"}, {"name": "win.exe", "rid":"win-x64", "url": "https://path.to/file.exe"}, {"name": "win.zip", "rid":"win-x64", "url": "https://path.to/file.zip"}]}`), "sdk");

diff --git a/Tasks/UseDotNetV2/_buildConfigs/Node20/package-lock.json b/Tasks/UseDotNetV2/_buildConfigs/Node20/package-lock.json
diff --git a/Tasks/UseDotNetV2/_buildConfigs/Node20/package.json b/Tasks/UseDotNetV2/_buildConfigs/Node20/package.json
@@ -30,7 +30,7 @@
  "azure-pipelines-task-lib": "^4.16.0",
  "azure-pipelines-tasks-packaging-common": "^3.230.0",
  "azure-pipelines-tasks-utility-common": "^3.242.0",
- "azure-pipelines-tool-lib": "^2.0.7",
+ "azure-pipelines-tool-lib": "^2.0.8",
  "json5": "^2.2.3",
  "semver": "^7.6.3",
  "typed-rest-client": "^2.1.0"

diff --git a/Tasks/UseDotNetV2/package-lock.json b/Tasks/UseDotNetV2/package-lock.json
diff --git a/Tasks/UseDotNetV2/package.json b/Tasks/UseDotNetV2/package.json
@@ -30,7 +30,7 @@
  "azure-pipelines-task-lib": "^4.16.0",
  "azure-pipelines-tasks-packaging-common": "^3.230.0",
  "azure-pipelines-tasks-utility-common": "^3.242.0",
- "azure-pipelines-tool-lib": "^2.0.7",
+ "azure-pipelines-tool-lib": "^2.0.8",
  "json5": "^2.2.3",
  "semver": "^7.6.3",
  "typed-rest-client": "^2.1.0"

diff --git a/Tasks/UseDotNetV2/task.json b/Tasks/UseDotNetV2/task.json
@@ -13,8 +13,8 @@
  "author": "Microsoft Corporation",
  "version": {
  "Major": 2,
- "Minor": 246,
- "Patch": 2
+ "Minor": 247,
+ "Patch": 0
  },
  "satisfies": [
  "DotNetCore"

diff --git a/Tasks/UseDotNetV2/task.loc.json b/Tasks/UseDotNetV2/task.loc.json
@@ -13,8 +13,8 @@
  "author": "Microsoft Corporation",
  "version": {
  "Major": 2,
- "Minor": 246,
- "Patch": 2
+ "Minor": 247,
+ "Patch": 0
  },
  "satisfies": [
  "DotNetCore"

diff --git a/Tasks/UseDotNetV2/versioninstaller.ts b/Tasks/UseDotNetV2/versioninstaller.ts
@@ -35,13 +35,13 @@ export class VersionInstaller {
 
  try {
  try {
- var downloadPath = await toolLib.downloadTool(downloadUrl)
+ var downloadPath = await toolLib.downloadToolWithRetries(downloadUrl)
  }
  catch (ex) {
  tl.warning(tl.loc("CouldNotDownload", downloadUrl, ex));
  let fallBackUrl = `https://dotnetcli.azureedge.net/dotnet/${this.packageType === "runtime" ? "Runtime" : "Sdk"}/${version}/${downloadUrl.substring(downloadUrl.lastIndexOf('/') + 1)}`;
  console.log("Using fallback url for download: " + fallBackUrl);
- var downloadPath = await toolLib.downloadTool(fallBackUrl)
+ var downloadPath = await toolLib.downloadToolWithRetries(fallBackUrl)
  }
 
  // Extract

diff --git a/_generated/UseDotNetV2.versionmap.txt b/_generated/UseDotNetV2.versionmap.txt
@@ -1,2 +1,2 @@
-Default|2.246.2
-Node20_229_3|2.246.3
+Default|2.247.0
+Node20_229_3|2.247.1
diff --git a/_generated/UseDotNetV2/Tests/versionInstallerDownloadAndInstallTests.ts b/_generated/UseDotNetV2/Tests/versionInstallerDownloadAndInstallTests.ts
@@ -36,6 +36,15 @@ mockery.registerMock('azure-pipelines-tool-lib/tool', {
  resolve("downloadPath");
  });
  },
+ downloadToolWithRetries: function (url: string, fileName?: string): Promise<string> {
+ return Promise<string>((resolve, reject) => {
+ if (process.env["__case__"] == "downloaderror") {
+ reject("downloaderror");
+ }
+
+ resolve("downloadPath");
+ });
+ },
  extractZip: function (file: string): Promise<string> {
  return Promise<string>((resolve, reject) => {
  if (process.env["__case__"] == "extracterror") {
@@ -161,6 +170,7 @@ mockery.registerMock('fs', {
 import { VersionInstaller } from "../versioninstaller";
 import { VersionInfo } from "../models";
 import { Promise } from 'q';
+import { downloadToolWithRetries } from 'azure-pipelines-tool-lib';
 let versionInstaller = new VersionInstaller("sdk", installationPath);
 
 let versionInfo = new VersionInfo(JSON.parse(`{"version":"2.2.104", "files": [{"name": "linux.tar.gz", "rid":"linux-x64", "url": "https://path.to/file.tar.gz"}, {"name": "osx.pkg", "rid":"osx-x64", "url": "https://path.to/file.pkg"}, {"name": "osx.tar.gz", "rid":"osx-x64", "url": "https://path.toMac/file.tar.gz"}, {"name": "win.exe", "rid":"win-x64", "url": "https://path.to/file.exe"}, {"name": "win.zip", "rid":"win-x64", "url": "https://path.to/file.zip"}]}`), "sdk");

diff --git a/_generated/UseDotNetV2/package-lock.json b/_generated/UseDotNetV2/package-lock.json
diff --git a/_generated/UseDotNetV2/package.json b/_generated/UseDotNetV2/package.json
@@ -30,7 +30,7 @@
  "azure-pipelines-task-lib": "^4.16.0",
  "azure-pipelines-tasks-packaging-common": "^3.230.0",
  "azure-pipelines-tasks-utility-common": "^3.242.0",
- "azure-pipelines-tool-lib": "^2.0.7",
+ "azure-pipelines-tool-lib": "^2.0.8",
  "json5": "^2.2.3",
  "semver": "^7.6.3",
  "typed-rest-client": "^2.1.0"

diff --git a/_generated/UseDotNetV2/task.json b/_generated/UseDotNetV2/task.json
@@ -13,8 +13,8 @@
  "author": "Microsoft Corporation",
  "version": {
  "Major": 2,
- "Minor": 246,
- "Patch": 2
+ "Minor": 247,
+ "Patch": 0
  },
  "satisfies": [
  "DotNetCore"
@@ -203,7 +203,7 @@
  "DepricatedVersionNetCore": "NET Core version you specfied %s is out of support and will be removed from hosted agents soon. Please refer to https://aka.ms/dotnet-core-support for more information about the .NET support policy."
  },
  "_buildConfigMapping": {
- "Default": "2.246.2",
- "Node20_229_3": "2.246.3"
+ "Default": "2.247.0",
+ "Node20_229_3": "2.247.1"
  }
 }
diff --git a/_generated/UseDotNetV2/task.loc.json b/_generated/UseDotNetV2/task.loc.json
@@ -13,8 +13,8 @@
  "author": "Microsoft Corporation",
  "version": {
  "Major": 2,
- "Minor": 246,
- "Patch": 2
+ "Minor": 247,
+ "Patch": 0
  },
  "satisfies": [
  "DotNetCore"
@@ -203,7 +203,7 @@
  "DepricatedVersionNetCore": "ms-resource:loc.messages.DepricatedVersionNetCore"
  },
  "_buildConfigMapping": {
- "Default": "2.246.2",
- "Node20_229_3": "2.246.3"
+ "Default": "2.247.0",
+ "Node20_229_3": "2.247.1"
  }
 }
diff --git a/_generated/UseDotNetV2/versioninstaller.ts b/_generated/UseDotNetV2/versioninstaller.ts
@@ -35,13 +35,13 @@ export class VersionInstaller {
 
  try {
  try {
- var downloadPath = await toolLib.downloadTool(downloadUrl)
+ var downloadPath = await toolLib.downloadToolWithRetries(downloadUrl)
  }
  catch (ex) {
  tl.warning(tl.loc("CouldNotDownload", downloadUrl, ex));
  let fallBackUrl = `https://dotnetcli.azureedge.net/dotnet/${this.packageType === "runtime" ? "Runtime" : "Sdk"}/${version}/${downloadUrl.substring(downloadUrl.lastIndexOf('/') + 1)}`;
  console.log("Using fallback url for download: " + fallBackUrl);
- var downloadPath = await toolLib.downloadTool(fallBackUrl)
+ var downloadPath = await toolLib.downloadToolWithRetries(fallBackUrl)
  }
 
  // Extract

diff --git a/_generated/UseDotNetV2_Node20/Tests/versionInstallerDownloadAndInstallTests.ts b/_generated/UseDotNetV2_Node20/Tests/versionInstallerDownloadAndInstallTests.ts
@@ -36,6 +36,15 @@ mockery.registerMock('azure-pipelines-tool-lib/tool', {
  resolve("downloadPath");
  });
  },
+ downloadToolWithRetries: function (url: string, fileName?: string): Promise<string> {
+ return Promise<string>((resolve, reject) => {
+ if (process.env["__case__"] == "downloaderror") {
+ reject("downloaderror");
+ }
+
+ resolve("downloadPath");
+ });
+ },
  extractZip: function (file: string): Promise<string> {
  return Promise<string>((resolve, reject) => {
  if (process.env["__case__"] == "extracterror") {
@@ -161,6 +170,7 @@ mockery.registerMock('fs', {
 import { VersionInstaller } from "../versioninstaller";
 import { VersionInfo } from "../models";
 import { Promise } from 'q';
+import { downloadToolWithRetries } from 'azure-pipelines-tool-lib';
 let versionInstaller = new VersionInstaller("sdk", installationPath);
 
 let versionInfo = new VersionInfo(JSON.parse(`{"version":"2.2.104", "files": [{"name": "linux.tar.gz", "rid":"linux-x64", "url": "https://path.to/file.tar.gz"}, {"name": "osx.pkg", "rid":"osx-x64", "url": "https://path.to/file.pkg"}, {"name": "osx.tar.gz", "rid":"osx-x64", "url": "https://path.toMac/file.tar.gz"}, {"name": "win.exe", "rid":"win-x64", "url": "https://path.to/file.exe"}, {"name": "win.zip", "rid":"win-x64", "url": "https://path.to/file.zip"}]}`), "sdk");

diff --git a/_generated/UseDotNetV2_Node20/package-lock.json b/_generated/UseDotNetV2_Node20/package-lock.json
diff --git a/_generated/UseDotNetV2_Node20/package.json b/_generated/UseDotNetV2_Node20/package.json
@@ -30,7 +30,7 @@
  "azure-pipelines-task-lib": "^4.16.0",
  "azure-pipelines-tasks-packaging-common": "^3.230.0",
  "azure-pipelines-tasks-utility-common": "^3.242.0",
- "azure-pipelines-tool-lib": "^2.0.7",
+ "azure-pipelines-tool-lib": "^2.0.8",
  "json5": "^2.2.3",
  "semver": "^7.6.3",
  "typed-rest-client": "^2.1.0"

diff --git a/_generated/UseDotNetV2_Node20/task.json b/_generated/UseDotNetV2_Node20/task.json
@@ -13,8 +13,8 @@
  "author": "Microsoft Corporation",
  "version": {
  "Major": 2,
- "Minor": 246,
- "Patch": 3
+ "Minor": 247,
+ "Patch": 1
  },
  "satisfies": [
  "DotNetCore"
@@ -207,7 +207,7 @@
  "DepricatedVersionNetCore": "NET Core version you specfied %s is out of support and will be removed from hosted agents soon. Please refer to https://aka.ms/dotnet-core-support for more information about the .NET support policy."
  },
  "_buildConfigMapping": {
- "Default": "2.246.2",
- "Node20_229_3": "2.246.3"
+ "Default": "2.247.0",
+ "Node20_229_3": "2.247.1"
  }
 }
diff --git a/_generated/UseDotNetV2_Node20/task.loc.json b/_generated/UseDotNetV2_Node20/task.loc.json
@@ -13,8 +13,8 @@
  "author": "Microsoft Corporation",
  "version": {
  "Major": 2,
- "Minor": 246,
- "Patch": 3
+ "Minor": 247,
+ "Patch": 1
  },
  "satisfies": [
  "DotNetCore"
@@ -207,7 +207,7 @@
  "DepricatedVersionNetCore": "ms-resource:loc.messages.DepricatedVersionNetCore"
  },
  "_buildConfigMapping": {
- "Default": "2.246.2",
- "Node20_229_3": "2.246.3"
+ "Default": "2.247.0",
+ "Node20_229_3": "2.247.1"
  }
 }
diff --git a/_generated/UseDotNetV2_Node20/versioninstaller.ts b/_generated/UseDotNetV2_Node20/versioninstaller.ts
@@ -35,13 +35,13 @@ export class VersionInstaller {
 
  try {
  try {
- var downloadPath = await toolLib.downloadTool(downloadUrl)
+ var downloadPath = await toolLib.downloadToolWithRetries(downloadUrl)
  }
  catch (ex) {
  tl.warning(tl.loc("CouldNotDownload", downloadUrl, ex));
  let fallBackUrl = `https://dotnetcli.azureedge.net/dotnet/${this.packageType === "runtime" ? "Runtime" : "Sdk"}/${version}/${downloadUrl.substring(downloadUrl.lastIndexOf('/') + 1)}`;
  console.log("Using fallback url for download: " + fallBackUrl);
- var downloadPath = await toolLib.downloadTool(fallBackUrl)
+ var downloadPath = await toolLib.downloadToolWithRetries(fallBackUrl)
  }
 
  // Extract