From b81e2f5ec6e733b868e9e84a1cf1c133d2363966 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20P=C3=B6chtrager?= Date: Wed, 19 Feb 2025 07:49:07 +0100 Subject: [PATCH 1/4] Remove unneeded usings --- CloudConvert.API/CloudConvertAPI.cs | 1 - .../Models/TaskOperations/WatermarkCreateRequest.cs | 2 -- CloudConvert.Test/IntegrationTests.cs | 4 ---- CloudConvert.Test/TestTasks.cs | 3 --- 4 files changed, 10 deletions(-) diff --git a/CloudConvert.API/CloudConvertAPI.cs b/CloudConvert.API/CloudConvertAPI.cs index 8d8780d..958b115 100644 --- a/CloudConvert.API/CloudConvertAPI.cs +++ b/CloudConvert.API/CloudConvertAPI.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Globalization; using System.IO; using System.Linq; using System.Net.Http; diff --git a/CloudConvert.API/Models/TaskOperations/WatermarkCreateRequest.cs b/CloudConvert.API/Models/TaskOperations/WatermarkCreateRequest.cs index be59dd7..e2df967 100644 --- a/CloudConvert.API/Models/TaskOperations/WatermarkCreateRequest.cs +++ b/CloudConvert.API/Models/TaskOperations/WatermarkCreateRequest.cs @@ -1,7 +1,5 @@ using Newtonsoft.Json; -using Newtonsoft.Json.Converters; using System.Collections.Generic; -using CloudConvert.API.Models.Enums; namespace CloudConvert.API.Models.TaskOperations { diff --git a/CloudConvert.Test/IntegrationTests.cs b/CloudConvert.Test/IntegrationTests.cs index b647f62..7d01e82 100644 --- a/CloudConvert.Test/IntegrationTests.cs +++ b/CloudConvert.Test/IntegrationTests.cs @@ -4,13 +4,9 @@ using System.Threading.Tasks; using NUnit.Framework; using CloudConvert.API; -using CloudConvert.API.Models.Enums; using CloudConvert.API.Models.ExportOperations; using CloudConvert.API.Models.ImportOperations; -using CloudConvert.API.Models.TaskOperations; using CloudConvert.API.Models.JobModels; - -using System.Collections.Generic; using System; namespace CloudConvert.Test diff --git a/CloudConvert.Test/TestTasks.cs b/CloudConvert.Test/TestTasks.cs index c50854a..f8e1a8e 100644 --- a/CloudConvert.Test/TestTasks.cs +++ b/CloudConvert.Test/TestTasks.cs @@ -1,12 +1,9 @@ using System; using System.IO; -using System.Net; using System.Net.Http; -using System.Threading; using System.Threading.Tasks; using CloudConvert.API; using CloudConvert.API.Models; -using CloudConvert.API.Models.Enums; using CloudConvert.API.Models.ImportOperations; using CloudConvert.API.Models.TaskModels; using CloudConvert.API.Models.TaskOperations; From d695b4ca7875f603c68a1036ea4c6d4bcc274458 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20P=C3=B6chtrager?= Date: Wed, 19 Feb 2025 07:55:12 +0100 Subject: [PATCH 2/4] Update target framework to Dotnet 8.0 --- CloudConvert.API/CloudConvert.API.csproj | 2 +- CloudConvert.Test/CloudConvert.Test.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CloudConvert.API/CloudConvert.API.csproj b/CloudConvert.API/CloudConvert.API.csproj index a6fe498..1cf8d90 100644 --- a/CloudConvert.API/CloudConvert.API.csproj +++ b/CloudConvert.API/CloudConvert.API.csproj @@ -1,7 +1,7 @@  - net461;netstandard2.1;net5.0 + net8.0 CloudConvert.API CloudConvert.API Official SDK for the CloudConvert API diff --git a/CloudConvert.Test/CloudConvert.Test.csproj b/CloudConvert.Test/CloudConvert.Test.csproj index bc84be4..a5a5193 100644 --- a/CloudConvert.Test/CloudConvert.Test.csproj +++ b/CloudConvert.Test/CloudConvert.Test.csproj @@ -1,7 +1,7 @@  - net461;netcoreapp3.1;net5.0 + net8.0 false From a38f51ffc91af0834d62b16bd3a3e95600e5ac6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20P=C3=B6chtrager?= Date: Wed, 19 Feb 2025 07:57:55 +0100 Subject: [PATCH 3/4] Replace obsolete WebClient() with HttpClient() --- CloudConvert.Test/IntegrationTests.cs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/CloudConvert.Test/IntegrationTests.cs b/CloudConvert.Test/IntegrationTests.cs index 7d01e82..6a5af35 100644 --- a/CloudConvert.Test/IntegrationTests.cs +++ b/CloudConvert.Test/IntegrationTests.cs @@ -1,6 +1,5 @@ using System.IO; using System.Linq; -using System.Net; using System.Threading.Tasks; using NUnit.Framework; using CloudConvert.API; @@ -8,6 +7,7 @@ using CloudConvert.API.Models.ImportOperations; using CloudConvert.API.Models.JobModels; using System; +using System.Net.Http; namespace CloudConvert.Test { @@ -78,7 +78,9 @@ public async Task CreateJob(string streamingMethod) Assert.IsNotNull(fileExport); Assert.AreEqual(fileExport.Filename, "input.pdf"); - using (var client = new WebClient()) client.DownloadFile(fileExport.Url, fileExport.Filename); + using var httpClient = new HttpClient(); + var fileBytes = await httpClient.GetByteArrayAsync(fileExport.Url); + await File.WriteAllBytesAsync(fileExport.Filename, fileBytes); } [TestCase("stream")] @@ -136,8 +138,9 @@ public async Task CreateTask(string streamingMethod) Assert.IsNotNull(fileExport); Assert.AreEqual(fileExport.Filename, "input.pdf"); - using (var client = new WebClient()) client.DownloadFile(fileExport.Url, fileExport.Filename); - + using var httpClient = new HttpClient(); + var fileBytes = await httpClient.GetByteArrayAsync(fileExport.Url); + await File.WriteAllBytesAsync(fileExport.Filename, fileBytes); } } } From 25bd5cb397b336bec1ab0b14f0a2d5a83e09945c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20P=C3=B6chtrager?= Date: Wed, 19 Feb 2025 08:00:11 +0100 Subject: [PATCH 4/4] Fix indentation --- CloudConvert.API/Models/Enums/ThumbnailFit.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CloudConvert.API/Models/Enums/ThumbnailFit.cs b/CloudConvert.API/Models/Enums/ThumbnailFit.cs index c012f3c..0813119 100644 --- a/CloudConvert.API/Models/Enums/ThumbnailFit.cs +++ b/CloudConvert.API/Models/Enums/ThumbnailFit.cs @@ -1,6 +1,6 @@ namespace CloudConvert.API.Models.Enums { - public enum ThumbnailFit + public enum ThumbnailFit { max, crop,