Skip to content

Commit 16dec05

Browse files
authored
Merge pull request #23 from TP125487/library-improvements
Library improvements
2 parents 135f169 + 25bd5cb commit 16dec05

File tree

7 files changed

+10
-17
lines changed

7 files changed

+10
-17
lines changed

CloudConvert.API/CloudConvert.API.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net461;netstandard2.1;net5.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0</TargetFrameworks>
55
<AssemblyName>CloudConvert.API</AssemblyName>
66
<RootNamespace>CloudConvert.API</RootNamespace>
77
<Description>Official SDK for the CloudConvert API</Description>

CloudConvert.API/CloudConvertAPI.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System;
22
using System.Collections.Generic;
3-
using System.Globalization;
43
using System.IO;
54
using System.Linq;
65
using System.Net.Http;

CloudConvert.API/Models/Enums/ThumbnailFit.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace CloudConvert.API.Models.Enums
22
{
3-
public enum ThumbnailFit
3+
public enum ThumbnailFit
44
{
55
max,
66
crop,

CloudConvert.API/Models/TaskOperations/WatermarkCreateRequest.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
using Newtonsoft.Json;
2-
using Newtonsoft.Json.Converters;
32
using System.Collections.Generic;
4-
using CloudConvert.API.Models.Enums;
53

64
namespace CloudConvert.API.Models.TaskOperations
75
{

CloudConvert.Test/CloudConvert.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net461;netcoreapp3.1;net5.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0</TargetFrameworks>
55

66
<IsPackable>false</IsPackable>
77
</PropertyGroup>

CloudConvert.Test/IntegrationTests.cs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
11
using System.IO;
22
using System.Linq;
3-
using System.Net;
43
using System.Threading.Tasks;
54
using NUnit.Framework;
65
using CloudConvert.API;
7-
using CloudConvert.API.Models.Enums;
86
using CloudConvert.API.Models.ExportOperations;
97
using CloudConvert.API.Models.ImportOperations;
10-
using CloudConvert.API.Models.TaskOperations;
118
using CloudConvert.API.Models.JobModels;
12-
13-
using System.Collections.Generic;
149
using System;
10+
using System.Net.Http;
1511

1612
namespace CloudConvert.Test
1713
{
@@ -82,7 +78,9 @@ public async Task CreateJob(string streamingMethod)
8278
Assert.IsNotNull(fileExport);
8379
Assert.AreEqual(fileExport.Filename, "input.pdf");
8480

85-
using (var client = new WebClient()) client.DownloadFile(fileExport.Url, fileExport.Filename);
81+
using var httpClient = new HttpClient();
82+
var fileBytes = await httpClient.GetByteArrayAsync(fileExport.Url);
83+
await File.WriteAllBytesAsync(fileExport.Filename, fileBytes);
8684
}
8785

8886
[TestCase("stream")]
@@ -140,8 +138,9 @@ public async Task CreateTask(string streamingMethod)
140138
Assert.IsNotNull(fileExport);
141139
Assert.AreEqual(fileExport.Filename, "input.pdf");
142140

143-
using (var client = new WebClient()) client.DownloadFile(fileExport.Url, fileExport.Filename);
144-
141+
using var httpClient = new HttpClient();
142+
var fileBytes = await httpClient.GetByteArrayAsync(fileExport.Url);
143+
await File.WriteAllBytesAsync(fileExport.Filename, fileBytes);
145144
}
146145
}
147146
}

CloudConvert.Test/TestTasks.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
using System;
22
using System.IO;
3-
using System.Net;
43
using System.Net.Http;
5-
using System.Threading;
64
using System.Threading.Tasks;
75
using CloudConvert.API;
86
using CloudConvert.API.Models;
9-
using CloudConvert.API.Models.Enums;
107
using CloudConvert.API.Models.ImportOperations;
118
using CloudConvert.API.Models.TaskModels;
129
using CloudConvert.API.Models.TaskOperations;

0 commit comments

Comments
 (0)