Skip to content

Adding support for ClientOM 19 and 20 in PowerShell task SDK #1140

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

Draft
MantavyaDh wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Adding support for ClientOM 19 and 20 in PowerShell task SDK #1140

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 19 additions & 1 deletion powershell/VstsTaskSdk/ServerOMFunctions.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,23 @@ function Get-TfsClientCredentials {
}
[System.AppDomain]::CurrentDomain.add_AssemblyResolve($onAssemblyResolve)

# Validate the type can be found.
# Try to use VssClientCredentials first (ClientOM 14+), then fall back to TfsClientCredentials (legacy)
if ((Get-OMType -TypeName 'Microsoft.VisualStudio.Services.Client.VssClientCredentials' -OMKind 'WebApi' -OMDirectory $OMDirectory)) {
# Create the federated credential - try VssOAuthAccessTokenCredential first (ClientOM 16+), then VssOAuthCredential (ClientOM 14)
if ((Get-OMType -TypeName 'Microsoft.VisualStudio.Services.OAuth.VssOAuthAccessTokenCredential' -OMKind 'WebApi' -OMDirectory $OMDirectory)) {
$federatedCredential = New-Object Microsoft.VisualStudio.Services.OAuth.VssOAuthAccessTokenCredential([string]$endpoint.auth.parameters.AccessToken)
} else {
$null = Get-OMType -TypeName 'Microsoft.VisualStudio.Services.Client.VssOAuthCredential' -OMKind 'WebApi' -OMDirectory $OMDirectory -Require
$federatedCredential = New-Object Microsoft.VisualStudio.Services.Client.VssOAuthCredential([string]$endpoint.auth.parameters.AccessToken)
}

# Create VssClientCredentials using (WindowsCredential, FederatedCredential) constructor
return New-Object Microsoft.VisualStudio.Services.Client.VssClientCredentials(
(New-Object Microsoft.VisualStudio.Services.Common.WindowsCredential($false)), # Do not use default credentials.
$federatedCredential)
}

# Fall back to TfsClientCredentials (legacy)
$null = Get-OMType -TypeName 'Microsoft.TeamFoundation.Client.TfsClientCredentials' -OMKind 'ExtendedClient' -OMDirectory $OMDirectory -Require

# Construct the credentials.
Expand Down Expand Up @@ -621,6 +637,8 @@ function Get-OMType {

$dllPaths += [System.IO.Path]::Combine($OMDirectory, "$namespace.WebApi.dll")
$dllPaths += [System.IO.Path]::Combine($OMDirectory, "$namespace.dll")
# Also check for Interactive.dll (VssClientCredentials moved here in ClientOM 16+)
$dllPaths += [System.IO.Path]::Combine($OMDirectory, "$namespace.Interactive.dll")
}
}
}
Expand Down
Loading