Skip to content

Commit

Permalink
Update cred provider version and enable V2 (#9354)
Browse files Browse the repository at this point in the history
* Enable V2 cred provider based on NuGet version

* Use nuget cred provider version 0.1.11

* Bump version
  • Loading branch information
satbai authored Jan 18, 2019
1 parent 306b067 commit d21fde4
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 7 deletions.
6 changes: 2 additions & 4 deletions Tasks/Common/packaging-common/nuget/NuGetToolRunner2.ts
Original file line number Diff line number Diff line change
Expand Up @@ -248,12 +248,11 @@ export function isCredentialProviderEnabled(quirks: NuGetQuirks): boolean {
return false;
}

/* Temporarily don't use V2 credential provider based on NuGet version
const isWindows = tl.osType() === "Windows_NT";
if (quirks.hasQuirk(NuGetQuirkName.V2CredentialProvider) === true && isWindows) {
tl.debug("Credential provider V1 is disabled in favor of V2 plugin.");
return false;
}*/
}

if (isAnyCredentialProviderEnabled(quirks)) {
tl.debug("V1 credential provider is enabled");
Expand All @@ -280,12 +279,11 @@ export function isCredentialProviderV2Enabled(quirks: NuGetQuirks): boolean {
return false;
}

/* Temporarily don't use V2 credential provider based on NuGet version
const isWindows = tl.osType() === "Windows_NT";
if (quirks.hasQuirk(NuGetQuirkName.V2CredentialProvider) === true && isWindows) {
tl.debug("V2 credential provider is enabled.");
return true;
}*/
}

tl.debug("V2 credential provider is disabled.");
return false;
Expand Down
2 changes: 1 addition & 1 deletion Tasks/NuGetCommandV2/make.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"dest": "./CredentialProvider/"
},
{
"url": "https://vstsagenttools.blob.core.windows.net/tools/NuGetCredProvider/0.1.7/c.zip",
"url": "https://vstsagenttools.blob.core.windows.net/tools/NuGetCredProvider/0.1.11/c.zip",
"dest": "./CredentialProviderV2/"
}
]
Expand Down
2 changes: 1 addition & 1 deletion Tasks/NuGetCommandV2/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"version": {
"Major": 2,
"Minor": 147,
"Patch": 1
"Patch": 2
},
"runsOn": [
"Agent",
Expand Down
2 changes: 1 addition & 1 deletion Tasks/NuGetCommandV2/task.loc.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"version": {
"Major": 2,
"Minor": 147,
"Patch": 1
"Patch": 2
},
"runsOn": [
"Agent",
Expand Down

0 comments on commit d21fde4

Please sign in to comment.