Changes for .NET 5

This commit is contained in:
Shaun Walker
2020-10-08 11:20:43 -04:00
parent 0c0916c6ab
commit aad10ab1c4
6 changed files with 32 additions and 37 deletions

View File

@ -34,8 +34,7 @@ namespace Oqtane.Controllers
using (var httpClient = new HttpClient())
{
CancellationToken token;
var searchResult = await GetJson<SearchResult>(httpClient, "https://azuresearch-usnc.nuget.org/query?q=tags:oqtane", token);
var searchResult = await GetJson<SearchResult>(httpClient, "https://azuresearch-usnc.nuget.org/query?q=tags:oqtane");
foreach(Data data in searchResult.Data)
{
if (data.Tags.Contains(tag))
@ -61,9 +60,8 @@ namespace Oqtane.Controllers
{
using (var httpClient = new HttpClient())
{
CancellationToken token;
folder = Path.Combine(_environment.WebRootPath, folder);
var response = await httpClient.GetAsync("https://www.nuget.org/api/v2/package/" + packageid.ToLower() + "/" + version, token).ConfigureAwait(false);
var response = await httpClient.GetAsync("https://www.nuget.org/api/v2/package/" + packageid.ToLower() + "/" + version).ConfigureAwait(false);
response.EnsureSuccessStatusCode();
string filename = packageid + "." + version + ".nupkg";
using (var fileStream = new FileStream(Path.Combine(folder, filename), FileMode.Create, FileAccess.Write, FileShare.None))
@ -73,10 +71,10 @@ namespace Oqtane.Controllers
}
}
private async Task<T> GetJson<T>(HttpClient httpClient, string url, CancellationToken token)
private async Task<T> GetJson<T>(HttpClient httpClient, string url)
{
Uri uri = new Uri(url);
var response = await httpClient.GetAsync(uri, token).ConfigureAwait(false);
var response = await httpClient.GetAsync(uri).ConfigureAwait(false);
response.EnsureSuccessStatusCode();
var stream = await response.Content.ReadAsStreamAsync();
using (var streamReader = new StreamReader(stream))