From 852ad1b849112f584d3b00d93186103f45dd324c Mon Sep 17 00:00:00 2001
From: zacbre <zac@stykocompany.com>
Date: Tue, 24 Sep 2024 13:33:39 -0400
Subject: [PATCH] Upgrade to v2.1.0, .net 8, remove newtonsoft.json

---
 .../Configuration/ConvertibleClass.cs              |  1 -
 .../CustomEnvironmentConfig.Tests.csproj           | 12 ++++++------
 CustomEnvironmentConfig/BuilderExtensions.cs       |  3 ---
 CustomEnvironmentConfig/ConfigurationParser.cs     |  4 ++--
 CustomEnvironmentConfig/ConfigurationWriter.cs     |  4 ++--
 .../CustomEnvironmentConfig.csproj                 | 14 +++++++-------
 .../Repositories/EnvironmentVariableRepository.cs  |  5 -----
 README.md                                          |  3 +++
 8 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/CustomEnvironmentConfig.Tests/Configuration/ConvertibleClass.cs b/CustomEnvironmentConfig.Tests/Configuration/ConvertibleClass.cs
index 409ecb5..73dbe77 100644
--- a/CustomEnvironmentConfig.Tests/Configuration/ConvertibleClass.cs
+++ b/CustomEnvironmentConfig.Tests/Configuration/ConvertibleClass.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 
 namespace CustomEnvironmentConfig.Tests.Configuration
diff --git a/CustomEnvironmentConfig.Tests/CustomEnvironmentConfig.Tests.csproj b/CustomEnvironmentConfig.Tests/CustomEnvironmentConfig.Tests.csproj
index 7cf44b0..52ab140 100644
--- a/CustomEnvironmentConfig.Tests/CustomEnvironmentConfig.Tests.csproj
+++ b/CustomEnvironmentConfig.Tests/CustomEnvironmentConfig.Tests.csproj
@@ -6,18 +6,18 @@
 
         <OutputType>Library</OutputType>
 
-        <LangVersion>8</LangVersion>
+        <LangVersion>12</LangVersion>
 
         <Nullable>enable</Nullable>
 
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFrameworks>net7.0;net6.0;net8.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
-        <PackageReference Include="xunit" Version="2.4.1" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+        <PackageReference Include="xunit" Version="2.9.1" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/CustomEnvironmentConfig/BuilderExtensions.cs b/CustomEnvironmentConfig/BuilderExtensions.cs
index 76974a2..8d09e46 100644
--- a/CustomEnvironmentConfig/BuilderExtensions.cs
+++ b/CustomEnvironmentConfig/BuilderExtensions.cs
@@ -1,7 +1,4 @@
-using CustomEnvironmentConfig.Interfaces;
-using CustomEnvironmentConfig.Repositories;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace CustomEnvironmentConfig
diff --git a/CustomEnvironmentConfig/ConfigurationParser.cs b/CustomEnvironmentConfig/ConfigurationParser.cs
index b72c53d..e870bd3 100644
--- a/CustomEnvironmentConfig/ConfigurationParser.cs
+++ b/CustomEnvironmentConfig/ConfigurationParser.cs
@@ -3,10 +3,10 @@
 using System.Linq;
 using System.Reflection;
 using System.Runtime.Serialization;
+using System.Text.Json;
 using CustomEnvironmentConfig.Exceptions;
 using CustomEnvironmentConfig.Interfaces;
 using CustomEnvironmentConfig.Repositories;
-using Newtonsoft.Json;
 
 namespace CustomEnvironmentConfig
 {
@@ -204,7 +204,7 @@ private void GetProperties<T>(T instance, Type type, string? prefix, Stack<Type>
                     if (jsonDecode && val is {})
                     {
                         var escaped = val.Replace("\\\"", "\"");
-                        var deserialized = JsonConvert.DeserializeObject(escaped, isNullable ?? prop.PropertyType);
+                        var deserialized = JsonSerializer.Deserialize(escaped, isNullable ?? prop.PropertyType);
                         prop.SetValue(instance, deserialized);
                         continue;
                     }
diff --git a/CustomEnvironmentConfig/ConfigurationWriter.cs b/CustomEnvironmentConfig/ConfigurationWriter.cs
index 5e8abf5..c772b06 100644
--- a/CustomEnvironmentConfig/ConfigurationWriter.cs
+++ b/CustomEnvironmentConfig/ConfigurationWriter.cs
@@ -3,8 +3,8 @@
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using System.Text.Json;
 using CustomEnvironmentConfig.Exceptions;
-using Newtonsoft.Json;
 
 namespace CustomEnvironmentConfig
 {
@@ -74,7 +74,7 @@ private void WriteProperties<T>(T instance, Type type, string? prefix, Stack<Typ
                     {
                         if (jsonEncode)
                         {
-                            var serialized = JsonConvert.SerializeObject(value);
+                            var serialized = JsonSerializer.Serialize(value);
                             fileStream.WriteLine($"{(prefix is {} ? $"{prefix + "_"}{itemName}" : itemName)} = {serialized}");
                             continue;
                         }
diff --git a/CustomEnvironmentConfig/CustomEnvironmentConfig.csproj b/CustomEnvironmentConfig/CustomEnvironmentConfig.csproj
index eb9861c..fe75041 100644
--- a/CustomEnvironmentConfig/CustomEnvironmentConfig.csproj
+++ b/CustomEnvironmentConfig/CustomEnvironmentConfig.csproj
@@ -9,21 +9,21 @@
         <PackageProjectUrl>https://github.com/zacbre/CustomEnvironmentConfig/</PackageProjectUrl>
         <PackageLicense>https://github.com/zacbre/CustomEnvironmentConfig</PackageLicense>
         <RepositoryUrl>https://github.com/zacbre/CustomEnvironmentConfig/</RepositoryUrl>
-        <PackageVersion>2.0.1</PackageVersion>
+        <PackageVersion>2.1.0</PackageVersion>
         <PackageLicenseUrl>https://github.com/zacbre/CustomEnvironmentConfig/master/LICENSE</PackageLicenseUrl>
-        <LangVersion>default</LangVersion>
+        <LangVersion>12</LangVersion>
         <Nullable>enable</Nullable>
         <PackageTags>environment, configuration</PackageTags>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
         <PackageReadmeFile>README.md</PackageReadmeFile>
     </PropertyGroup>
 
     <ItemGroup>
       <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.2.0" />
-      <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
-      <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
-      <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-      <PackageReference Include="System.Text.Encodings.Web" Version="7.0.0" />
+      <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+      <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
+      <PackageReference Include="System.Text.Encodings.Web" Version="8.0.0" />
+      <PackageReference Include="System.Text.Json" Version="8.0.4" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/CustomEnvironmentConfig/Repositories/EnvironmentVariableRepository.cs b/CustomEnvironmentConfig/Repositories/EnvironmentVariableRepository.cs
index 7fc1273..8145732 100644
--- a/CustomEnvironmentConfig/Repositories/EnvironmentVariableRepository.cs
+++ b/CustomEnvironmentConfig/Repositories/EnvironmentVariableRepository.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.IO;
-using System.Runtime.InteropServices;
 using CustomEnvironmentConfig.Interfaces;
 
 namespace CustomEnvironmentConfig.Repositories
diff --git a/README.md b/README.md
index 01be665..2225a4c 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,9 @@ Enables binding environment variables and/or environment files to classes.
 
 ## Changelog
 ```
+08/24/2024 [v2.1.0]
+- Remove Newtonsoft.Json dependency.
+- Add .net 8 support.
 07/24/2023 [v2.0.1]
 - Update System.Text.Json to patch vulnerability.
 - Add .net 7 support.