Merge branch 'master' into feature/host-builder

TRUMPF-IoT · Nov 13, 2024 · d1f5e62 · d1f5e62
2 parents 64a77c9 + d09b592
commit d1f5e62
Show file tree

Hide file tree

Showing 47 changed files with 114 additions and 111 deletions.
diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml
@@ -48,7 +48,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '8.x'
+        dotnet-version: '9.x'
         cache: true
         cache-dependency-path: 'Directory.Packages.props'
 

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -12,27 +12,27 @@ SPDX-License-Identifier: MPL-2.0
     <PackageVersion Include="C-DEngine" Version="6.104.0" />
     <PackageVersion Include="coverlet.collector" Version="6.0.2" />
     <PackageVersion Include="LiteDB" Version="5.0.21" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
-    <PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.2" />
-    <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Configuration" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageVersion Include="NSubstitute" Version="5.1.0" />
+    <PackageVersion Include="NSubstitute" Version="5.3.0" />
     <PackageVersion Include="StackExchange.Redis" Version="2.8.16" />
     <PackageVersion Include="System.Data.SQLite.Core" Version="1.0.119" />
-    <PackageVersion Include="System.IO.Abstractions" Version="21.0.29" />
+    <PackageVersion Include="System.IO.Abstractions" Version="21.1.3" />
     <PackageVersion Include="System.Runtime.Loader" Version="4.3.0" />
-    <PackageVersion Include="System.Text.Json" Version="8.0.5" />
+    <PackageVersion Include="System.Text.Json" Version="9.0.0" />
     <PackageVersion Include="xunit" Version="2.9.2" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
   </ItemGroup>

diff --git a/src/Communication/SAF.Communication.Cde/SAF.Communication.Cde.csproj b/src/Communication/SAF.Communication.Cde/SAF.Communication.Cde.csproj
@@ -7,7 +7,7 @@ SPDX-License-Identifier: MPL-2.0
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <Description>Smart Application Framework (SAF) convenience layer for C-DEngine basic communication.</Description>
   </PropertyGroup>
 

diff --git a/...ommunication/SAF.Communication.PubSub.Cde.Tests/SAF.Communication.PubSub.Cde.Tests.csproj b/...ommunication/SAF.Communication.PubSub.Cde.Tests/SAF.Communication.PubSub.Cde.Tests.csproj
@@ -7,7 +7,7 @@ SPDX-License-Identifier: MPL-2.0
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/src/Communication/SAF.Communication.PubSub.Cde.Tests/TestCommunicationPubSubCde.cs b/src/Communication/SAF.Communication.PubSub.Cde.Tests/TestCommunicationPubSubCde.cs
@@ -39,9 +39,11 @@ public void RunRemoteRegistryLifetimeHandler()
         CheckRegistry(rrlh, MessageToken.SubscribeTrigger);
         CheckRegistryShutdown(rrlh);
 
-        RegistrySubscriptionResponse rsr = new();
-        rsr.id = "id";
-        rsr.instanceId = "instanceID";
+        RegistrySubscriptionResponse rsr = new()
+        {
+            id = "id",
+            instanceId = "instanceID"
+        };
         TSM tsm = new(Engines.PubSub, MessageToken.SubscribeResponse, TheCommonUtils.SerializeObjectToJSONString<RegistrySubscriptionResponse>(rsr));
         TheProcessMessage tpm = new(tsm);
         rrlh.HandleMessage(tpm);
@@ -57,7 +59,7 @@ public void RunRemoteRegistryLifetimeHandler()
         CheckNoRegistry(rrlh, MessageToken.Unsubscribe);
     }
 
-    private void CheckRegistry(RemoteRegistryLifetimeHandler rrlh, string messageToken)
+    private static void CheckRegistry(RemoteRegistryLifetimeHandler rrlh, string messageToken)
     {
         TSM tsm = new(Engines.PubSub, messageToken, "{\"address\":\"\",\"instanceId\":\"fee034c582a34e18afc248b82932034d\",\"version\":\"3.0.0\"}");
         TheProcessMessage tpm = new(tsm);
@@ -66,15 +68,15 @@ private void CheckRegistry(RemoteRegistryLifetimeHandler rrlh, string messageTok
         Assert.Equal(tsm, rrlh.Registries[0]);
     }
 
-    private void CheckNoRegistry(RemoteRegistryLifetimeHandler rrlh, string messageToken)
+    private static void CheckNoRegistry(RemoteRegistryLifetimeHandler rrlh, string messageToken)
     {
         TSM tsm = new(Engines.PubSub, messageToken);
         TheProcessMessage tpm = new(tsm);
         rrlh.HandleMessage(tpm);
         Assert.Empty(rrlh.Registries);
     }
 
-    private void CheckRegistryShutdown(RemoteRegistryLifetimeHandler rrlh)
+    private static void CheckRegistryShutdown(RemoteRegistryLifetimeHandler rrlh)
     {
         TSM tsm = new(Engines.PubSub, MessageToken.RegistryShutdown);
         TheProcessMessage tpm = new(tsm);
@@ -87,10 +89,11 @@ private void CheckRegistryShutdown(RemoteRegistryLifetimeHandler rrlh)
     public void RunRemoteSubscriber()
     {
         TSM tsm = new(Engines.PubSub, MessageToken.SubscribeRequest);
-        List<string> lstPattern = new();
-        lstPattern.Add("pattern");
-        RegistrySubscriptionRequest rsr = new();
-        rsr.isRegistry = false;
+        List<string> lstPattern = ["pattern"];
+        RegistrySubscriptionRequest rsr = new()
+        {
+            isRegistry = false
+        };
         RemoteSubscriber resu = new(tsm, lstPattern, rsr);
         Assert.Equal(tsm, resu.Tsm);
         Assert.True(resu.IsAlive);
@@ -100,9 +103,9 @@ public void RunRemoteSubscriber()
         rsr.version = PubSubVersion.Latest;
         Assert.Equal(PubSubVersion.Latest, resu.Version);
         Assert.True(resu.HasPatterns);
-        resu.RemovePatterns(new List<string> { "pattern" });
+        resu.RemovePatterns(["pattern"]);
         Assert.False(resu.HasPatterns);
-        resu.AddPatterns(new List<string> { "patt*" });
+        resu.AddPatterns(["patt*"]);
         Assert.True(resu.HasPatterns);
         Assert.True(resu.IsMatch("pattern"));
         Assert.False(resu.IsMatch("patern"));
@@ -143,7 +146,7 @@ public void RunPublisherWithSubstitute()
         CheckBroadcast(subscriptionRegistry, RoutingOptions.Local, guid.ToString());
     }
 
-    private void CheckBroadcast(ISubscriptionRegistry subscriptionRegistry,
+    private static void CheckBroadcast(ISubscriptionRegistry subscriptionRegistry,
         RoutingOptions routingOptions = RoutingOptions.All,
         string guidString = "00000000-0000-0000-0000-000000000000")
     {
@@ -251,15 +254,15 @@ public async Task RunSubscriptionRegistryWithSubstitute()
         comLineSubscriptionRegistry.DidNotReceive<ComLine>().AnswerToSender(Arg.Any<TSM>(), Arg.Any<TSM>());
     }
 
-    private TheProcessMessage CheckSubscribe(ComLine comLineSubscriptionRegistry)
+    private static TheProcessMessage CheckSubscribe(ComLine comLineSubscriptionRegistry)
     {
         // Send a subscribe request and receive a subscribe response with the given GUID
         // and the latest version (use this subscription in the next step to publish a message).
         var guid = Guid.NewGuid();
         RegistrySubscriptionRequest rsr = new()
         {
             id = guid.ToString("N"),
-            topics = new string[] { "topic" },
+            topics = ["topic"],
             isRegistry = true,
             version = PubSubVersion.Latest
         };
@@ -274,7 +277,7 @@ private TheProcessMessage CheckSubscribe(ComLine comLineSubscriptionRegistry)
         return tpm;
     }
 
-    private TheProcessMessage CheckPublish(ComLine comLineSubscriptionRegistry)
+    private static TheProcessMessage CheckPublish(ComLine comLineSubscriptionRegistry)
     {
         // Sende a publish request and receive a publish request with the given
         // topic and payload.

diff --git a/src/Communication/SAF.Communication.PubSub.Cde/SAF.Communication.PubSub.Cde.csproj b/src/Communication/SAF.Communication.PubSub.Cde/SAF.Communication.PubSub.Cde.csproj
@@ -7,7 +7,7 @@ SPDX-License-Identifier: MPL-2.0
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <Description>Smart Application Framework (SAF) pub/sub communication extensions for C-DEngine.</Description>
   </PropertyGroup>
 

diff --git a/...munication/SAF.Communication.PubSub.Interfaces/SAF.Communication.PubSub.Interfaces.csproj b/...munication/SAF.Communication.PubSub.Interfaces/SAF.Communication.PubSub.Interfaces.csproj
@@ -7,7 +7,7 @@ SPDX-License-Identifier: MPL-2.0
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <Description>Smart Application Framework (SAF) Pub/Sub communication abstractions.</Description>
   </PropertyGroup>
 

diff --git a/src/Communication/SAF.Communication.PubSub.Tests/SAF.Communication.PubSub.Tests.csproj b/src/Communication/SAF.Communication.PubSub.Tests/SAF.Communication.PubSub.Tests.csproj
@@ -7,7 +7,7 @@ SPDX-License-Identifier: MPL-2.0
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/src/Communication/SAF.Communication.PubSub/SAF.Communication.PubSub.csproj b/src/Communication/SAF.Communication.PubSub/SAF.Communication.PubSub.csproj
@@ -7,7 +7,7 @@ SPDX-License-Identifier: MPL-2.0
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <Description>Smart Application Framework (SAF) pub/sub communication basics.</Description>
   </PropertyGroup>
 

diff --git a/src/Hosting/SAF.Hosting.Contracts/SAF.Hosting.Contracts.csproj b/src/Hosting/SAF.Hosting.Contracts/SAF.Hosting.Contracts.csproj
@@ -7,7 +7,7 @@ SPDX-License-Identifier: MPL-2.0
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/src/Hosting/SAF.Hosting.TestServices/SAF.Hosting.TestServices.csproj b/src/Hosting/SAF.Hosting.TestServices/SAF.Hosting.TestServices.csproj
@@ -7,7 +7,7 @@ SPDX-License-Identifier: MPL-2.0
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/src/Hosting/SAF.Hosting.Tests/SAF.Hosting.Tests.csproj b/src/Hosting/SAF.Hosting.Tests/SAF.Hosting.Tests.csproj
@@ -7,7 +7,7 @@ SPDX-License-Identifier: MPL-2.0
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

diff --git a/src/Hosting/SAF.Hosting/SAF.Hosting.csproj b/src/Hosting/SAF.Hosting/SAF.Hosting.csproj
@@ -1,4 +1,4 @@
-<!--
+<!--
 SPDX-FileCopyrightText: 2017-2020 TRUMPF Laser GmbH
 
 SPDX-License-Identifier: MPL-2.0
@@ -7,7 +7,7 @@ SPDX-License-Identifier: MPL-2.0
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <Description>Hosting and startup infrastructures for Smart Application Framework (SAF) based applications.</Description>
   </PropertyGroup>
 

diff --git a/src/Hosting/SAF.Hosting/ServiceAssemblyManager.cs b/src/Hosting/SAF.Hosting/ServiceAssemblyManager.cs
@@ -15,9 +15,9 @@ public IEnumerable<IServiceAssemblyManifest> GetServiceAssemblyManifests()
     {
         var loadedAssemblies = assemblySearch?.LoadServiceAssemblyManifests();
 
-        logger.LogInformation("Registered {assembliesRegisteredCount} assemblies.", serviceAssemblies.Count());
+        logger.LogInformation("Registered {AssemblyCount} assemblies.", serviceAssemblies.Count());
         return serviceAssemblies
-            .Concat(loadedAssemblies ?? Array.Empty<IServiceAssemblyManifest>())
+            .Concat(loadedAssemblies ?? [])
             .ToList();
     }
 }
diff --git a/src/Messaging/SAF.Messaging.Cde.Tests/SAF.Messaging.Cde.Tests.csproj b/src/Messaging/SAF.Messaging.Cde.Tests/SAF.Messaging.Cde.Tests.csproj
@@ -7,7 +7,7 @@ SPDX-License-Identifier: MPL-2.0
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/src/Messaging/SAF.Messaging.Cde/SAF.Messaging.Cde.csproj b/src/Messaging/SAF.Messaging.Cde/SAF.Messaging.Cde.csproj
@@ -7,7 +7,7 @@ SPDX-License-Identifier: MPL-2.0
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <Description>Smart Application Framework (SAF) messaging infrastructure for C-DEngine based communication.</Description>
   </PropertyGroup>
 

diff --git a/src/Messaging/SAF.Messaging.InProcess.Tests/SAF.Messaging.InProcess.Tests.csproj b/src/Messaging/SAF.Messaging.InProcess.Tests/SAF.Messaging.InProcess.Tests.csproj
@@ -7,7 +7,7 @@ SPDX-License-Identifier: MPL-2.0
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/src/Messaging/SAF.Messaging.InProcess/SAF.Messaging.InProcess.csproj b/src/Messaging/SAF.Messaging.InProcess/SAF.Messaging.InProcess.csproj
@@ -7,7 +7,7 @@ SPDX-License-Identifier: MPL-2.0
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <Description>Smart Application Framework (SAF) messaging infrastructure for in-process communication.</Description>
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
   </PropertyGroup>

diff --git a/src/Messaging/SAF.Messaging.LoadTest/SAF.Messaging.LoadTest.csproj b/src/Messaging/SAF.Messaging.LoadTest/SAF.Messaging.LoadTest.csproj
@@ -8,7 +8,7 @@ SPDX-License-Identifier: MPL-2.0
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

diff --git a/src/Messaging/SAF.Messaging.Redis.Tests/SAF.Messaging.Redis.Tests.csproj b/src/Messaging/SAF.Messaging.Redis.Tests/SAF.Messaging.Redis.Tests.csproj
@@ -7,7 +7,7 @@ SPDX-License-Identifier: MPL-2.0
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/src/Messaging/SAF.Messaging.Redis/SAF.Messaging.Redis.csproj b/src/Messaging/SAF.Messaging.Redis/SAF.Messaging.Redis.csproj
@@ -7,7 +7,7 @@ SPDX-License-Identifier: MPL-2.0
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <Description>Smart Application Framework (SAF) messaging infrastructure for Redis based communication.</Description>
   </PropertyGroup>
 

diff --git a/src/Messaging/SAF.Messaging.Routing.Tests/SAF.Messaging.Routing.Tests.csproj b/src/Messaging/SAF.Messaging.Routing.Tests/SAF.Messaging.Routing.Tests.csproj
@@ -7,7 +7,7 @@ SPDX-License-Identifier: MPL-2.0
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

diff --git a/src/Messaging/SAF.Messaging.Routing/SAF.Messaging.Routing.csproj b/src/Messaging/SAF.Messaging.Routing/SAF.Messaging.Routing.csproj
@@ -7,7 +7,7 @@ SPDX-License-Identifier: MPL-2.0
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <Description>Smart Application Framework (SAF) messaging infrastructure to allow message routing between different messaging systems.</Description>
   </PropertyGroup>
 

diff --git a/src/SAF.Common/SAF.Common.csproj b/src/SAF.Common/SAF.Common.csproj
@@ -7,7 +7,7 @@ SPDX-License-Identifier: MPL-2.0
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <Description>Common interface and type definitions for the Smart Application Framework (SAF).</Description>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>

diff --git a/src/Services/SAF.Services.SampleService1.Tests/SAF.Services.SampleService1.Tests.csproj b/src/Services/SAF.Services.SampleService1.Tests/SAF.Services.SampleService1.Tests.csproj
@@ -7,7 +7,7 @@ SPDX-License-Identifier: MPL-2.0
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/src/Services/SAF.Services.SampleService1/SAF.Services.SampleService1.csproj b/src/Services/SAF.Services.SampleService1/SAF.Services.SampleService1.csproj
@@ -7,7 +7,7 @@ SPDX-License-Identifier: MPL-2.0
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

diff --git a/src/Services/SAF.Services.SampleService2/SAF.Services.SampleService2.csproj b/src/Services/SAF.Services.SampleService2/SAF.Services.SampleService2.csproj
@@ -7,7 +7,7 @@ SPDX-License-Identifier: MPL-2.0
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

diff --git a/src/Storage/SAF.Storage.LightDb.Test/SAF.Storage.LiteDb.Test.csproj b/src/Storage/SAF.Storage.LightDb.Test/SAF.Storage.LiteDb.Test.csproj
@@ -7,7 +7,7 @@ SPDX-License-Identifier: MPL-2.0
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>