update packages & add yamlDotNet

ChoETL.Yaml has problems with dynamic objects
Gramli · Jun 19, 2024 · f9a6a4f · f9a6a4f
1 parent a5662c8
commit f9a6a4f
Show file tree

Hide file tree

Showing 16 changed files with 68 additions and 63 deletions.
diff --git a/README.md b/README.md
@@ -64,6 +64,7 @@ Solution contains four layers:
 ## Technologies
 * [ASP.NET Core 7](https://learn.microsoft.com/en-us/aspnet/core/introduction-to-aspnet-core?view=aspnetcore-7.0)
 * [Entity Framework Core InMemory](https://learn.microsoft.com/en-us/ef/core/providers/in-memory/?tabs=dotnet-core-cli)
+* [SmallApiToolkit](https://github.com/Gramli/SmallApiToolkit)
 * [Mapster](https://github.com/MapsterMapper/Mapster)
 * [FluentResuls](https://github.com/altmann/FluentResults)
 * [Validot](https://github.com/bartoszlenar/Validot)

diff --git a/src/File.API/File.API.csproj b/src/File.API/File.API.csproj
@@ -7,11 +7,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Ardalis.GuardClauses" Version="4.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.0" />
+    <PackageReference Include="Ardalis.GuardClauses" Version="4.5.0" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.6" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="SmallApiToolkit" Version="1.0.0.3" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/File.Core/File.Core.csproj b/src/File.Core/File.Core.csproj
@@ -7,14 +7,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Ardalis.GuardClauses" Version="4.2.0" />
+    <PackageReference Include="Ardalis.GuardClauses" Version="4.5.0" />
     <PackageReference Include="Mapster" Version="7.4.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
     <PackageReference Include="SmallApiToolkit.Core" Version="1.0.0.3" />
-    <PackageReference Include="Validot" Version="2.4.1" />
+    <PackageReference Include="Validot" Version="2.5.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/File.Infrastructure/File.Infrastructure.csproj b/src/File.Infrastructure/File.Infrastructure.csproj
@@ -7,12 +7,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Ardalis.GuardClauses" Version="4.2.0" />
-    <PackageReference Include="ChoETL.Yaml" Version="1.0.0.28" />
+    <PackageReference Include="Ardalis.GuardClauses" Version="4.5.0" />
+    <PackageReference Include="ChoETL.Yaml" Version="1.0.0.35" />
     <PackageReference Include="Mapster" Version="7.4.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.6" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="YamlDotNet" Version="15.3.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/File.Infrastructure/FileConversions/Converters/JsonToYamlFileConverter.cs b/src/File.Infrastructure/FileConversions/Converters/JsonToYamlFileConverter.cs
@@ -1,20 +1,21 @@
-using ChoETL;
-using File.Infrastructure.Abstractions;
+using File.Infrastructure.Abstractions;
 using File.Infrastructure.Extensions;
 using FluentResults;
-using System.Text;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.Dynamic;
 
 namespace File.Infrastructure.FileConversions.Converters
 {
     internal sealed class JsonToYamlFileConverter : IFileConverter
     {
         public Task<Result<string>> Convert(string fileContent, CancellationToken cancellationToken)
         {
-            using var jsonCoReader = ChoJSONReader.LoadText(fileContent);
-            var stringBuilder = new StringBuilder();
-            using var yamlWriter = new ChoYamlWriter(stringBuilder).SingleDocument();
-            yamlWriter.Write(jsonCoReader);
-            var yamlContent = stringBuilder.ToString();
+            var expConverter = new ExpandoObjectConverter();
+            var deserializedObject = JsonConvert.DeserializeObject<ExpandoObject>(fileContent, expConverter);
+
+            var serializer = new YamlDotNet.Serialization.Serializer();
+            var yamlContent = serializer.Serialize(deserializedObject);
             return Task.FromResult(yamlContent.OkIfNotNull());
         }
     }

diff --git a/src/File.Infrastructure/FileConversions/Converters/YamlToJsonFileConverter.cs b/src/File.Infrastructure/FileConversions/Converters/YamlToJsonFileConverter.cs
@@ -1,21 +1,23 @@
-using ChoETL;
-using File.Infrastructure.Abstractions;
+using File.Infrastructure.Abstractions;
 using File.Infrastructure.Extensions;
 using FluentResults;
-using System.Text;
+using Newtonsoft.Json;
+using YamlDotNet.Serialization;
 
 namespace File.Infrastructure.FileConversions.Converters
 {
     internal sealed class YamlToJsonFileConverter : IFileConverter
     {
         public Task<Result<string>> Convert(string fileContent, CancellationToken cancellationToken)
         {
-            using var yamlReader = ChoYamlReader.LoadText(fileContent);
-            var stringBuilder = new StringBuilder();
-            using var yamlWriter = new ChoYamlWriter(stringBuilder);
-            yamlWriter.Write(yamlReader);
-            var jsonContent = stringBuilder.ToString();
-            return Task.FromResult(jsonContent.OkIfNotNull());
+            var deserializer = new Deserializer();
+            var yamlObject = deserializer.Deserialize(fileContent);
+
+            var jsonSerializer = new JsonSerializer();
+            using var writer = new StringWriter();
+            jsonSerializer.Serialize(writer, yamlObject);
+
+            return Task.FromResult(writer.ToString().OkIfNotNull());
         }
     }
 }
diff --git a/...ionTests/File.Infrastructure.IntegrationTests/File.Infrastructure.IntegrationTests.csproj b/...ionTests/File.Infrastructure.IntegrationTests/File.Infrastructure.IntegrationTests.csproj
@@ -9,13 +9,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="xunit" Version="2.6.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="xunit" Version="2.8.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/src/Tests/SystemTests/File.API.SystemTests/File.API.SystemTests.csproj b/src/Tests/SystemTests/File.API.SystemTests/File.API.SystemTests.csproj
@@ -9,14 +9,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="xunit" Version="2.6.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.6" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="xunit" Version="2.8.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/src/Tests/SystemTests/File.API.SystemTests/Tests/GetTests.cs b/src/Tests/SystemTests/File.API.SystemTests/Tests/GetTests.cs
@@ -19,7 +19,7 @@ public async Task GetFileInfoAsync()
             //Assert
             var resultData = await result.GetResponseData<DataResponse<IEnumerable<FileInfoDto>>>();
             Assert.NotNull(resultData);
-            Assert.NotEmpty(resultData?.Data);
+            Assert.NotEmpty(resultData.Data);
         }
     }
 }
diff --git a/src/Tests/UnitTests/File.API.UnitTests/File.API.UnitTests.csproj b/src/Tests/UnitTests/File.API.UnitTests/File.API.UnitTests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
@@ -9,13 +9,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="xunit" Version="2.6.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="xunit" Version="2.8.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/src/Tests/UnitTests/File.Core.UnitTests/Commands/AddFilesCommandHandlerTests.cs b/src/Tests/UnitTests/File.Core.UnitTests/Commands/AddFilesCommandHandlerTests.cs
@@ -94,7 +94,7 @@ public async Task AddFileAsync_IOException_One_Failed()
 
             //Assert
             Assert.Equal(HttpStatusCode.OK, result.StatusCode);
-            Assert.Equal(1, result.Errors.Count());
+            Assert.Single(result.Errors);
             _addFilesCommandValidatorMock.Verify(x => x.Validate(It.Is<AddFilesCommand>(y => y.Equals(request))), Times.Once);
             iFileMockOne.Verify(x => x.GetData(CancellationToken.None), Times.Once);
             iFileMockTwo.Verify(x => x.GetData(CancellationToken.None), Times.Once);
@@ -161,7 +161,7 @@ public async Task AddFileAsync_One_Failed()
 
             //Assert
             Assert.Equal(HttpStatusCode.OK, result.StatusCode);
-            Assert.Equal(1, result.Errors.Count());
+            Assert.Single(result.Errors);
             _addFilesCommandValidatorMock.Verify(x => x.Validate(It.Is<AddFilesCommand>(y => y.Equals(request))), Times.Once);
             iFileMockOne.Verify(x => x.GetData(CancellationToken.None), Times.Once);
             iFileMockTwo.Verify(x => x.GetData(CancellationToken.None), Times.Once);

diff --git a/src/Tests/UnitTests/File.Core.UnitTests/File.Core.UnitTests.csproj b/src/Tests/UnitTests/File.Core.UnitTests/File.Core.UnitTests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
@@ -9,14 +9,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="Moq" Version="4.20.69" />
-    <PackageReference Include="xunit" Version="2.6.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="Moq" Version="4.20.70" />
+    <PackageReference Include="xunit" Version="2.8.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/src/Tests/UnitTests/File.Domain.UnitTests/File.Domain.UnitTests.csproj b/src/Tests/UnitTests/File.Domain.UnitTests/File.Domain.UnitTests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
@@ -9,13 +9,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="xunit" Version="2.6.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="xunit" Version="2.8.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/src/Tests/UnitTests/File.Infrastructure.UnitTests/File.Infrastructure.UnitTests.csproj b/src/Tests/UnitTests/File.Infrastructure.UnitTests/File.Infrastructure.UnitTests.csproj
@@ -9,14 +9,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="Moq" Version="4.20.69" />
-    <PackageReference Include="xunit" Version="2.6.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="Moq" Version="4.20.70" />
+    <PackageReference Include="xunit" Version="2.8.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/.../File.Infrastructure.UnitTests/FileConversions/Converters/YamlToJsonFileConverterTests.cs b/.../File.Infrastructure.UnitTests/FileConversions/Converters/YamlToJsonFileConverterTests.cs
@@ -1,7 +1,7 @@
 using File.Infrastructure.Abstractions;
 using File.Infrastructure.FileConversions.Converters;
 using File.Infrastructure.UnitTests.Assets;
-using SharpYaml;
+using YamlDotNet.Core;
 
 namespace File.Infrastructure.UnitTests.FileConversions.Converters
 {

diff --git a/src/Tests/UnitTests/File.UnitTests.Common/File.UnitTests.Common.csproj b/src/Tests/UnitTests/File.UnitTests.Common/File.UnitTests.Common.csproj
@@ -7,8 +7,8 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
-		<PackageReference Include="Moq" Version="4.20.69" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
+		<PackageReference Include="Moq" Version="4.20.70" />
 	</ItemGroup>
 
 </Project>