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

Revert changes from PR #15877. (#16145) #16150

Merged
merged 3 commits into from
Apr 14, 2022
Merged

Revert changes from PR #15877. (#16145) #16150

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a201c16
Revert changes from PR #15877. (#16145)
aasim Apr 13, 2022
2e3fb14
Added ws
aasim Apr 13, 2022
71813a8
Removed ws
aasim Apr 13, 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
4 changes: 2 additions & 2 deletions Tasks/DownloadPackageV1/multifilepackage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export class MultiFilePackage extends Package {
private async getPackageFileContent(fileMetadata: any): Promise<Map<string, PackageFileResult>> {
return new Promise<Map<string, PackageFileResult>>(resolve => {
var resultMap = new Map<string, PackageFileResult>();
resultMap[fileMetadata.name] = new PackageFileResult(fileMetadata.protocolMetadata.data.Content, false);
resultMap[fileMetadata.name] = new PackageFileResult(fileMetadata.protocolMetadata.data.content, false);
return resolve(resultMap);
});
}
Expand All @@ -74,7 +74,7 @@ export class MultiFilePackage extends Package {
if (filteredFileList.has(fileMetadatas[i].name)) {
const fileMetadata = fileMetadatas[i];
pkgFileUrlPromises.push(
fileMetadata.protocolMetadata.data.StorageId != null
fileMetadata.protocolMetadata.data.storageId != null
? this.getPackageFileDownloadUrl(feedId, project, packageMetadata, fileMetadata)
: this.getPackageFileContent(fileMetadata)
);
Expand Down
6 changes: 2 additions & 4 deletions Tasks/DownloadPackageV1/packagebuilder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,12 +125,10 @@ export class PackageUrlsBuilder {
}

private getPythonRouteParams(feedId: string, project: string, packageMetadata: any, fileMetadata: any): any {
tl.debug(`file md ${JSON.stringify(fileMetadata)}`);
tl.debug(`pk md ${JSON.stringify(packageMetadata)}`);
return {
feedId: feedId,
packageName: packageMetadata.protocolMetadata.data.Name,
packageVersion: packageMetadata.protocolMetadata.data.Version,
packageName: packageMetadata.protocolMetadata.data.name,
packageVersion: packageMetadata.protocolMetadata.data.version,
fileName: fileMetadata.name,
project: project
};
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": 202,
"Patch": 0
"Patch": 2
},
"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": 202,
"Patch": 0
"Patch": 2
},
"demands": [],
"releaseNotes": "ms-resource:loc.releaseNotes",
Expand Down