Merge pull request #100 from lk-code/FDB-99

Fdb 99
lk-code · Oct 16, 2024 · 26be23d · 26be23d
2 parents 0328416 + f3d8dd1
commit 26be23d
Show file tree

Hide file tree

Showing 12 changed files with 53 additions and 29 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: windows-latest
 
     env:
-      VERSION: 1.2.${{ github.run_number }}
+      VERSION: 8.0.${{ github.run_number }}
       USERNAME: lk-code
       NUGET_FILE: "**/*.nupkg"
 

diff --git a/README.md b/README.md
@@ -5,8 +5,6 @@
 [![License](https://img.shields.io/github/license/lk-code/fluent-data-builder.svg?style=flat-square)](https://github.com/lk-code/fluent-data-builder/blob/master/LICENSE)
 [![Downloads](https://img.shields.io/nuget/dt/FluentDataBuilder.svg?style=flat-square)](https://www.nuget.org/packages/FluentDataBuilder/)
 
-[![.NET Version](https://img.shields.io/badge/dotnet%20version-net6.0-blue?style=flat-square)](https://www.nuget.org/packages/FluentDataBuilder/)
-[![.NET Version](https://img.shields.io/badge/dotnet%20version-net7.0-blue?style=flat-square)](https://www.nuget.org/packages/FluentDataBuilder/)
 [![.NET Version](https://img.shields.io/badge/dotnet%20version-net8.0-blue?style=flat-square)](https://www.nuget.org/packages/FluentDataBuilder/)
 
 [![Lines of Code](https://sonarcloud.io/api/project_badges/measure?project=lk-code_fluent-data-builder&metric=ncloc)](https://sonarcloud.io/summary/new_code?id=lk-code_fluent-data-builder)

diff --git a/source/FluentDataBuilder.ExtensionTests/FluentDataBuilder.ExtensionTests.csproj b/source/FluentDataBuilder.ExtensionTests/FluentDataBuilder.ExtensionTests.csproj
@@ -9,10 +9,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="FluentAssertions" Version="6.12.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-        <PackageReference Include="MSTest.TestAdapter" Version="3.5.0" />
-        <PackageReference Include="MSTest.TestFramework" Version="3.5.0" />
+        <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">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>

diff --git a/source/FluentDataBuilder.Json/FluentDataBuilder.Json.csproj b/source/FluentDataBuilder.Json/FluentDataBuilder.Json.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
 
@@ -35,7 +35,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="FluentDataBuilder" Version="1.2.106" />
+      <PackageReference Include="FluentDataBuilder" Version="1.2.107" />
     </ItemGroup>
 
 </Project>
diff --git a/...ons.Configuration.Tests/FluentDataBuilder.Microsoft.Extensions.Configuration.Tests.csproj b/...ons.Configuration.Tests/FluentDataBuilder.Microsoft.Extensions.Configuration.Tests.csproj
@@ -9,11 +9,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="FluentAssertions" Version="6.12.0" />
+        <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.10.0" />
-        <PackageReference Include="MSTest.TestAdapter" Version="3.5.0" />
-        <PackageReference Include="MSTest.TestFramework" Version="3.5.0" />
+        <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">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>

diff --git a/...soft.Extensions.Configuration/FluentDataBuilder.Microsoft.Extensions.Configuration.csproj b/...soft.Extensions.Configuration/FluentDataBuilder.Microsoft.Extensions.Configuration.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
 
@@ -24,11 +24,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="FluentDataBuilder" Version="1.2.106" />
-        <PackageReference Include="FluentDataBuilder.Json" Version="1.2.106" />
+        <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.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/source/FluentDataBuilder.NewtonsoftJson/FluentDataBuilder.NewtonsoftJson.csproj b/source/FluentDataBuilder.NewtonsoftJson/FluentDataBuilder.NewtonsoftJson.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
 
@@ -24,7 +24,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="FluentDataBuilder" Version="1.2.106" />
+      <PackageReference Include="FluentDataBuilder" Version="1.2.107" />
       <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
@@ -9,10 +9,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="FluentAssertions" Version="6.12.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-        <PackageReference Include="MSTest.TestAdapter" Version="3.5.0" />
-        <PackageReference Include="MSTest.TestFramework" Version="3.5.0" />
+        <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">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/source/FluentDataBuilder.Xml/FluentDataBuilder.Xml.csproj b/source/FluentDataBuilder.Xml/FluentDataBuilder.Xml.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
 
@@ -35,7 +35,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="FluentDataBuilder" Version="1.2.106" />
+      <PackageReference Include="FluentDataBuilder" Version="1.2.107" />
     </ItemGroup>
 
 </Project>
diff --git a/source/FluentDataBuilder.Yaml/FluentDataBuilder.Yaml.csproj b/source/FluentDataBuilder.Yaml/FluentDataBuilder.Yaml.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
 
@@ -35,8 +35,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="FluentDataBuilder" Version="1.2.106" />
-        <PackageReference Include="YamlDotNet" Version="16.0.0" />
+        <PackageReference Include="FluentDataBuilder" Version="1.2.107" />
+        <PackageReference Include="YamlDotNet" Version="16.1.3" />
     </ItemGroup>
 
 </Project>
diff --git a/source/FluentDataBuilder.slnx b/source/FluentDataBuilder.slnx
@@ -0,0 +1,26 @@
+<Solution>
+  <Folder Name="/Core/">
+    <Project Path="FluentDataBuilder.Tests\FluentDataBuilder.Tests.csproj" Type="Classic C#" />
+    <Project Path="FluentDataBuilder\FluentDataBuilder.csproj" Type="Classic C#" />
+  </Folder>
+  <Folder Name="/Extensions/">
+    <Project Path="FluentDataBuilder.ExtensionTests\FluentDataBuilder.ExtensionTests.csproj" Type="Classic C#" />
+    <Project Path="FluentDataBuilder.Json\FluentDataBuilder.Json.csproj" Type="Classic C#" />
+    <Project Path="FluentDataBuilder.NewtonsoftJson\FluentDataBuilder.NewtonsoftJson.csproj" Type="Classic C#" />
+    <Project Path="FluentDataBuilder.Xml\FluentDataBuilder.Xml.csproj" Type="Classic C#" />
+    <Project Path="FluentDataBuilder.Yaml\FluentDataBuilder.Yaml.csproj" Type="Classic C#" />
+  </Folder>
+  <Folder Name="/Microsoft.Extensions.Configuration/">
+    <Project Path="FluentDataBuilder.Microsoft.Extensions.Configuration.Tests\FluentDataBuilder.Microsoft.Extensions.Configuration.Tests.csproj" Type="Classic C#" />
+    <Project Path="FluentDataBuilder.Microsoft.Extensions.Configuration\FluentDataBuilder.Microsoft.Extensions.Configuration.csproj" Type="Classic C#" />
+  </Folder>
+  <Folder Name="/Solution/">
+    <File Path="..\LICENSE" />
+    <File Path="..\README.md" />
+    <File Path="..\.gitignore" />
+  </Folder>
+  <Folder Name="/Solution/workflows/">
+    <File Path="..\.github\workflows\dotnet.yml" />
+    <File Path="..\.github\workflows\pull-request.yml" />
+  </Folder>
+</Solution>
diff --git a/source/FluentDataBuilder/FluentDataBuilder.csproj b/source/FluentDataBuilder/FluentDataBuilder.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>