Skip to content

Commit 8e1bba8

Browse files
authored
Bug fix for installing from ADO feeds with v2 endpoints (#1429)
1 parent 19abab7 commit 8e1bba8

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

src/code/V2ServerAPICalls.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ internal class V2ServerAPICalls : ServerApiCall
3939
private HttpClient _sessionClient { get; set; }
4040
private static readonly Hashtable[] emptyHashResponses = new Hashtable[]{};
4141
public FindResponseType v2FindResponseType = FindResponseType.ResponseString;
42+
private bool _isADORepo;
4243
private bool _isJFrogRepo;
4344

4445
#endregion
@@ -57,6 +58,7 @@ public V2ServerAPICalls (PSRepositoryInfo repository, PSCmdlet cmdletPassedIn, N
5758
_sessionClient = new HttpClient(handler);
5859
_sessionClient.DefaultRequestHeaders.TryAddWithoutValidation("User-Agent", userAgentString);
5960
var repoURL = repository.Uri.ToString().ToLower();
61+
_isADORepo = repoURL.Contains("pkgs.dev.azure.com") || repoURL.Contains("pkgs.visualstudio.com");
6062
_isJFrogRepo = repoURL.Contains("jfrog");
6163
}
6264

@@ -1145,8 +1147,14 @@ private Stream InstallVersion(string packageName, string version, out ErrorRecor
11451147
_cmdletPassedIn.WriteDebug("In V2ServerAPICalls::InstallVersion()");
11461148
string requestUrlV2;
11471149

1150+
if (_isADORepo)
1151+
{
1152+
// eg: https://pkgs.dev.azure.com/<org>/<project>/_packaging/<feed>/nuget/v2?id=test_module&version=5.0.0
1153+
requestUrlV2 = $"{Repository.Uri}?id={packageName}&version={version}";
1154+
}
11481155
if (_isJFrogRepo)
11491156
{
1157+
// eg: https://<project>.jfrog.io/artifactory/api/nuget/<feed>/Download/test_module/5.0.0
11501158
requestUrlV2 = $"{Repository.Uri}/Download/{packageName}/{version}";
11511159
}
11521160
else

src/code/V3ServerAPICalls.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,8 +291,8 @@ public override FindResults FindVersionWithTag(string packageName, string versio
291291
/// </summary>
292292
public override Stream InstallPackage(string packageName, string packageVersion, bool includePrerelease, out ErrorRecord errRecord)
293293
{
294-
Stream results = new MemoryStream();
295294
_cmdletPassedIn.WriteDebug("In V3ServerAPICalls::InstallPackage()");
295+
Stream results = new MemoryStream();
296296
if (string.IsNullOrEmpty(packageVersion))
297297
{
298298
results = InstallName(packageName, out errRecord);

0 commit comments

Comments
 (0)