Skip to content

Fix Azure Dev Ops startup error (Null error check) #159

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

Merged
coenm merged 3 commits into from
Sep 7, 2024
Merged

Fix Azure Dev Ops startup error (Null error check) #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
720956e
Fix Azure Dev Ops startup error
gabriel-vanca Sep 6, 2024
9acce09
global sort
gabriel-vanca Sep 6, 2024
a9c0bf4
Nerdbank.GitVersioning update
gabriel-vanca Sep 6, 2024
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
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Nerdbank.GitVersioning" Condition="!Exists('packages.config')">
<Version>3.6.141</Version>
<Version>3.6.143</Version>
<PrivateAssets>all</PrivateAssets>
</PackageReference>

Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.401",
"rollForward": "latestFeature"
"rollForward": "latestFeature",
"version": "8.0.401"
}
}
23 changes: 16 additions & 7 deletions src/RepoM.Plugin.AzureDevOps/Internal/AzureDevOpsPullRequestService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,21 @@ public AzureDevOpsPullRequestService(IAzureDevopsConfiguration configuration, IL

try
{
_connection = new VssConnection(
_configuration.AzureDevOpsBaseUrl,
new VssBasicCredential(string.Empty, _configuration.AzureDevOpsPersonalAccessToken));
_httpClient.BaseAddress = _configuration.AzureDevOpsBaseUrl;
_httpClient.DefaultRequestHeaders.Accept.Add(new("application/json"));
_httpClient.DefaultRequestHeaders.Authorization = new("Basic", Convert.ToBase64String(Encoding.ASCII.GetBytes($":{_configuration.AzureDevOpsPersonalAccessToken}")));
if (string.IsNullOrEmpty(configuration.AzureDevOpsPersonalAccessToken))
{
//throw new ArgumentNullException(nameof(configuration.AzureDevOpsPersonalAccessToken));
_logger.LogInformation("No Azure configuration present");
}
else
{
_connection = new VssConnection(
_configuration.AzureDevOpsBaseUrl,
new VssBasicCredential(string.Empty, _configuration.AzureDevOpsPersonalAccessToken));
_httpClient.BaseAddress = _configuration.AzureDevOpsBaseUrl;
_httpClient.DefaultRequestHeaders.Accept.Add(new("application/json"));
_httpClient.DefaultRequestHeaders.Authorization = new("Basic", Convert.ToBase64String(Encoding.ASCII.GetBytes($":{_configuration.AzureDevOpsPersonalAccessToken}")));
}

}
catch (Exception e)
{
Expand Down Expand Up @@ -515,4 +524,4 @@ private static string GetRepositorySearchUrl(IRepository repository)
var searchRepoUrl = url.Scheme + "://" + url.Host + url.LocalPath;
return searchRepoUrl;
}
}
}