Merge pull request #19 from Sleeping-Bear-Systems/fix-security-issues

Fix security issues
Sleeping-Bear-Systems · Dec 7, 2023 · e0e54d8 · e0e54d8
2 parents 378b0f9 + 00bd62a
commit e0e54d8
Show file tree

Hide file tree

Showing 12 changed files with 97 additions and 94 deletions.
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
-{
-  "sdk": {
-    "version": "7.0.100",
-    "rollForward": "latestFeature"
-  }
-}
+{
+  "sdk": {
+    "version": "8.0.100",
+    "rollForward": "latestFeature"
+  }
+}
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -1,29 +1,29 @@
-<Project>
-  <!--
-    Build Properties
-  -->
-  <PropertyGroup>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <IsPackable>false</IsPackable>
-    <LangVersion>10</LangVersion>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <!--
-    Nuget Package Properties
-  -->
-  <PropertyGroup>
-    <Authors>Charles Farris</Authors>
-    <Company>Sleeping Bear Systems</Company>
-    <Copyright>Copyright (c) 2023-$([System.DateTime]::Now.Year) Charles Farris</Copyright>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <DebugType>embedded</DebugType>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(TEAMCITY_VERSION)' != ''">
-    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-  </PropertyGroup>
-</Project>
+<Project>
+  <!--
+    Build Properties
+  -->
+  <PropertyGroup>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <IsPackable>false</IsPackable>
+    <LangVersion>12</LangVersion>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <!--
+    Nuget Package Properties
+  -->
+  <PropertyGroup>
+    <Authors>Charles Farris</Authors>
+    <Company>Sleeping Bear Systems</Company>
+    <Copyright>Copyright (c) 2023-$([System.DateTime]::Now.Year) Charles Farris</Copyright>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <DebugType>embedded</DebugType>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TEAMCITY_VERSION)' != ''">
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+  </PropertyGroup>
+</Project>
diff --git a/src/ImplementFactStorePostgres/IFact.cs b/src/ImplementFactStorePostgres/IFact.cs
@@ -1,8 +1,6 @@
-namespace SleepingBearSystems.ToolsSamples.ImplementFactStorePostgres;
-
-/// <summary>
-///     Fact interface.
-/// </summary>
-public interface IFact
-{
-}
+namespace SleepingBearSystems.ToolsSamples.ImplementFactStorePostgres;
+
+/// <summary>
+///     Fact interface.
+/// </summary>
+public interface IFact;
diff --git a/src/ImplementFactStorePostgres/ImplementFactStorePostgres.csproj b/src/ImplementFactStorePostgres/ImplementFactStorePostgres.csproj
@@ -4,22 +4,22 @@
     <AssemblyName>SleepingBearSystems.ToolsSamples.ImplementFactStorePostgres</AssemblyName>
     <OutputType>Exe</OutputType>
     <RootNamespace>SleepingBearSystems.ToolsSamples.ImplementFactStorePostgres</RootNamespace>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Autofac" Version="7.1.0"/>
-    <PackageReference Include="JetBrains.Annotations" Version="2023.2.0"/>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1"/>
+    <PackageReference Include="JetBrains.Annotations" Version="2023.3.0"/>
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0"/>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3"/>
-    <PackageReference Include="Npgsql" Version="7.0.6"/>
-    <PackageReference Include="Serilog" Version="3.0.1"/>
-    <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0"/>
-    <PackageReference Include="SleepingBearSystems.Tools.Common" Version="2.0.3"/>
-    <PackageReference Include="SleepingBearSystems.Tools.Monad" Version="2.0.3"/>
-    <PackageReference Include="SleepingBearSystems.Tools.Persistence" Version="2.0.3"/>
-    <PackageReference Include="SleepingBearSystems.Tools.Persistence.Postgres" Version="2.0.3"/>
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="7.0.2"/>
+    <PackageReference Include="Npgsql" Version="8.0.1"/>
+    <PackageReference Include="Serilog" Version="3.1.1"/>
+    <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1"/>
+    <PackageReference Include="SleepingBearSystems.Tools.Common" Version="3.1.1"/>
+    <PackageReference Include="SleepingBearSystems.Tools.Monad" Version="3.1.1"/>
+    <PackageReference Include="SleepingBearSystems.Tools.Persistence" Version="3.1.1"/>
+    <PackageReference Include="SleepingBearSystems.Tools.Persistence.Postgres" Version="3.1.1"/>
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.0"/>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/ImplementFactStorePostgres/Program.cs b/src/ImplementFactStorePostgres/Program.cs
@@ -1,6 +1,7 @@
 using System.Collections.Immutable;
 using System.Globalization;
 using Serilog;
+using Serilog.Core;
 using SleepingBearSystems.Tools.Common;
 using SleepingBearSystems.Tools.Infrastructure;
 using SleepingBearSystems.Tools.Persistence;
@@ -12,7 +13,7 @@ internal static class Program
 {
     public static async Task<int> Main()
     {
-        ILogger? logger = default;
+        var logger = default(Logger);
         try
         {
             // create logger
@@ -78,7 +79,8 @@ public static async Task<int> Main()
         }
     }
 
-    private static async Task LogUsersAsync(ILogger logger, UserRepository repository)
+    // ReSharper disable once SuggestBaseTypeForParameter
+    private static async Task LogUsersAsync(Logger logger, UserRepository repository)
     {
         var users = await repository.GetUsersAsync();
         logger.Information("Count: {Count}", users.Count);

diff --git a/src/ImplementFactStoreSqlite/IFact.cs b/src/ImplementFactStoreSqlite/IFact.cs
@@ -1,8 +1,6 @@
-namespace SleepingBearSystems.ToolsSamples.ImplementFactStoreSqlite;
-
-/// <summary>
-///     Fact interface.
-/// </summary>
-public interface IFact
-{
-}
+namespace SleepingBearSystems.ToolsSamples.ImplementFactStoreSqlite;
+
+/// <summary>
+///     Fact interface.
+/// </summary>
+public interface IFact;
diff --git a/src/ImplementFactStoreSqlite/ImplementFactStoreSqlite.csproj b/src/ImplementFactStoreSqlite/ImplementFactStoreSqlite.csproj
@@ -4,21 +4,21 @@
     <AssemblyName>SleepingBearSystems.ToolsSamples.ImplementFactStoreSqlite</AssemblyName>
     <OutputType>Exe</OutputType>
     <RootNamespace>SleepingBearSystems.ToolsSamples.ImplementFactStoreSqlite</RootNamespace>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Autofac" Version="7.1.0"/>
-    <PackageReference Include="JetBrains.Annotations" Version="2023.2.0"/>
+    <PackageReference Include="JetBrains.Annotations" Version="2023.3.0"/>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3"/>
-    <PackageReference Include="Serilog" Version="3.0.1"/>
-    <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0"/>
-    <PackageReference Include="SleepingBearSystems.Tools.Common" Version="2.0.3"/>
-    <PackageReference Include="SleepingBearSystems.Tools.Monad" Version="2.0.3"/>
-    <PackageReference Include="SleepingBearSystems.Tools.Persistence" Version="2.0.3"/>
-    <PackageReference Include="SleepingBearSystems.Tools.Persistence.Sqlite" Version="2.0.3"/>
+    <PackageReference Include="Serilog" Version="3.1.1"/>
+    <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1"/>
+    <PackageReference Include="SleepingBearSystems.Tools.Common" Version="3.1.1"/>
+    <PackageReference Include="SleepingBearSystems.Tools.Monad" Version="3.1.1"/>
+    <PackageReference Include="SleepingBearSystems.Tools.Persistence" Version="3.1.1"/>
+    <PackageReference Include="SleepingBearSystems.Tools.Persistence.Sqlite" Version="3.1.1"/>
     <PackageReference Include="System.Data.SQLite.Core" Version="1.0.118"/>
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="7.0.2"/>
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.0"/>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/ImplementFactStoreSqlite/Program.cs b/src/ImplementFactStoreSqlite/Program.cs
@@ -1,6 +1,7 @@
 using System.Collections.Immutable;
 using System.Globalization;
 using Serilog;
+using Serilog.Core;
 using SleepingBearSystems.Tools.Common;
 using SleepingBearSystems.Tools.Infrastructure;
 using SleepingBearSystems.Tools.Monad;
@@ -13,7 +14,7 @@ internal static class Program
 {
     public static int Main()
     {
-        ILogger? logger = default;
+        var logger = default(Logger);
         try
         {
             // create logger
@@ -79,7 +80,8 @@ public static int Main()
         }
     }
 
-    private static void LogUsers(ILogger logger, UserRepository repository)
+    // ReSharper disable once SuggestBaseTypeForParameter
+    private static void LogUsers(Logger logger, UserRepository repository)
     {
         var users = repository.GetUsers();
         logger.Information("Count: {Count}", users.Count);

diff --git a/src/UseRailwayOrientedProgramming/Program.cs b/src/UseRailwayOrientedProgramming/Program.cs
@@ -2,6 +2,7 @@
 using System.Globalization;
 using System.Reflection;
 using Serilog;
+using Serilog.Core;
 using SleepingBearSystems.Tools.Common;
 using SleepingBearSystems.Tools.Railway;
 
@@ -11,7 +12,7 @@ internal static class Program
 {
     public static int Main()
     {
-        ILogger? logger = default;
+        var logger = default(Logger);
         try
         {
             // create logger

diff --git a/src/UseRailwayOrientedProgramming/UseRailwayOrientedProgramming.csproj b/src/UseRailwayOrientedProgramming/UseRailwayOrientedProgramming.csproj
@@ -4,18 +4,18 @@
     <AssemblyName>SleepingBearSystems.ToolsSamples.UseRailwayOrientedProgramming</AssemblyName>
     <OutputType>Exe</OutputType>
     <RootNamespace>SleepingBearSystems.ToolsSamples.UseRailwayOrientedProgramming</RootNamespace>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Autofac" Version="7.1.0"/>
-    <PackageReference Include="JetBrains.Annotations" Version="2023.2.0"/>
+    <PackageReference Include="JetBrains.Annotations" Version="2023.3.0"/>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3"/>
-    <PackageReference Include="Serilog" Version="3.0.1"/>
-    <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0"/>
-    <PackageReference Include="SleepingBearSystems.Tools.Common" Version="2.0.3"/>
-    <PackageReference Include="SleepingBearSystems.Tools.Railway" Version="2.0.3"/>
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="7.0.2"/>
+    <PackageReference Include="Serilog" Version="3.1.1"/>
+    <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1"/>
+    <PackageReference Include="SleepingBearSystems.Tools.Common" Version="3.1.1"/>
+    <PackageReference Include="SleepingBearSystems.Tools.Railway" Version="3.1.1"/>
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.0"/>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/UseSqliteDatabase/Program.cs b/src/UseSqliteDatabase/Program.cs
@@ -2,6 +2,7 @@
 using System.Globalization;
 using System.Reflection;
 using Serilog;
+using Serilog.Core;
 using SleepingBearSystems.Tools.Common;
 using SleepingBearSystems.Tools.Persistence;
 using SleepingBearSystems.Tools.Persistence.Sqlite;
@@ -12,7 +13,7 @@ internal static class Program
 {
     public static int Main()
     {
-        ILogger? logger = default;
+        var logger = default(Logger);
         try
         {
             // create logger
@@ -41,7 +42,8 @@ public static int Main()
     /// <summary>
     ///     Creates an SQLite database, populates it with data, and then reads the data.
     /// </summary>
-    private static void ManuallyCreateSqliteDatabase(ILogger logger)
+    // ReSharper disable once SuggestBaseTypeForParameter
+    private static void ManuallyCreateSqliteDatabase(Logger logger)
     {
         // create a database
         var path = Path.Combine(Path.GetTempPath(), $"sbs_sqlite_{Guid.NewGuid():N}.db");

diff --git a/src/UseSqliteDatabase/UseSqliteDatabase.csproj b/src/UseSqliteDatabase/UseSqliteDatabase.csproj
@@ -4,21 +4,21 @@
     <AssemblyName>SleepingBearSystems.ToolsSamples.UseSqliteDatabase</AssemblyName>
     <OutputType>Exe</OutputType>
     <RootNamespace>SleepingBearSystems.ToolsSamples.UseSqliteDatabase</RootNamespace>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Autofac" Version="7.1.0"/>
-    <PackageReference Include="JetBrains.Annotations" Version="2023.2.0"/>
+    <PackageReference Include="JetBrains.Annotations" Version="2023.3.0"/>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3"/>
-    <PackageReference Include="Serilog" Version="3.0.1"/>
-    <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0"/>
-    <PackageReference Include="SleepingBearSystems.Tools.Common" Version="2.0.3"/>
-    <PackageReference Include="SleepingBearSystems.Tools.Monad" Version="2.0.3"/>
-    <PackageReference Include="SleepingBearSystems.Tools.Persistence" Version="2.0.3"/>
-    <PackageReference Include="SleepingBearSystems.Tools.Persistence.Sqlite" Version="2.0.3"/>
+    <PackageReference Include="Serilog" Version="3.1.1"/>
+    <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1"/>
+    <PackageReference Include="SleepingBearSystems.Tools.Common" Version="3.1.1"/>
+    <PackageReference Include="SleepingBearSystems.Tools.Monad" Version="3.1.1"/>
+    <PackageReference Include="SleepingBearSystems.Tools.Persistence" Version="3.1.1"/>
+    <PackageReference Include="SleepingBearSystems.Tools.Persistence.Sqlite" Version="3.1.1"/>
     <PackageReference Include="System.Data.SQLite.Core" Version="1.0.118"/>
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="7.0.2"/>
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.0"/>
   </ItemGroup>
 
   <ItemGroup>