UPDATE to NET8.0 Core projects

luca-domenichini · Dec 12, 2023 · 9e2f7a2 · 9e2f7a2
1 parent bf3079f
commit 9e2f7a2
Show file tree

Hide file tree

Showing 27 changed files with 73 additions and 64 deletions.
diff --git a/Apps/SmartIOT.Connector.ConsoleApp/AspNetExtensions.cs b/Apps/SmartIOT.Connector.ConsoleApp/AspNetExtensions.cs
@@ -15,7 +15,9 @@ public static IServiceCollection AddSmartIotConnectorRunner(this IServiceCollect
         services.AddSingleton<ISchedulerFactory>(s => s.GetRequiredService<Runner>().SchedulerFactory);
         services.AddSingleton<ITimeService>(s => s.GetRequiredService<Runner>().TimeService);
 
-        services.AddHostedService<Runner>();
+        // add custom Runner as a singleton and as a hosted service
+        services.AddSingleton<Runner>();
+        services.AddHostedService<Runner>(sp => sp.GetRequiredService<Runner>());
 
         return services;
     }

diff --git a/Apps/SmartIOT.Connector.ConsoleApp/Program.cs b/Apps/SmartIOT.Connector.ConsoleApp/Program.cs
@@ -1,4 +1,4 @@
-using Microsoft.AspNetCore.Mvc.ApiExplorer;
+using Asp.Versioning.ApiExplorer;
 using Serilog;
 using SmartIOT.Connector.RestApi;
 using System.Diagnostics;

diff --git a/Apps/SmartIOT.Connector.ConsoleApp/SmartIOT.Connector.ConsoleApp.csproj b/Apps/SmartIOT.Connector.ConsoleApp/SmartIOT.Connector.ConsoleApp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
@@ -16,16 +16,16 @@
 	<PackageLicenseExpression>MIT</PackageLicenseExpression>
 	<Copyright>Luca Domenichini</Copyright>
 	<AssemblyVersion>1.0.0.0</AssemblyVersion>
-	<UserSecretsId>test</UserSecretsId>
+	<OpenApiGenerateDocumentsOnBuild>false</OpenApiGenerateDocumentsOnBuild> <!-- Starting with .NET7, we need this -->
   </PropertyGroup>
 
   <ItemGroup>
     <!--<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.15.1" />-->
-    <PackageReference Include="Serilog" Version="3.0.1" />
+    <PackageReference Include="Serilog" Version="3.1.1" />
     <PackageReference Include="Serilog.Enrichers.Context" Version="4.6.5" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="7.0.0" />
-    <PackageReference Include="Serilog.Settings.Configuration" Version="7.0.1" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
     <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
   </ItemGroup>

diff --git a/Connectors/SmartIOT.Connector.Mqtt/SmartIOT.Connector.Mqtt.csproj b/Connectors/SmartIOT.Connector.Mqtt/SmartIOT.Connector.Mqtt.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	<Authors>Luca Domenichini</Authors>
@@ -17,8 +17,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MQTTnet.Extensions.ManagedClient" Version="4.3.1.873" />
-    <PackageReference Include="protobuf-net" Version="3.2.26" />
+    <PackageReference Include="MQTTnet.Extensions.ManagedClient" Version="4.3.3.952" />
+    <PackageReference Include="protobuf-net" Version="3.2.30" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Connectors/SmartIOT.Connector.Tcp/SmartIOT.Connector.Tcp.csproj b/Connectors/SmartIOT.Connector.Tcp/SmartIOT.Connector.Tcp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	<Authors>Luca Domenichini</Authors>

diff --git a/Core/SmartIOT.Connector.Core/SmartIOT.Connector.Core.csproj b/Core/SmartIOT.Connector.Core/SmartIOT.Connector.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	<Authors>Luca Domenichini</Authors>

diff --git a/Core/SmartIOT.Connector.Messages/SmartIOT.Connector.Messages.csproj b/Core/SmartIOT.Connector.Messages/SmartIOT.Connector.Messages.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+	<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	<Authors>Luca Domenichini</Authors>
@@ -17,7 +17,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="protobuf-net" Version="3.2.26" />
+    <PackageReference Include="protobuf-net" Version="3.2.30" />
   </ItemGroup>
 
 </Project>
diff --git a/Core/SmartIOT.Connector.Prometheus/SmartIOT.Connector.Prometheus.csproj b/Core/SmartIOT.Connector.Prometheus/SmartIOT.Connector.Prometheus.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	<Authors>Luca Domenichini</Authors>
@@ -17,7 +17,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="prometheus-net" Version="8.0.1" />
+    <PackageReference Include="prometheus-net" Version="8.2.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Core/SmartIOT.Connector.RestApi/AspNetCoreExtensions.cs b/Core/SmartIOT.Connector.RestApi/AspNetCoreExtensions.cs
@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Mvc;
+using Asp.Versioning;
+using Asp.Versioning.ApiExplorer;
 using Microsoft.Extensions.DependencyInjection;
 using SmartIOT.Connector.Core;
 using SmartIOT.Connector.RestApi.Services;
@@ -15,13 +16,14 @@ public static IServiceCollection AddSmartIotConnectorRestApi(this IServiceCollec
             config.DefaultApiVersion = new ApiVersion(1, 0);
             config.AssumeDefaultVersionWhenUnspecified = true;
             config.ReportApiVersions = true;
-        });
+        })
+            .AddApiExplorer(options =>
+            {
+                options.GroupNameFormat = "'v'VVV";
+                options.SubstituteApiVersionInUrl = true;
+            });
 
-        services.AddVersionedApiExplorer(setup =>
-        {
-            setup.GroupNameFormat = "'v'VVV";
-            setup.SubstituteApiVersionInUrl = true;
-        });
+        services.AddTransient<IApiVersionDescriptionProvider, GroupedApiVersionDescriptionProvider>();
 
         services.ConfigureOptions<SwaggerVersioningOptions>();
 

diff --git a/Core/SmartIOT.Connector.RestApi/Controllers/V1/ConfigurationController.cs b/Core/SmartIOT.Connector.RestApi/Controllers/V1/ConfigurationController.cs
@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Http;
+using Asp.Versioning;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using SmartIOT.Connector.Core;
 using SmartIOT.Connector.RestApi.Services;

diff --git a/Core/SmartIOT.Connector.RestApi/Controllers/V1/ConnectorController.cs b/Core/SmartIOT.Connector.RestApi/Controllers/V1/ConnectorController.cs
@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Http;
+using Asp.Versioning;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using SmartIOT.Connector.Core;
 using SmartIOT.Connector.RestApi.Services;

diff --git a/Core/SmartIOT.Connector.RestApi/Controllers/V1/DeviceController.cs b/Core/SmartIOT.Connector.RestApi/Controllers/V1/DeviceController.cs
@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Http;
+using Asp.Versioning;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using SmartIOT.Connector.Core;
 using SmartIOT.Connector.Core.Conf;

diff --git a/Core/SmartIOT.Connector.RestApi/Controllers/V1/SchedulerController.cs b/Core/SmartIOT.Connector.RestApi/Controllers/V1/SchedulerController.cs
@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Http;
+using Asp.Versioning;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using SmartIOT.Connector.Core;
 using SmartIOT.Connector.Core.Conf;

diff --git a/Core/SmartIOT.Connector.RestApi/SmartIOT.Connector.RestApi.csproj b/Core/SmartIOT.Connector.RestApi/SmartIOT.Connector.RestApi.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	<GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -26,11 +26,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="5.1.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />
+
+	<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
+	<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />
     <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.5.0" />
+    <PackageReference Include="Asp.Versioning.Mvc" Version="8.0.0" />
+    <PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Core/SmartIOT.Connector.RestApi/SwaggerVersioningOptions.cs b/Core/SmartIOT.Connector.RestApi/SwaggerVersioningOptions.cs
@@ -1,4 +1,4 @@
-using Microsoft.AspNetCore.Mvc.ApiExplorer;
+using Asp.Versioning.ApiExplorer;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Microsoft.OpenApi.Models;
@@ -27,7 +27,7 @@ public void Configure(SwaggerGenOptions options)
         }
     }
 
-    public void Configure(string name, SwaggerGenOptions options)
+    public void Configure(string? name, SwaggerGenOptions options)
     {
         Configure(options);
     }

diff --git a/Devices/SmartIOT.Connector.Plc.S7Net/SmartIOT.Connector.Plc.S7Net.csproj b/Devices/SmartIOT.Connector.Plc.S7Net/SmartIOT.Connector.Plc.S7Net.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+	<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	<Authors>Luca Domenichini</Authors>

diff --git a/Devices/SmartIOT.Connector.Plc.Snap7/SmartIOT.Connector.Plc.Snap7.csproj b/Devices/SmartIOT.Connector.Plc.Snap7/SmartIOT.Connector.Plc.Snap7.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	<Authors>Luca Domenichini</Authors>

diff --git a/Testers/SmartIOT.Connector.MqttClient.Tester/MainWindow.xaml.cs b/Testers/SmartIOT.Connector.MqttClient.Tester/MainWindow.xaml.cs
@@ -203,7 +203,7 @@ private void DoWriteData(string deviceId, string tagId, string topic, int offset
     {
         TagWriteRequestCommand msg = new TagWriteRequestCommand(deviceId, tagId, offset, data);
 
-        _mqttClient.PublishAsync(new MqttApplicationMessageBuilder()
+        _mqttClient!.PublishAsync(new MqttApplicationMessageBuilder()
             .WithTopic(topic)
             .WithQualityOfServiceLevel(MQTTnet.Protocol.MqttQualityOfServiceLevel.AtLeastOnce)
             .WithPayload(_messageSerializer!.SerializeMessage(msg))

diff --git a/Testers/SmartIOT.Connector.MqttClient.Tester/SmartIOT.Connector.MqttClient.Tester.csproj b/Testers/SmartIOT.Connector.MqttClient.Tester/SmartIOT.Connector.MqttClient.Tester.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MQTTnet.Extensions.ManagedClient" Version="4.3.1.873" />
+    <PackageReference Include="MQTTnet.Extensions.ManagedClient" Version="4.3.3.952" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Testers/SmartIOT.Connector.MqttServer.Tester/MainWindow.xaml.cs b/Testers/SmartIOT.Connector.MqttServer.Tester/MainWindow.xaml.cs
@@ -16,7 +16,7 @@ namespace SmartIOT.Connector.MqttServer.Tester;
 /// </summary>
 public partial class MainWindow : Window
 {
-    private MQTTnet.Server.MqttServer _mqttServer;
+    private MQTTnet.Server.MqttServer? _mqttServer;
     private ISingleMessageSerializer? _messageSerializer;
     private string? _deviceStatusTopic;
     private string? _tagReadTopic;
@@ -214,7 +214,7 @@ private void DoWriteData(string deviceId, string tagId, string topic, int offset
     {
         TagWriteRequestCommand msg = new TagWriteRequestCommand(deviceId, tagId, offset, data);
 
-        _mqttServer.InjectApplicationMessage(new InjectedMqttApplicationMessage(
+        _mqttServer!.InjectApplicationMessage(new InjectedMqttApplicationMessage(
             new MqttApplicationMessageBuilder()
                 .WithTopic(topic)
                 .WithQualityOfServiceLevel(MQTTnet.Protocol.MqttQualityOfServiceLevel.AtLeastOnce)

diff --git a/Testers/SmartIOT.Connector.MqttServer.Tester/SmartIOT.Connector.MqttServer.Tester.csproj b/Testers/SmartIOT.Connector.MqttServer.Tester/SmartIOT.Connector.MqttServer.Tester.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MQTTnet" Version="4.3.1.873" />
+    <PackageReference Include="MQTTnet" Version="4.3.3.952" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Tests/SmartIOT.Connector.Core.Tests/SmartIOT.Connector.Core.Tests.csproj b/Tests/SmartIOT.Connector.Core.Tests/SmartIOT.Connector.Core.Tests.csproj
@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
 	<FileVersion>1.0.0.0</FileVersion>
 	<AssemblyVersion>1.0.0.0</AssemblyVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="Moq" Version="4.18.1" />
-    <PackageReference Include="xunit" Version="2.5.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.1">
+    <PackageReference Include="xunit" Version="2.6.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/Tests/SmartIOT.Connector.Mocks/SmartIOT.Connector.Mocks.csproj b/Tests/SmartIOT.Connector.Mocks/SmartIOT.Connector.Mocks.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <FileVersion>1.0.0.0</FileVersion>

diff --git a/Tests/SmartIOT.Connector.Mqtt.Tests/SmartIOT.Connector.Mqtt.Tests.csproj b/Tests/SmartIOT.Connector.Mqtt.Tests/SmartIOT.Connector.Mqtt.Tests.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <Nullable>enable</Nullable>
 	<IsPackable>false</IsPackable>
 	<FileVersion>1.0.0.0</FileVersion>
 	<AssemblyVersion>1.0.0.0</AssemblyVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
-    <PackageReference Include="xunit" Version="2.5.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.1">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="xunit" Version="2.6.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/Tests/SmartIOT.Connector.Prometheus.Tests/SmartIOT.Connector.Prometheus.Tests.csproj b/Tests/SmartIOT.Connector.Prometheus.Tests/SmartIOT.Connector.Prometheus.Tests.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <Nullable>enable</Nullable>
 	<IsPackable>false</IsPackable>
 	<FileVersion>1.0.0.0</FileVersion>
 	<AssemblyVersion>1.0.0.0</AssemblyVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
-    <PackageReference Include="xunit" Version="2.5.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.1">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="xunit" Version="2.6.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/Tests/SmartIOT.Connector.RestApi.Tests/SmartIOT.Connector.RestApi.Tests.csproj b/Tests/SmartIOT.Connector.RestApi.Tests/SmartIOT.Connector.RestApi.Tests.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
-    <PackageReference Include="xunit" Version="2.5.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.1">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="xunit" Version="2.6.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>