Update to .NET 8

bottlenoselabs · Nov 21, 2023 · 0297b94 · 0297b94
1 parent 86cdbd7
commit 0297b94
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/src/cs/library-cs-Common.sln → src/cs/Common.sln b/src/cs/library-cs-Common.sln → src/cs/Common.sln
diff --git a/src/cs/Common/Common.csproj b/src/cs/Common/Common.csproj
@@ -2,7 +2,7 @@
 
   <!-- MSBuild settings -->
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <RootNamespace>bottlenoselabs.Common</RootNamespace>
@@ -14,17 +14,17 @@
     <IsPackable>true</IsPackable>
     <PackageId>bottlenoselabs.Common</PackageId>
     <PackageDescription>Common C# code across all C# projects at Bottlenose Labs.</PackageDescription>
-    <RepositoryUrl>https://github.com/bottlenoselabs/library-cs-Common</RepositoryUrl>
+    <RepositoryUrl>https://github.com/bottlenoselabs/Common</RepositoryUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
   </PropertyGroup>
 
   <!-- NuGet package references -->
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2023.2.0"/>
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0-preview.7.23375.6"/>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0-preview.7.23375.6"/>
+    <PackageReference Include="JetBrains.Annotations" Version="2023.3.0"/>
+    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0"/>
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0"/>
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1"/>
-    <PackageReference Include="System.IO.Abstractions" Version="19.2.69"/>
+    <PackageReference Include="System.IO.Abstractions" Version="19.2.87"/>
   </ItemGroup>
 
 </Project>
diff --git a/src/cs/Common/Tools/Tool.cs b/src/cs/Common/Tools/Tool.cs
@@ -30,6 +30,11 @@ public abstract class Tool<TUnsanitizedInput, TInput, TOutput> : Tool
     private IDisposable? _loggerScopeStep;
     private readonly IFileSystem _fileSystem;
 
+    private JsonSerializerOptions _jsonSerializerOptions = new JsonSerializerOptions()
+    {
+        AllowTrailingCommas = true
+    };
+
     protected Tool(
         ILogger<Tool<TUnsanitizedInput, TInput, TOutput>> logger,
         ToolInputSanitizer<TUnsanitizedInput, TInput> inputSanitizer,
@@ -59,11 +64,7 @@ public TOutput Run(string configurationFilePath)
             throw new ToolInputSanitizationException($"The extract options file '{fullFilePath}' is empty.");
         }
 
-        var serializerOptions = new JsonSerializerOptions
-        {
-            AllowTrailingCommas = true
-        };
-        var unsanitizedInput = JsonSerializer.Deserialize<TUnsanitizedInput>(fileContents, serializerOptions);
+        var unsanitizedInput = JsonSerializer.Deserialize<TUnsanitizedInput>(fileContents, _jsonSerializerOptions);
         if (unsanitizedInput == null)
         {
             throw new ToolInputSanitizationException("Failed to deserialize the tool configuration file path.");