Skip to content

Commit

Permalink
Revert changes from PR #15877. (#16145)
Browse files Browse the repository at this point in the history
Co-authored-by: Aasim Malladi <[email protected]>
  • Loading branch information
aasim and Aasim Malladi authored Apr 13, 2022
1 parent 372d72c commit 618018d
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 9 deletions.
4 changes: 2 additions & 2 deletions Tasks/DownloadPackageV1/multifilepackage.ts
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
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
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"version": {
"Major": 1,
"Minor": 202,
"Patch": 1
"Patch": 2
},
"demands": [],
"releaseNotes": "Adds support to download Maven, Python, Universal and Npm packages.",
Expand Down
4 changes: 2 additions & 2 deletions Tasks/DownloadPackageV1/task.loc.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"version": {
"Major": 1,
"Minor": 202,
"Patch": 1
"Patch": 2
},
"demands": [],
"releaseNotes": "ms-resource:loc.releaseNotes",
Expand Down Expand Up @@ -187,4 +187,4 @@
"Info_Downloading": "ms-resource:loc.messages.Info_Downloading",
"Info_UsingArtifactToolDownload": "ms-resource:loc.messages.Info_UsingArtifactToolDownload"
}
}
}

0 comments on commit 618018d

Please sign in to comment.