Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace packaging-common-v3 with packaging-common #17266

Merged
merged 11 commits into from
Nov 24, 2022
Merged

Replace packaging-common-v3 with packaging-common #17266

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d66ff98
Replace packaging-common-v3 in MavenV4
Nov 23, 2022
3d7c287
Replace packaging-common-v3 in downloadpackage v0
Nov 23, 2022
fcc7a07
Replace packaging-common-v3 in DownloadPackageV1
Nov 23, 2022
b7c7446
Replace packaging-common-v3 in MavenV2
Nov 23, 2022
4211422
Replace packaging-common-v3 in MavenV3
Nov 23, 2022
528d248
Replace packaging-common-v3 in npmAuthenticateV0
Nov 23, 2022
1439f37
Replace packaging-common-v3 in NuGetCommandV2
Nov 23, 2022
8b4343b
Replace packaging-common-v3 in PublishSymbolsV2
Nov 23, 2022
485fa5d
Replace packaging-common-v3 in UniversalPackagesV0
Nov 23, 2022
dc954c6
Merge branch 'master' into users/max-zaytsev/replacing-packaging-comm…
Nov 24, 2022
9ea0f49
Merge branch 'master' into users/max-zaytsev/replacing-packaging-comm…
Nov 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Tasks/DownloadPackageV0/connections.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { WebApi } from "azure-devops-node-api";
import { IRequestOptions } from "azure-devops-node-api/interfaces/common/VsoBaseInterfaces";

import * as tl from 'azure-pipelines-task-lib/task';
import * as locationUtility from "azure-pipelines-tasks-packaging-common-v3/locationUtilities";
import * as locationUtility from "azure-pipelines-tasks-packaging-common/locationUtilities";

export function getConnection(areaId: string, collectionUrl: string, accessToken: string): Promise<WebApi> {
var presignedUrlPatterns: RegExp[] = [
Expand Down
2 changes: 1 addition & 1 deletion Tasks/DownloadPackageV0/download.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ var path = require('path')
import * as corem from 'azure-devops-node-api/CoreApi';
import * as tl from 'azure-pipelines-task-lib/task';
import * as vsom from 'azure-devops-node-api/VsoClient';
import { getProjectAndFeedIdFromInputParam } from "azure-pipelines-tasks-packaging-common-v3/util"
import { getProjectAndFeedIdFromInputParam } from "azure-pipelines-tasks-packaging-common/util"
import stream = require('stream');
import { getConnection } from './connections';
import { WebApi } from 'azure-devops-node-api';
Expand Down
6 changes: 3 additions & 3 deletions Tasks/DownloadPackageV0/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Tasks/DownloadPackageV0/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"@types/node": "^10.17.0",
"azure-devops-node-api": "^11.2.0",
"azure-pipelines-task-lib": "3.2.0",
"azure-pipelines-tasks-packaging-common-v3": "^3.206.0",
"azure-pipelines-tasks-packaging-common": "3.206.0",
"azure-pipelines-tasks-utility-common": "^3.210.0",
"decompress-zip": "0.3.3"
},
Expand Down
2 changes: 1 addition & 1 deletion Tasks/DownloadPackageV0/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"author": "ms-vscs-rm",
"version": {
"Major": 0,
"Minor": 213,
"Minor": 214,
"Patch": 0
},
"demands": [],
Expand Down
2 changes: 1 addition & 1 deletion Tasks/DownloadPackageV0/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"author": "ms-vscs-rm",
"version": {
"Major": 0,
"Minor": 213,
"Minor": 214,
"Patch": 0
},
"demands": [],
Expand Down
2 changes: 1 addition & 1 deletion Tasks/DownloadPackageV1/connections.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { WebApi } from "azure-devops-node-api";
import { IRequestOptions } from "azure-devops-node-api/interfaces/common/VsoBaseInterfaces";

import * as tl from 'azure-pipelines-task-lib/task';
import * as locationUtility from "azure-pipelines-tasks-packaging-common-v3/locationUtilities";
import * as locationUtility from "azure-pipelines-tasks-packaging-common/locationUtilities";

export function getConnection(areaId: string, collectionUrl: string): Promise<WebApi> {
var accessToken = locationUtility.getSystemAccessToken();
Expand Down
4 changes: 2 additions & 2 deletions Tasks/DownloadPackageV1/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
var path = require("path");

import * as tl from "azure-pipelines-task-lib/task";
import * as nutil from "azure-pipelines-tasks-packaging-common-v3/nuget/Utility";
import * as nutil from "azure-pipelines-tasks-packaging-common/nuget/Utility";
import * as telemetry from "azure-pipelines-tasks-utility-common/telemetry";

import { PackageUrlsBuilder } from "./packagebuilder";
import { PackageFile } from "./packagefile";
import { getConnection } from "./connections";
import { Retry } from "./retry";
import { downloadUniversalPackage } from "./universal";
import { getProjectAndFeedIdFromInputParam } from "azure-pipelines-tasks-packaging-common-v3/util"
import { getProjectAndFeedIdFromInputParam } from "azure-pipelines-tasks-packaging-common/util"

tl.setResourcePath(path.join(__dirname, "task.json"));

Expand Down
6 changes: 3 additions & 3 deletions Tasks/DownloadPackageV1/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Tasks/DownloadPackageV1/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"@types/node": "^10.17.0",
"azure-devops-node-api": "11.2.0",
"azure-pipelines-task-lib": "3.3.1",
"azure-pipelines-tasks-packaging-common-v3": "^3.206.0",
"azure-pipelines-tasks-packaging-common": "3.206.0",
"azure-pipelines-tasks-utility-common": "^3.198.1",
"decompress-zip": "0.3.3",
"tar-fs": "1.16.3"
Expand Down
2 changes: 1 addition & 1 deletion Tasks/DownloadPackageV1/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"version": {
"Major": 1,
"Minor": 214,
"Patch": 0
"Patch": 1
},
"demands": [],
"releaseNotes": "Adds support to download Maven, Python, Universal and Npm packages.",
Expand Down
2 changes: 1 addition & 1 deletion Tasks/DownloadPackageV1/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"version": {
"Major": 1,
"Minor": 214,
"Patch": 0
"Patch": 1
},
"demands": [],
"releaseNotes": "ms-resource:loc.releaseNotes",
Expand Down
6 changes: 3 additions & 3 deletions Tasks/DownloadPackageV1/universal.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import * as tl from "azure-pipelines-task-lib";
import { IExecSyncResult, IExecOptions } from "azure-pipelines-task-lib/toolrunner";
import * as artifactToolRunner from "azure-pipelines-tasks-packaging-common-v3/universal/ArtifactToolRunner";
import * as artifactToolRunner from "azure-pipelines-tasks-packaging-common/universal/ArtifactToolRunner";
import * as telemetry from "azure-pipelines-tasks-utility-common/telemetry";
import * as artifactToolUtilities from "azure-pipelines-tasks-packaging-common-v3/universal/ArtifactToolUtilities";
import * as pkgLocationUtils from "azure-pipelines-tasks-packaging-common-v3/locationUtilities";
import * as artifactToolUtilities from "azure-pipelines-tasks-packaging-common/universal/ArtifactToolUtilities";
import * as pkgLocationUtils from "azure-pipelines-tasks-packaging-common/locationUtilities";

export async function downloadUniversalPackage(
downloadPath: string,
Expand Down
2 changes: 1 addition & 1 deletion Tasks/MavenV2/Tests/TestUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import * as path from "path";

import { TaskMockRunner } from "azure-pipelines-task-lib/mock-run";

import { registerLocationHelpersMock } from 'azure-pipelines-tasks-packaging-common-v3/Tests/MockHelper';
import { registerLocationHelpersMock } from 'azure-pipelines-tasks-packaging-common/Tests/MockHelper';

export interface MavenTaskInputs {
mavenVersionSelection?: string;
Expand Down
4 changes: 2 additions & 2 deletions Tasks/MavenV2/make.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"node_modules/azure-pipelines-tasks-codecoverage-tools/node_modules/azure-pipeline-tool-lib",
"node_modules/azure-pipelines-tasks-java-common/node_modules/azure-pipelines-task-lib",
"node_modules/azure-pipelines-tasks-java-common/node_modules/azure-pipeline-tool-lib",
"node_modules/azure-pipelines-tasks-packaging-common-v3/node_modules/azure-pipelines-task-lib",
"node_modules/azure-pipelines-tasks-packaging-common-v3/node_modules/azure-pipeline-tool-lib"
"node_modules/azure-pipelines-tasks-packaging-common/node_modules/azure-pipelines-task-lib",
"node_modules/azure-pipelines-tasks-packaging-common/node_modules/azure-pipeline-tool-lib"
],
"options": "-Rf"
}
Expand Down
4 changes: 2 additions & 2 deletions Tasks/MavenV2/mavenutil.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import path = require('path');
import fs = require('fs');
import * as tl from 'azure-pipelines-task-lib/task';
import * as tr from 'azure-pipelines-task-lib/toolrunner';
import * as pkgLocationUtils from "azure-pipelines-tasks-packaging-common-v3/locationUtilities";
import { logError } from 'azure-pipelines-tasks-packaging-common-v3/util';
import * as pkgLocationUtils from "azure-pipelines-tasks-packaging-common/locationUtilities";
import { logError } from 'azure-pipelines-tasks-packaging-common/util';

import * as url from "url";
import * as xml2js from 'xml2js';
Expand Down
8 changes: 4 additions & 4 deletions Tasks/MavenV2/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Tasks/MavenV2/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"azure-pipelines-tasks-codeanalysis-common": "2.0.3",
"azure-pipelines-tasks-codecoverage-tools": "2.201.0",
"azure-pipelines-tasks-java-common": "^2.0.0-preview.0",
"azure-pipelines-tasks-packaging-common-v3": "^3.200.0",
"azure-pipelines-tasks-packaging-common": "3.200.1",
"base-64": "^0.1.0",
"fs-extra": "^0.30.0",
"request": "^2.74.0",
Expand Down
2 changes: 1 addition & 1 deletion Tasks/MavenV2/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 2,
"Minor": 211,
"Minor": 214,
"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`",
Expand Down
2 changes: 1 addition & 1 deletion Tasks/MavenV2/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 2,
"Minor": 211,
"Minor": 214,
"Patch": 0
},
"releaseNotes": "ms-resource:loc.releaseNotes",
Expand Down
2 changes: 1 addition & 1 deletion Tasks/MavenV3/Tests/TestUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import * as path from "path";

import { TaskMockRunner } from "azure-pipelines-task-lib/mock-run";

import { registerLocationHelpersMock } from 'azure-pipelines-tasks-packaging-common-v3/Tests/MockHelper';
import { registerLocationHelpersMock } from 'azure-pipelines-tasks-packaging-common/Tests/MockHelper';

export interface MavenTaskInputs {
mavenVersionSelection?: string;
Expand Down
4 changes: 2 additions & 2 deletions Tasks/MavenV3/make.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"node_modules/azure-pipelines-tasks-codecoverage-tools/node_modules/azure-pipeline-tool-lib",
"node_modules/azure-pipelines-tasks-java-common/node_modules/azure-pipelines-task-lib",
"node_modules/azure-pipelines-tasks-java-common/node_modules/azure-pipeline-tool-lib",
"node_modules/azure-pipelines-tasks-packaging-common-v3/node_modules/azure-pipelines-task-lib",
"node_modules/azure-pipelines-tasks-packaging-common-v3/node_modules/azure-pipeline-tool-lib"
"node_modules/azure-pipelines-tasks-packaging-common/node_modules/azure-pipelines-task-lib",
"node_modules/azure-pipelines-tasks-packaging-common/node_modules/azure-pipeline-tool-lib"
],
"options": "-Rf"
}
Expand Down
10 changes: 5 additions & 5 deletions Tasks/MavenV3/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Tasks/MavenV3/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"azure-pipelines-tasks-codeanalysis-common": "2.0.3",
"azure-pipelines-tasks-codecoverage-tools": "2.201.0",
"azure-pipelines-tasks-java-common": "2.198.1",
"azure-pipelines-tasks-packaging-common-v3": "^3.200.0",
"azure-pipelines-tasks-packaging-common": "3.201.0",
"base-64": "^0.1.0",
"fs-extra": "^0.30.0",
"jsdom": "^16.7.0",
Expand Down
2 changes: 1 addition & 1 deletion Tasks/MavenV3/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 3,
"Minor": 211,
"Minor": 214,
"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`",
Expand Down
2 changes: 1 addition & 1 deletion Tasks/MavenV3/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 3,
"Minor": 211,
"Minor": 214,
"Patch": 0
},
"releaseNotes": "ms-resource:loc.releaseNotes",
Expand Down
4 changes: 2 additions & 2 deletions Tasks/MavenV3/utils/mavenutil.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import path = require('path');
import fs = require('fs');
import * as tl from 'azure-pipelines-task-lib/task';
import * as tr from 'azure-pipelines-task-lib/toolrunner';
import * as pkgLocationUtils from "azure-pipelines-tasks-packaging-common-v3/locationUtilities";
import { logError } from 'azure-pipelines-tasks-packaging-common-v3/util';
import * as pkgLocationUtils from "azure-pipelines-tasks-packaging-common/locationUtilities";
import { logError } from 'azure-pipelines-tasks-packaging-common/util';
import * as url from "url";
import * as xml2js from 'xml2js';
import * as fse from 'fs-extra';
Expand Down
2 changes: 1 addition & 1 deletion Tasks/MavenV4/Tests/TestUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import * as path from "path";

import { TaskMockRunner } from "azure-pipelines-task-lib/mock-run";

import { registerLocationHelpersMock } from 'azure-pipelines-tasks-packaging-common-v3/Tests/MockHelper';
import { registerLocationHelpersMock } from 'azure-pipelines-tasks-packaging-common/Tests/MockHelper';

export interface MavenTaskInputs {
mavenVersionSelection?: string;
Expand Down
4 changes: 2 additions & 2 deletions Tasks/MavenV4/make.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"node_modules/azure-pipelines-tasks-codecoverage-tools/node_modules/azure-pipeline-tool-lib",
"node_modules/azure-pipelines-tasks-java-common/node_modules/azure-pipelines-task-lib",
"node_modules/azure-pipelines-tasks-java-common/node_modules/azure-pipeline-tool-lib",
"node_modules/azure-pipelines-tasks-packaging-common-v3/node_modules/azure-pipelines-task-lib",
"node_modules/azure-pipelines-tasks-packaging-common-v3/node_modules/azure-pipeline-tool-lib"
"node_modules/azure-pipelines-tasks-packaging-common/node_modules/azure-pipelines-task-lib",
"node_modules/azure-pipelines-tasks-packaging-common/node_modules/azure-pipeline-tool-lib"
],
"options": "-Rf"
}
Expand Down
6 changes: 3 additions & 3 deletions Tasks/MavenV4/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Tasks/MavenV4/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"azure-pipelines-tasks-codeanalysis-common": "2.0.3",
"azure-pipelines-tasks-codecoverage-tools": "3.214.0",
"azure-pipelines-tasks-java-common": "2.198.1",
"azure-pipelines-tasks-packaging-common-v3": "^3.200.0",
"azure-pipelines-tasks-packaging-common": "^3.200.1",
"base-64": "^0.1.0",
"fs-extra": "^0.30.0",
"jsdom": "^16.7.0",
Expand Down
2 changes: 1 addition & 1 deletion Tasks/MavenV4/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"version": {
"Major": 4,
"Minor": 214,
"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": [
Expand Down
2 changes: 1 addition & 1 deletion Tasks/MavenV4/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"version": {
"Major": 4,
"Minor": 214,
"Patch": 0
"Patch": 1
},
"releaseNotes": "ms-resource:loc.releaseNotes",
"demands": [
Expand Down
4 changes: 2 additions & 2 deletions Tasks/MavenV4/utils/mavenutil.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import path = require('path');
import fs = require('fs');
import * as tl from 'azure-pipelines-task-lib/task';
import * as tr from 'azure-pipelines-task-lib/toolrunner';
import * as pkgLocationUtils from "azure-pipelines-tasks-packaging-common-v3/locationUtilities";
import { logError } from 'azure-pipelines-tasks-packaging-common-v3/util';
import * as pkgLocationUtils from "azure-pipelines-tasks-packaging-common/locationUtilities";
import { logError } from 'azure-pipelines-tasks-packaging-common/util';
import * as url from "url";
import * as xml2js from 'xml2js';
import * as fse from 'fs-extra';
Expand Down
10 changes: 5 additions & 5 deletions Tasks/NpmAuthenticateV0/npmauth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ import * as tl from 'azure-pipelines-task-lib/task';
import * as URL from 'url';
import * as fs from 'fs';
import * as constants from './constants';
import * as npmregistry from 'azure-pipelines-tasks-packaging-common-v3/npm/npmregistry';
import * as util from 'azure-pipelines-tasks-packaging-common-v3/util';
import * as npmutil from 'azure-pipelines-tasks-packaging-common-v3/npm/npmutil';
import * as npmregistry from 'azure-pipelines-tasks-packaging-common/npm/npmregistry';
import * as util from 'azure-pipelines-tasks-packaging-common/util';
import * as npmutil from 'azure-pipelines-tasks-packaging-common/npm/npmutil';
import * as os from 'os';
import * as npmrcparser from 'azure-pipelines-tasks-packaging-common-v3/npm/npmrcparser';
import * as pkgLocationUtils from 'azure-pipelines-tasks-packaging-common-v3/locationUtilities';
import * as npmrcparser from 'azure-pipelines-tasks-packaging-common/npm/npmrcparser';
import * as pkgLocationUtils from 'azure-pipelines-tasks-packaging-common/locationUtilities';

async function main(): Promise<void> {
tl.setResourcePath(path.join(__dirname, 'task.json'));
Expand Down
2 changes: 1 addition & 1 deletion Tasks/NpmAuthenticateV0/npmauthcleanup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as util from 'azure-pipelines-tasks-packaging-common-v3/util';
import * as util from 'azure-pipelines-tasks-packaging-common/util';
import * as constants from './constants';
import * as tl from 'azure-pipelines-task-lib/task';
import * as fs from 'fs';
Expand Down
Loading