Merge pull request #103 from lk-code/FDB-101

lk-code · web-flow · commit 6a255416d93d · 2025-01-30T17:07:13.000+01:00
Fdb 101
diff --git a/source/FluentDataBuilder.ExtensionTests/FluentDataBuilder.ExtensionTests.csproj b/source/FluentDataBuilder.ExtensionTests/FluentDataBuilder.ExtensionTests.csproj
@@ -10,10 +10,10 @@
 
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="6.12.1" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-        <PackageReference Include="MSTest.TestAdapter" Version="3.6.1" />
-        <PackageReference Include="MSTest.TestFramework" Version="3.6.1" />
-        <PackageReference Include="coverlet.collector" Version="6.0.2">
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+        <PackageReference Include="MSTest.TestAdapter" Version="3.7.3" />
+        <PackageReference Include="MSTest.TestFramework" Version="3.7.3" />
+        <PackageReference Include="coverlet.collector" Version="6.0.4">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
diff --git a/source/FluentDataBuilder.Json/DataBuilderExtensions.cs b/source/FluentDataBuilder.Json/DataBuilderExtensions.cs
@@ -158,7 +158,6 @@ private static IDataBuilder ConvertToIDataBuilder(IDataBuilder builder, string k
 
                 throw new ArgumentOutOfRangeException($"unknown numeric data type: {jsonElement.ValueKind}");
             }
-                break;
             case JsonValueKind.True:
                 return true;
             case JsonValueKind.False:
diff --git a/source/FluentDataBuilder.Json/FluentDataBuilder.Json.csproj b/source/FluentDataBuilder.Json/FluentDataBuilder.Json.csproj
@@ -35,7 +35,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="FluentDataBuilder" Version="1.2.107" />
+      <PackageReference Include="FluentDataBuilder" Version="8.0.108" />
     </ItemGroup>
 
 </Project>
diff --git a/source/FluentDataBuilder.Microsoft.Extensions.Configuration.Tests/FluentDataBuilder.Microsoft.Extensions.Configuration.Tests.csproj b/source/FluentDataBuilder.Microsoft.Extensions.Configuration.Tests/FluentDataBuilder.Microsoft.Extensions.Configuration.Tests.csproj
@@ -10,11 +10,11 @@
 
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="6.12.1" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-        <PackageReference Include="MSTest.TestAdapter" Version="3.6.1" />
-        <PackageReference Include="MSTest.TestFramework" Version="3.6.1" />
-        <PackageReference Include="coverlet.collector" Version="6.0.2">
+        <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.1" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+        <PackageReference Include="MSTest.TestAdapter" Version="3.7.3" />
+        <PackageReference Include="MSTest.TestFramework" Version="3.7.3" />
+        <PackageReference Include="coverlet.collector" Version="6.0.4">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
diff --git a/source/FluentDataBuilder.Microsoft.Extensions.Configuration/FluentDataBuilder.Microsoft.Extensions.Configuration.csproj b/source/FluentDataBuilder.Microsoft.Extensions.Configuration/FluentDataBuilder.Microsoft.Extensions.Configuration.csproj
@@ -24,11 +24,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="FluentDataBuilder" Version="1.2.107" />
-        <PackageReference Include="FluentDataBuilder.Json" Version="1.2.107" />
-        <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
+        <PackageReference Include="FluentDataBuilder" Version="8.0.108" />
+        <PackageReference Include="FluentDataBuilder.Json" Version="8.0.108" />
+        <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.1" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.1" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.1" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/source/FluentDataBuilder.NewtonsoftJson/FluentDataBuilder.NewtonsoftJson.csproj b/source/FluentDataBuilder.NewtonsoftJson/FluentDataBuilder.NewtonsoftJson.csproj
@@ -24,7 +24,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="FluentDataBuilder" Version="1.2.107" />
+      <PackageReference Include="FluentDataBuilder" Version="8.0.108" />
       <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     </ItemGroup>
 
diff --git a/source/FluentDataBuilder.Tests/FluentDataBuilder.Tests.csproj b/source/FluentDataBuilder.Tests/FluentDataBuilder.Tests.csproj
@@ -10,10 +10,10 @@
 
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="6.12.1" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-        <PackageReference Include="MSTest.TestAdapter" Version="3.6.1" />
-        <PackageReference Include="MSTest.TestFramework" Version="3.6.1" />
-        <PackageReference Include="coverlet.collector" Version="6.0.2">
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+        <PackageReference Include="MSTest.TestAdapter" Version="3.7.3" />
+        <PackageReference Include="MSTest.TestFramework" Version="3.7.3" />
+        <PackageReference Include="coverlet.collector" Version="6.0.4">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/source/FluentDataBuilder.Xml/FluentDataBuilder.Xml.csproj b/source/FluentDataBuilder.Xml/FluentDataBuilder.Xml.csproj
@@ -35,7 +35,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="FluentDataBuilder" Version="1.2.107" />
+      <PackageReference Include="FluentDataBuilder" Version="8.0.108" />
     </ItemGroup>
 
 </Project>
diff --git a/source/FluentDataBuilder.Yaml/FluentDataBuilder.Yaml.csproj b/source/FluentDataBuilder.Yaml/FluentDataBuilder.Yaml.csproj
@@ -35,8 +35,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="FluentDataBuilder" Version="1.2.107" />
-        <PackageReference Include="YamlDotNet" Version="16.1.3" />
+        <PackageReference Include="FluentDataBuilder" Version="8.0.108" />
+        <PackageReference Include="YamlDotNet" Version="16.3.0" />
     </ItemGroup>
 
 </Project>
diff --git a/source/FluentDataBuilder/Helper/DictionaryExtensions.cs b/source/FluentDataBuilder/Helper/DictionaryExtensions.cs
@@ -28,7 +28,7 @@ public static class DictionaryExtensions
                     mergedDictionary[key] = value;
                 }
             }
-            else if (value is Dictionary<string, object> dictionaryValue)
+            else if (value is Dictionary<string, object?> dictionaryValue)
             {
                 if (mergedDictionary[key] is Dictionary<string, object?> leftDictionaryValue)
                 {

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,6 @@ private static IDataBuilder ConvertToIDataBuilder(IDataBuilder builder, string k`
`158`	`158`
`159`	`159`	`throw new ArgumentOutOfRangeException($"unknown numeric data type: {jsonElement.ValueKind}");`
`160`	`160`	`}`
`161`		`- break;`
`162`	`161`	`case JsonValueKind.True:`
`163`	`162`	`return true;`
`164`	`163`	`case JsonValueKind.False:`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public static class DictionaryExtensions`
`28`	`28`	`mergedDictionary[key] = value;`
`29`	`29`	`}`
`30`	`30`	`}`
`31`		`- else if (value is Dictionary<string, object> dictionaryValue)`
	`31`	`+ else if (value is Dictionary<string, object?> dictionaryValue)`
`32`	`32`	`{`
`33`	`33`	`if (mergedDictionary[key] is Dictionary<string, object?> leftDictionaryValue)`
`34`	`34`	`{`