Users/alextorres/use new common u pack v0 (#18881)

* Updating to use new packaging common version * bumped task version * Built task and fixed imports * bumped task ver (227) * Revert "bumped task ver (227)" This reverts commit 0367feb. * Revert "Revert "bumped task ver (227)"" This reverts commit 85787b0. * bumped timeout
microsoft · Aug 28, 2023 · 5498e1d · 5498e1d
1 parent 8096a33
commit 5498e1d
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 13 deletions.
diff --git a/Tasks/UniversalPackagesV0/Tests/L0.ts b/Tasks/UniversalPackagesV0/Tests/L0.ts
@@ -10,7 +10,6 @@ describe('UniversalPackages Suite', function () {
     });
 
     it('downloads package from current organization', function (done: Mocha.Done) {
-        this.timeout(5000);
         let tp = path.join(__dirname, './downloadInternal.js')
         let tr: ttm.MockTestRunner = new ttm.MockTestRunner(tp);
 
@@ -21,5 +20,5 @@ describe('UniversalPackages Suite', function () {
         assert(tr.succeeded, 'should have succeeded');
         assert.equal(tr.errorIssues.length, 0, "should have no errors");
         done();
-    });
+    }).timeout(10000);
 });
diff --git a/Tasks/UniversalPackagesV0/package-lock.json b/Tasks/UniversalPackagesV0/package-lock.json
diff --git a/Tasks/UniversalPackagesV0/package.json b/Tasks/UniversalPackagesV0/package.json
@@ -21,7 +21,7 @@
         "@types/node": "^16.11.39",
         "@types/uuid": "^8.3.0",
         "azure-pipelines-task-lib": "^4.1.0",
-        "azure-pipelines-tasks-packaging-common": "^3.214.0",
+        "azure-pipelines-tasks-packaging-common": "^3.226.0",
         "azure-pipelines-tasks-utility-common": "^3.212.0"
     },
     "devDependencies": {

diff --git a/Tasks/UniversalPackagesV0/task.json b/Tasks/UniversalPackagesV0/task.json
@@ -9,7 +9,7 @@
     "category": "Package",
     "version": {
         "Major": 0,
-        "Minor": 218,
+        "Minor": 227,
         "Patch": 0
     },
     "runsOn": [

diff --git a/Tasks/UniversalPackagesV0/task.loc.json b/Tasks/UniversalPackagesV0/task.loc.json
@@ -9,7 +9,7 @@
   "category": "Package",
   "version": {
     "Major": 0,
-    "Minor": 218,
+    "Minor": 227,
     "Patch": 0
   },
   "runsOn": [

diff --git a/Tasks/UniversalPackagesV0/universalpublish.ts b/Tasks/UniversalPackagesV0/universalpublish.ts
@@ -1,13 +1,12 @@
-import * as pkgLocationUtils from "azure-pipelines-tasks-packaging-common/locationUtilities";
-import { ProvenanceHelper } from "azure-pipelines-tasks-packaging-common/provenance";
-import { getProjectAndFeedIdFromInputParam } from 'azure-pipelines-tasks-packaging-common/util';
-import * as telemetry from "azure-pipelines-tasks-utility-common/telemetry";
 import * as tl from "azure-pipelines-task-lib";
 import { IExecOptions, IExecSyncResult } from "azure-pipelines-task-lib/toolrunner";
+import * as pkgLocationUtils from "azure-pipelines-tasks-packaging-common/locationUtilities";
+import { ProvenanceHelper } from "azure-pipelines-tasks-packaging-common/provenance";
 import * as artifactToolRunner from "azure-pipelines-tasks-packaging-common/universal/ArtifactToolRunner";
 import * as artifactToolUtilities from "azure-pipelines-tasks-packaging-common/universal/ArtifactToolUtilities";
 import * as auth from "azure-pipelines-tasks-packaging-common/universal/Authentication";
-import { logError } from 'azure-pipelines-tasks-packaging-common/util';
+import { getProjectAndFeedIdFromInputParam, logError } from 'azure-pipelines-tasks-packaging-common/util';
+import * as telemetry from "azure-pipelines-tasks-utility-common/telemetry";
 
 const packageAlreadyExistsError = 17;
 const numRetries = 1;
@@ -218,6 +217,7 @@ async function getNextPackageVersion(
     feedId: string,
     packageName: string) {
     let version: string;
+    // Will get the highest package version available. Returns 0.0.0 as version if package name contains no versions.
     const highestVersion = await artifactToolUtilities.getHighestPackageVersionFromFeed(
         feedUri,
         accessToken,