Release 24.2 (#84)

Denis-Averin · web-flow · commit 61affaba7512 · 2024-02-29T12:16:48.000+06:00
* Update github checkout version from v3 to v4

* Update packages

* Update version to 24.2.0

* Add tests with Types
diff --git a/.github/workflows/build-examples.yml b/.github/workflows/build-examples.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Setup latest version of dotnet
       uses: actions/setup-dotnet@v3
     - name: Build nuget with latest version
diff --git a/.github/workflows/check-badges.yml b/.github/workflows/check-badges.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Check badges in README.md
       run: ./scripts/check-badges.bash "README.md"
diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml
@@ -28,7 +28,7 @@ jobs:
     continue-on-error: true
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Setup latest version of dotnet
       uses: actions/setup-dotnet@v3
     - name: Build with latest version
diff --git a/.github/workflows/net-framework.yml b/.github/workflows/net-framework.yml
@@ -26,7 +26,7 @@ jobs:
     continue-on-error: true
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Setup MSBuild
       uses: microsoft/setup-msbuild@v1.1
diff --git a/.github/workflows/pack.yml b/.github/workflows/pack.yml
@@ -11,6 +11,6 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Build the Docker image
       run: docker build . --file Dockerfile
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
 [![Nuget](https://img.shields.io/nuget/v/Aspose.BarCode-Cloud)](https://www.nuget.org/packages/Aspose.BarCode-Cloud/)
 
 - API version: 3.0
-- SDK version: 24.1.0
+- SDK version: 24.2.0
 
 ## Demo applications
 
@@ -35,7 +35,7 @@ The complete source code is available in this repository folder. You can either
 
 ## Prerequisites
 
-To use Aspose.BarCode Cloud SDK for .NET you need to register an account with [Aspose Cloud](https://www.aspose.cloud) and lookup/create Client Secret and Client Id at [Cloud Dashboard](https://dashboard.aspose.cloud/applications). There is free quota available. For more details, see [Aspose Cloud Pricing](https://purchase.aspose.cloud/pricing).
+To use Aspose.BarCode Cloud SDK for .NET you need to register an account with [Aspose Cloud](https://www.aspose.cloud) and lookup/create Client Secret and Client Id at [Cloud Dashboard](https://dashboard.aspose.cloud/applications). There is free quota available. For more details, see [Aspose Cloud Pricing](https://purchase.aspose.cloud/).
 
 ## Installation
 
diff --git a/Tests/Aspose.BarCode.Cloud.Sdk.Tests.csproj b/Tests/Aspose.BarCode.Cloud.Sdk.Tests.csproj
@@ -15,7 +15,7 @@
     <PackageReference Include="Moq" Version="4.20.70" />
     <PackageReference Include="NUnit" Version="3.14.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Tests/BarcodeApiTests.cs b/Tests/BarcodeApiTests.cs
@@ -133,7 +133,7 @@ public void GetBarcodeRecognizeTest()
                 {
                     folder = folder,
                     Preset = PresetType.HighPerformance.ToString(),
-                    Timeout = 30_000
+                    Types = new List<DecodeBarcodeType> { DecodeBarcodeType.QR, DecodeBarcodeType.Code128 }
                 }
             );
 
@@ -177,7 +177,7 @@ public void PostBarcodeRecognizeFromUrlOrContentTest()
                 {
                     ChecksumValidation = ChecksumValidation.Off.ToString(),
                     Preset = PresetType.HighPerformance.ToString(),
-                    Timeout = 30_000
+                    Types = new List<DecodeBarcodeType> { DecodeBarcodeType.Code11 }
                 }
             );
 
@@ -284,7 +284,7 @@ public void PutBarcodeRecognizeFromBodyTest()
                     readerParams: new ReaderParams
                     {
                         Preset = PresetType.HighPerformance,
-                        Timeout = 30_000
+                        Types = new List<DecodeBarcodeType> { DecodeBarcodeType.Code128 }
                     }
                 )
                 {
@@ -402,7 +402,7 @@ public async Task GetBarcodeRecognizeAsyncTest()
                 {
                     folder = folder,
                     Preset = PresetType.HighPerformance.ToString(),
-                    Timeout = 30_000
+                    Types = new List<DecodeBarcodeType> { DecodeBarcodeType.QR, DecodeBarcodeType.Code128 }
                 }
             );
 
@@ -435,7 +435,7 @@ public async Task PostBarcodeRecognizeFromUrlOrContentAsyncTest()
                 {
                     ChecksumValidation = ChecksumValidation.Off.ToString(),
                     Preset = PresetType.HighPerformance.ToString(),
-                    Timeout = 30_000
+                    Types = new List<DecodeBarcodeType> { DecodeBarcodeType.Code11 },
                 }
             );
 
@@ -481,7 +481,7 @@ public async Task PostGenerateMultipleAsyncTest()
             // Assert
             Assert.IsTrue(response.Length > 0);
             using FileStream savedFileStream = File.Create(TestFilePath("Test_PostGenerateMultiple.png"));
-            response.CopyTo(savedFileStream);
+            await response.CopyToAsync(savedFileStream);
         }
 
 
@@ -539,7 +539,7 @@ public async Task PutBarcodeRecognizeFromBodyAsyncTest()
                     readerParams: new ReaderParams
                     {
                         Preset = PresetType.HighPerformance,
-                        Timeout = 30_000
+                        Types = new List<DecodeBarcodeType> { DecodeBarcodeType.Code128 }
                     }
                 )
                 {
diff --git a/Tests/GenerateAndThenRecognize.cs b/Tests/GenerateAndThenRecognize.cs
@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
@@ -32,6 +33,13 @@ public void GenerateAndThenRecognizeTest()
             BarcodeResponseList recognized = _api.PostBarcodeRecognizeFromUrlOrContent(
 #pragma warning restore CS0618 // Type or member is obsolete
                 new PostBarcodeRecognizeFromUrlOrContentRequest(generatedImage)
+                {
+                    Preset = PresetType.HighPerformance.ToString(),
+                    Types = new List<DecodeBarcodeType>
+                    {
+                        DecodeBarcodeType.QR
+                    }
+                }
             );
 
             Assert.AreEqual(1, recognized.Barcodes.Count);
@@ -55,6 +63,13 @@ public async Task GenerateAndThenRecognizeAsyncTest()
 
             BarcodeResponseList recognized = await _api.PostBarcodeRecognizeFromUrlOrContentAsync(
                 new PostBarcodeRecognizeFromUrlOrContentRequest(generatedImage)
+                {
+                    Preset = PresetType.HighPerformance.ToString(),
+                    Types = new List<DecodeBarcodeType>
+                    {
+                        DecodeBarcodeType.QR
+                    }
+                }
             );
 
             Assert.AreEqual(1, recognized.Barcodes.Count);
diff --git a/Tests/JWTRequestHandlerTests.cs b/Tests/JWTRequestHandlerTests.cs
@@ -85,9 +85,9 @@ public void TestTokenRefresh()
             jwtHandler.BeforeSend(request2, new MemoryStream());
 
             Assert.Contains("Authorization", request2.Headers.Keys);
-            var auth = request2.Headers["Authorization"];
+            string auth = request2.Headers["Authorization"];
             Assert.Greater(auth.Length, "Bearer ".Length);
-            var token = auth.Substring("Bearer ".Length);
+            string token = auth.Substring("Bearer ".Length);
             AssertTokenIsValid(token);
         }
 
@@ -111,7 +111,7 @@ public async Task TestTokenFetchedAsync()
             Assert.IsTrue(request.Headers.Contains("Authorization"));
             var auth = request.Headers.Authorization.ToString();
             Assert.Greater(auth.Length, "Bearer ".Length);
-            var token = auth.Substring("Bearer ".Length);
+            string token = auth.Substring("Bearer ".Length);
             AssertTokenIsValid(token);
         }
 
@@ -125,7 +125,7 @@ public async Task TestTokenRefreshAsync()
             }
 
             // arrange
-            HttpResponseMessage response401 = new HttpResponseMessage(HttpStatusCode.Unauthorized);
+            var response401 = new HttpResponseMessage(HttpStatusCode.Unauthorized);
 
             var jwtHandler = new JwtRequestHandler(TestConfiguration);
 
@@ -146,7 +146,7 @@ public async Task TestTokenRefreshAsync()
             Assert.IsTrue(request2.Headers.Contains("Authorization"));
             var auth = request2.Headers.Authorization.ToString();
             Assert.Greater(auth.Length, "Bearer ".Length);
-            var token = auth.Substring("Bearer ".Length);
+            string token = auth.Substring("Bearer ".Length);
             AssertTokenIsValid(token);
         }
 
@@ -173,6 +173,5 @@ private static void AssertTokenIsValid(string token)
 
             Assert.AreEqual("JWT", tokenHeader["typ"]?.ToString());
         }
-
     }
 }
diff --git a/Tests/RecognizeTests.cs b/Tests/RecognizeTests.cs
@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
 using Aspose.BarCode.Cloud.Sdk.Api;
@@ -38,8 +39,7 @@ public void RecognizeQrTest()
                 new PostBarcodeRecognizeFromUrlOrContentRequest(image)
                 {
                     Preset = PresetType.HighPerformance.ToString(),
-                    Type = DecodeBarcodeType.QR.ToString(),
-                    Timeout = 30_000
+                    Types = new List<DecodeBarcodeType> { DecodeBarcodeType.QR },
                 }
             );
 
@@ -64,8 +64,6 @@ public void RecognizeWithTimeoutTest()
 #pragma warning restore CS0618 // Method is obsolete
                     new PostBarcodeRecognizeFromUrlOrContentRequest(image)
                     {
-                        Preset = PresetType.HighPerformance.ToString(),
-                        Type = DecodeBarcodeType.QR.ToString(),
                         Timeout = 1
                     }
                 );
@@ -87,8 +85,7 @@ public async Task RecognizeQrAsyncTest()
                 new PostBarcodeRecognizeFromUrlOrContentRequest(image)
                 {
                     Preset = PresetType.HighPerformance.ToString(),
-                    Type = DecodeBarcodeType.QR.ToString(),
-                    Timeout = 30_000
+                    Types = new List<DecodeBarcodeType> { DecodeBarcodeType.QR },
                 }
             );
 
@@ -111,8 +108,6 @@ public void RecognizeWithTimeoutAsyncTest()
                 await _api.PostBarcodeRecognizeFromUrlOrContentAsync(
                     new PostBarcodeRecognizeFromUrlOrContentRequest(image)
                     {
-                        Preset = PresetType.HighPerformance.ToString(),
-                        Type = DecodeBarcodeType.QR.ToString(),
                         Timeout = 1
                     }
                 );
diff --git a/examples/GenerateQR/GenerateQR.csproj b/examples/GenerateQR/GenerateQR.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Aspose.BarCode-Cloud" Version="24.1.0" />
+    <PackageReference Include="Aspose.BarCode-Cloud" Version="24.2.0" />
   </ItemGroup>
 
 </Project>
diff --git a/examples/ReadQR/ReadQR.csproj b/examples/ReadQR/ReadQR.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Aspose.BarCode-Cloud" Version="24.1.0" />
+    <PackageReference Include="Aspose.BarCode-Cloud" Version="24.2.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Aspose.BarCode.Cloud.Sdk.csproj b/src/Aspose.BarCode.Cloud.Sdk.csproj
@@ -20,11 +20,11 @@ Aspose.Barcode for Cloud allows you to control all aspects of the image and barc
     <PackageId>Aspose.BarCode-Cloud</PackageId>
     <Product>Aspose.BarCode Cloud SDK for .NET</Product>
     <PackageIcon>PackageIcon.png</PackageIcon>
-    <Version>24.1.0</Version>
+    <Version>24.2.0</Version>
     <Authors>Aspose</Authors>
-    <AssemblyVersion>24.1.0.0</AssemblyVersion>
+    <AssemblyVersion>24.2.0.0</AssemblyVersion>
     <PackageReadmeFile>README.md</PackageReadmeFile>
-    <PackageReleaseNotes>https://github.com/aspose-barcode-cloud/aspose-barcode-cloud-dotnet/releases/tag/v24.1.0</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/aspose-barcode-cloud/aspose-barcode-cloud-dotnet/releases/tag/v24.2.0</PackageReleaseNotes>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -43,7 +43,7 @@ Aspose.Barcode for Cloud allows you to control all aspects of the image and barc
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
diff --git a/src/Internal/UrlHelper.cs b/src/Internal/UrlHelper.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections;
 using System.Collections.Specialized;
 using System.Web;
 
@@ -42,7 +43,23 @@ public static string AddQueryParameterToUrl(string url, string parameterName, ob
 
             var uriBuilder = new UriBuilder(url);
             NameValueCollection query = HttpUtility.ParseQueryString(uriBuilder.Query);
-            query.Add(parameterName, parameterValue.ToString());
+
+            if (parameterValue is string stringValue)
+            {
+                query.Add(parameterName, stringValue);
+            }
+            else if (parameterValue is ICollection collection)
+            {
+                foreach (object item in collection)
+                {
+                    query.Add(parameterName, item.ToString());
+                }
+            }
+            else
+            {
+                query.Add(parameterName, parameterValue.ToString());
+            }
+
             uriBuilder.Query = query.ToString();
 
             return uriBuilder.ToString();

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ public void GetBarcodeRecognizeTest()`
`133`	`133`	`{`
`134`	`134`	`folder = folder,`
`135`	`135`	`Preset = PresetType.HighPerformance.ToString(),`
`136`		`- Timeout = 30_000`
	`136`	`+ Types = new List<DecodeBarcodeType> { DecodeBarcodeType.QR, DecodeBarcodeType.Code128 }`
`137`	`137`	`}`
`138`	`138`	`);`
`139`	`139`
`@@ -177,7 +177,7 @@ public void PostBarcodeRecognizeFromUrlOrContentTest()`
`177`	`177`	`{`
`178`	`178`	`ChecksumValidation = ChecksumValidation.Off.ToString(),`
`179`	`179`	`Preset = PresetType.HighPerformance.ToString(),`
`180`		`- Timeout = 30_000`
	`180`	`+ Types = new List<DecodeBarcodeType> { DecodeBarcodeType.Code11 }`
`181`	`181`	`}`
`182`	`182`	`);`
`183`	`183`
`@@ -284,7 +284,7 @@ public void PutBarcodeRecognizeFromBodyTest()`
`284`	`284`	`readerParams: new ReaderParams`
`285`	`285`	`{`
`286`	`286`	`Preset = PresetType.HighPerformance,`
`287`		`- Timeout = 30_000`
	`287`	`+ Types = new List<DecodeBarcodeType> { DecodeBarcodeType.Code128 }`
`288`	`288`	`}`
`289`	`289`	`)`
`290`	`290`	`{`
`@@ -402,7 +402,7 @@ public async Task GetBarcodeRecognizeAsyncTest()`
`402`	`402`	`{`
`403`	`403`	`folder = folder,`
`404`	`404`	`Preset = PresetType.HighPerformance.ToString(),`
`405`		`- Timeout = 30_000`
	`405`	`+ Types = new List<DecodeBarcodeType> { DecodeBarcodeType.QR, DecodeBarcodeType.Code128 }`
`406`	`406`	`}`
`407`	`407`	`);`
`408`	`408`
`@@ -435,7 +435,7 @@ public async Task PostBarcodeRecognizeFromUrlOrContentAsyncTest()`
`435`	`435`	`{`
`436`	`436`	`ChecksumValidation = ChecksumValidation.Off.ToString(),`
`437`	`437`	`Preset = PresetType.HighPerformance.ToString(),`
`438`		`- Timeout = 30_000`
	`438`	`+ Types = new List<DecodeBarcodeType> { DecodeBarcodeType.Code11 },`
`439`	`439`	`}`
`440`	`440`	`);`
`441`	`441`
`@@ -481,7 +481,7 @@ public async Task PostGenerateMultipleAsyncTest()`
`481`	`481`	`// Assert`
`482`	`482`	`Assert.IsTrue(response.Length > 0);`
`483`	`483`	`using FileStream savedFileStream = File.Create(TestFilePath("Test_PostGenerateMultiple.png"));`
`484`		`- response.CopyTo(savedFileStream);`
	`484`	`+ await response.CopyToAsync(savedFileStream);`
`485`	`485`	`}`
`486`	`486`
`487`	`487`
`@@ -539,7 +539,7 @@ public async Task PutBarcodeRecognizeFromBodyAsyncTest()`
`539`	`539`	`readerParams: new ReaderParams`
`540`	`540`	`{`
`541`	`541`	`Preset = PresetType.HighPerformance,`
`542`		`- Timeout = 30_000`
	`542`	`+ Types = new List<DecodeBarcodeType> { DecodeBarcodeType.Code128 }`
`543`	`543`	`}`
`544`	`544`	`)`
`545`	`545`	`{`
Original file line number	Diff line number	Diff line change
`@@ -85,9 +85,9 @@ public void TestTokenRefresh()`
`85`	`85`	`jwtHandler.BeforeSend(request2, new MemoryStream());`
`86`	`86`
`87`	`87`	`Assert.Contains("Authorization", request2.Headers.Keys);`
`88`		`- var auth = request2.Headers["Authorization"];`
	`88`	`+ string auth = request2.Headers["Authorization"];`
`89`	`89`	`Assert.Greater(auth.Length, "Bearer ".Length);`
`90`		`- var token = auth.Substring("Bearer ".Length);`
	`90`	`+ string token = auth.Substring("Bearer ".Length);`
`91`	`91`	`AssertTokenIsValid(token);`
`92`	`92`	`}`
`93`	`93`
`@@ -111,7 +111,7 @@ public async Task TestTokenFetchedAsync()`
`111`	`111`	`Assert.IsTrue(request.Headers.Contains("Authorization"));`
`112`	`112`	`var auth = request.Headers.Authorization.ToString();`
`113`	`113`	`Assert.Greater(auth.Length, "Bearer ".Length);`
`114`		`- var token = auth.Substring("Bearer ".Length);`
	`114`	`+ string token = auth.Substring("Bearer ".Length);`
`115`	`115`	`AssertTokenIsValid(token);`
`116`	`116`	`}`
`117`	`117`
`@@ -125,7 +125,7 @@ public async Task TestTokenRefreshAsync()`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`// arrange`
`128`		`- HttpResponseMessage response401 = new HttpResponseMessage(HttpStatusCode.Unauthorized);`
	`128`	`+ var response401 = new HttpResponseMessage(HttpStatusCode.Unauthorized);`
`129`	`129`
`130`	`130`	`var jwtHandler = new JwtRequestHandler(TestConfiguration);`
`131`	`131`
`@@ -146,7 +146,7 @@ public async Task TestTokenRefreshAsync()`
`146`	`146`	`Assert.IsTrue(request2.Headers.Contains("Authorization"));`
`147`	`147`	`var auth = request2.Headers.Authorization.ToString();`
`148`	`148`	`Assert.Greater(auth.Length, "Bearer ".Length);`
`149`		`- var token = auth.Substring("Bearer ".Length);`
	`149`	`+ string token = auth.Substring("Bearer ".Length);`
`150`	`150`	`AssertTokenIsValid(token);`
`151`	`151`	`}`
`152`	`152`
`@@ -173,6 +173,5 @@ private static void AssertTokenIsValid(string token)`
`173`	`173`
`174`	`174`	`Assert.AreEqual("JWT", tokenHeader["typ"]?.ToString());`
`175`	`175`	`}`
`176`		`-`
`177`	`176`	`}`
`178`	`177`	`}`