升级为.net 7.0

952795 · Feb 28, 2023 · 39339aa · 39339aa
1 parent 2edddfe
commit 39339aa
Show file tree

Hide file tree

Showing 40 changed files with 133 additions and 129 deletions.
diff --git a/IoTSharp.Contracts/IoTSharp.Contracts.csproj b/IoTSharp.Contracts/IoTSharp.Contracts.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/IoTSharp.Data.Storage/IoTSharp.Data.Cassandra/IoTSharp.Data.Cassandra.csproj b/IoTSharp.Data.Storage/IoTSharp.Data.Cassandra/IoTSharp.Data.Cassandra.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net7.0</TargetFramework>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="AspNetCore.HealthChecks.UI.Core" Version="6.0.5" />
+		<PackageReference Include="AspNetCore.HealthChecks.UI.Core" Version="7.0.0-rc2.7" />
 		<PackageReference Include="EFCore.Cassandra" Version="2.0.5" />
 		<PackageReference Include="IoTSharp.HealthChecks.Cassandra" Version="1.0.22" />
 	</ItemGroup>

diff --git a/IoTSharp.Data.Storage/IoTSharp.Data.ClickHouse/IoTSharp.Data.ClickHouse.csproj b/IoTSharp.Data.Storage/IoTSharp.Data.ClickHouse/IoTSharp.Data.ClickHouse.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 	<ItemGroup>
 
 
-		<PackageReference Include="AspNetCore.HealthChecks.UI.Core" Version="6.0.5" />
+		<PackageReference Include="AspNetCore.HealthChecks.UI.Core" Version="7.0.0-rc2.7" />
 		<PackageReference Include="EntityFrameworkCore.ClickHouse" Version="0.0.9" />
 		<PackageReference Include="IoTSharp.HealthChecks.ClickHouse" Version="1.0.0" />
 

diff --git a/IoTSharp.Data.Storage/IoTSharp.Data.InMemory/IoTSharp.Data.InMemory.csproj b/IoTSharp.Data.Storage/IoTSharp.Data.InMemory/IoTSharp.Data.InMemory.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -10,7 +10,7 @@
     <None Remove="Migrations\**" />
   </ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="6.0.5" />
+		<PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="7.0.0-rc2.7" />
 	</ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\IoTSharp.Data\IoTSharp.Data.csproj" />

diff --git a/IoTSharp.Data.Storage/IoTSharp.Data.MySQL/IoTSharp.Data.MySQL.csproj b/IoTSharp.Data.Storage/IoTSharp.Data.MySQL/IoTSharp.Data.MySQL.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AspNetCore.HealthChecks.MySql" Version="6.0.2" />
-    <PackageReference Include="AspNetCore.HealthChecks.UI.Core" Version="6.0.5" />
-    <PackageReference Include="AspNetCore.HealthChecks.UI.MySql.Storage" Version="6.0.5" />
-    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.10" />
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.2" />
+    <PackageReference Include="AspNetCore.HealthChecks.MySql" Version="7.0.0-rc2.4" />
+    <PackageReference Include="AspNetCore.HealthChecks.UI.Core" Version="7.0.0-rc2.7" />
+    <PackageReference Include="AspNetCore.HealthChecks.UI.MySql.Storage" Version="7.0.0-rc2.7" />
+    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="7.0.3" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/IoTSharp.Data.Storage/IoTSharp.Data.Oracle/IoTSharp.Data.Oracle.csproj b/IoTSharp.Data.Storage/IoTSharp.Data.Oracle/IoTSharp.Data.Oracle.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net7.0</TargetFramework>
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="AspNetCore.HealthChecks.Oracle" Version="6.0.3" />
-		<PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="6.0.5" />
-		<PackageReference Include="Oracle.EntityFrameworkCore" Version="6.21.61" />
+		<PackageReference Include="AspNetCore.HealthChecks.Oracle" Version="7.0.0-rc2.6" />
+		<PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="7.0.0-rc2.7" />
+		<PackageReference Include="Oracle.EntityFrameworkCore" Version="7.21.9" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/IoTSharp.Data.Storage/IoTSharp.Data.PostgreSQL/IoTSharp.Data.PostgreSQL.csproj b/IoTSharp.Data.Storage/IoTSharp.Data.PostgreSQL/IoTSharp.Data.PostgreSQL.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net7.0</TargetFramework>
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="AspNetCore.HealthChecks.NpgSql" Version="6.0.2" />
-		<PackageReference Include="AspNetCore.HealthChecks.UI.PostgreSQL.Storage" Version="6.0.4" />
+		<PackageReference Include="AspNetCore.HealthChecks.NpgSql" Version="7.0.0-rc2.6" />
+		<PackageReference Include="AspNetCore.HealthChecks.UI.PostgreSQL.Storage" Version="7.0.0-rc2.7" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/IoTSharp.Data.Storage/IoTSharp.Data.SqlServer/IoTSharp.Data.SqlServer.csproj b/IoTSharp.Data.Storage/IoTSharp.Data.SqlServer/IoTSharp.Data.SqlServer.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AspNetCore.HealthChecks.SqlServer" Version="6.0.2" />
-    <PackageReference Include="AspNetCore.HealthChecks.UI.SqlServer.Storage" Version="6.0.5" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.10" />
+    <PackageReference Include="AspNetCore.HealthChecks.SqlServer" Version="7.0.0-rc2.10" />
+    <PackageReference Include="AspNetCore.HealthChecks.UI.SqlServer.Storage" Version="7.0.0-rc2.7" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/IoTSharp.Data.Storage/IoTSharp.Data.Sqlite/IoTSharp.Data.Sqlite.csproj b/IoTSharp.Data.Storage/IoTSharp.Data.Sqlite/IoTSharp.Data.Sqlite.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="AspNetCore.HealthChecks.Sqlite" Version="6.0.2" />
-		<PackageReference Include="AspNetCore.HealthChecks.UI.Sqlite.Storage" Version="6.0.5" />
-		<PackageReference Include="AspNetCore.HealthChecks.UI.Core" Version="6.0.5" />
-		<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.10" />
+		<PackageReference Include="AspNetCore.HealthChecks.Sqlite" Version="7.0.0-rc2.5" />
+		<PackageReference Include="AspNetCore.HealthChecks.UI.Sqlite.Storage" Version="7.0.0-rc2.7" />
+		<PackageReference Include="AspNetCore.HealthChecks.UI.Core" Version="7.0.0-rc2.7" />
+		<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="7.0.3" />
 	</ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\IoTSharp.Data\IoTSharp.Data.csproj" />

diff --git a/IoTSharp.Data.TimeSeries/DependencyInjection.cs b/IoTSharp.Data.TimeSeries/DependencyInjection.cs
@@ -75,7 +75,7 @@ public  static void AddTelemetryStorage(this IServiceCollection services, AppSet
                     //https://github.com/julian-fh/influxdb-setup
                     services.AddSingleton<IStorage, InfluxDBStorage>();
                     //"TelemetryStorage": "http://localhost:8086/?org=iotsharp&bucket=iotsharp-bucket&token=iotsharp-token"
-                    services.AddObjectPool(() => InfluxDBClientFactory.Create(_connectionString));
+                    services.AddObjectPool(() => InfluxDBClientOptions.Builder.CreateNew().ConnectionString(_connectionString).Build());
                     healthChecks.AddInfluxDB(_connectionString, name: _hc_telemetryStorage);
                     break;
 

diff --git a/IoTSharp.Data.TimeSeries/IoTSharp.Data.TimeSeries.csproj b/IoTSharp.Data.TimeSeries/IoTSharp.Data.TimeSeries.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/IoTSharp.Data/IoTSharp.Data.csproj b/IoTSharp.Data/IoTSharp.Data.csproj
@@ -1,24 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Nullable>disable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="6.0.10" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.10" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.10" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="6.0.10" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Analyzers" Version="6.0.10" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.10">
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="7.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Analyzers" Version="7.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="6.0.10" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="7.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.3" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
-    <PackageReference Include="ShardingCore" Version="6.8.0.5" />
+    <PackageReference Include="ShardingCore" Version="7.7.1.2" />
 
   </ItemGroup>
 

diff --git a/IoTSharp.EventBus.CAP/CapPublisher.cs b/IoTSharp.EventBus.CAP/CapPublisher.cs
@@ -22,15 +22,15 @@ public CapPublisher(ICapPublisher queue, DotNetCore.CAP.Persistence.IDataStorage
             _queue = queue;
             _storage = storage;
         }
-        public Task<EventBusMetrics> GetMetrics()
+        public async Task<EventBusMetrics> GetMetrics()
         {
             var _api = _storage.GetMonitoringApi();
-            var ps = _api.HourlySucceededJobs(MessageType.Publish);
-            var pf = _api.HourlyFailedJobs(MessageType.Publish);
-            var ss = _api.HourlySucceededJobs(MessageType.Subscribe);
-            var sf = _api.HourlyFailedJobs(MessageType.Subscribe);
+            var ps =await _api.HourlySucceededJobs(MessageType.Publish);
+            var pf =await _api.HourlyFailedJobs(MessageType.Publish);
+            var ss =await _api.HourlySucceededJobs(MessageType.Subscribe);
+            var sf =await _api.HourlyFailedJobs(MessageType.Subscribe);
             var dayHour = ps.OrderBy(k => k.Key).Select(k => k.Key.ToString("MM-dd HH:00")).ToList();
-            var s = _api.GetStatistics();
+            var s = await _api.GetStatisticsAsync();
             var result = new EventBusMetrics(
 dayHour,
 ps.OrderBy(k=>k.Key).Select(k=>k.Value).ToList(),
@@ -46,7 +46,7 @@ public Task<EventBusMetrics> GetMetrics()
                 PublishedFailed = s.PublishedFailed,
                 ReceivedFailed = s.ReceivedFailed
             };
-            return Task.FromResult(result);
+            return  result;
         }
         public async Task PublishAttributeData(PlayloadData msg)
         {

diff --git a/IoTSharp.EventBus.CAP/DependencyInjection.cs b/IoTSharp.EventBus.CAP/DependencyInjection.cs
@@ -1,6 +1,6 @@
 
 using DotNetCore.CAP;
-using DotNetCore.CAP.Dashboard.NodeDiscovery;
+using DotNetCore.CAP.Dashboard;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using RabbitMQ.Client;
@@ -22,7 +22,6 @@ public static IApplicationBuilder UseCAPEventBus(this IApplicationBuilder app)
         {
             var provider = app.ApplicationServices;
             var options = provider.GetService<EventBusOption>();
-            app.UseCapDashboard();
             return app;
         }
 

diff --git a/IoTSharp.EventBus.CAP/IoTSharp.EventBus.CAP.csproj b/IoTSharp.EventBus.CAP/IoTSharp.EventBus.CAP.csproj
@@ -1,34 +1,34 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="AspNetCore.HealthChecks.NpgSql" Version="6.0.2" />
+		<PackageReference Include="AspNetCore.HealthChecks.NpgSql" Version="7.0.0-rc2.6" />
 		<PackageReference Include="CAP.Extensions" Version="1.0.37" />
-		<PackageReference Include="DotNetCore.CAP.Dashboard" Version="6.2.1" />
-		<PackageReference Include="DotNetCore.CAP.InMemoryStorage" Version="6.2.1" />
-		<PackageReference Include="DotNetCore.CAP.Kafka" Version="6.2.1" />
-		<PackageReference Include="DotNetCore.CAP.MongoDB" Version="6.2.1" />
-		<PackageReference Include="DotNetCore.CAP.MySql" Version="6.2.1" />
-		<PackageReference Include="DotNetCore.CAP.PostgreSql" Version="6.2.1" />
-		<PackageReference Include="DotNetCore.CAP.SqlServer" Version="6.2.1" />
-		<PackageReference Include="DotNetCore.CAP.AzureServiceBus" Version="6.2.1" />
-		<PackageReference Include="DotNetCore.CAP.AmazonSQS" Version="6.2.1" />
-		<PackageReference Include="DotNetCore.CAP.NATS" Version="6.2.1" />
-		<PackageReference Include="DotNetCore.CAP.RedisStreams" Version="6.2.1" />
-		<PackageReference Include="DotNetCore.CAP.Pulsar" Version="6.2.1" />
+		<PackageReference Include="DotNetCore.CAP.Dashboard" Version="7.0.3" />
+		<PackageReference Include="DotNetCore.CAP.InMemoryStorage" Version="7.0.3" />
+		<PackageReference Include="DotNetCore.CAP.Kafka" Version="7.0.3" />
+		<PackageReference Include="DotNetCore.CAP.MongoDB" Version="7.0.3" />
+		<PackageReference Include="DotNetCore.CAP.MySql" Version="7.0.3" />
+		<PackageReference Include="DotNetCore.CAP.PostgreSql" Version="7.0.3" />
+		<PackageReference Include="DotNetCore.CAP.SqlServer" Version="7.0.3" />
+		<PackageReference Include="DotNetCore.CAP.AzureServiceBus" Version="7.0.3" />
+		<PackageReference Include="DotNetCore.CAP.AmazonSQS" Version="7.0.3" />
+		<PackageReference Include="DotNetCore.CAP.NATS" Version="7.0.3" />
+		<PackageReference Include="DotNetCore.CAP.RedisStreams" Version="7.0.3" />
+		<PackageReference Include="DotNetCore.CAP.Pulsar" Version="7.0.3" />
 		<PackageReference Include="EasyCaching.Core" Version="1.9.0" />
-		<PackageReference Include="AspNetCore.HealthChecks.Kafka" Version="6.0.3" />
-		<PackageReference Include="AspNetCore.HealthChecks.MongoDb" Version="6.0.2" />
-		<PackageReference Include="AspNetCore.HealthChecks.Rabbitmq" Version="6.0.2" />
-		<PackageReference Include="AspNetCore.HealthChecks.Redis" Version="6.0.4" />
+		<PackageReference Include="AspNetCore.HealthChecks.Kafka" Version="7.0.0-rc2.7" />
+		<PackageReference Include="AspNetCore.HealthChecks.MongoDb" Version="7.0.0-rc2.5" />
+		<PackageReference Include="AspNetCore.HealthChecks.Rabbitmq" Version="7.0.0-rc2.6" />
+		<PackageReference Include="AspNetCore.HealthChecks.Redis" Version="7.0.0-rc2.5" />
 		<PackageReference Include="MaiKeBing.CAP.ZeroMQ" Version="1.0.37" />
 		<PackageReference Include="MaiKeBing.CAP.LiteDB" Version="1.0.37" />
 		<PackageReference Include="MaiKeBing.HostedService.ZeroMQ" Version="1.0.37" />
-		<PackageReference Include="Savorboard.CAP.InMemoryMessageQueue" Version="6.0.0" />
+		<PackageReference Include="Savorboard.CAP.InMemoryMessageQueue" Version="7.0.0" />
 
 	</ItemGroup>
 

diff --git a/IoTSharp.EventBus.Shashlik/IoTSharp.EventBus.Shashlik.csproj b/IoTSharp.EventBus.Shashlik/IoTSharp.EventBus.Shashlik.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="AspNetCore.HealthChecks.NpgSql" Version="6.0.2" />
+		<PackageReference Include="AspNetCore.HealthChecks.NpgSql" Version="7.0.0-rc2.6" />
 		<PackageReference Include="EasyCaching.Core" Version="1.9.0" />
-		<PackageReference Include="AspNetCore.HealthChecks.Kafka" Version="6.0.3" />
-		<PackageReference Include="AspNetCore.HealthChecks.Rabbitmq" Version="6.0.2" />
+		<PackageReference Include="AspNetCore.HealthChecks.Kafka" Version="7.0.0-rc2.7" />
+		<PackageReference Include="AspNetCore.HealthChecks.Rabbitmq" Version="7.0.0-rc2.6" />
 		<PackageReference Include="Shashlik.EventBus" Version="2.3.0" />
 		<PackageReference Include="Shashlik.EventBus.Kafka" Version="2.3.0" />
 		<PackageReference Include="Shashlik.EventBus.MemoryQueue" Version="2.3.0" />

diff --git a/IoTSharp.EventBus/EventBusOption.cs b/IoTSharp.EventBus/EventBusOption.cs
@@ -5,18 +5,22 @@ namespace IoTSharp.EventBus
 {
     public class EventBusOption
     {
+#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的字段必须包含非 null 值。请考虑声明为可以为 null。
         public AppSettings AppSettings { get; set; }
 
         public EventBusFramework EventBus => AppSettings.EventBus;
 
-
+
+
         public string EventBusStore { get; set; }
+
         public string EventBusMQ { get; set; }
-        public IHealthChecksBuilder HealthChecks { get; set; }
+        public IHealthChecksBuilder HealthChecks { get; set; } 
         public IServiceCollection services { get; internal set; }
 
         public delegate Task RunRulesEventHander(Guid devid, object obj, EventType mountType);
 
         public  RunRulesEventHander RunRules;
+#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的字段必须包含非 null 值。请考虑声明为可以为 null。
     }
 }
diff --git a/IoTSharp.EventBus/EventsBusDependencyInjection.cs b/IoTSharp.EventBus/EventsBusDependencyInjection.cs
@@ -19,8 +19,11 @@ public static IApplicationBuilder UseEventBus(this IApplicationBuilder app, Func
         {
             var provider = app.ApplicationServices;
             var options = provider.GetService<EventBusOption>();
-            var hander=   action.Invoke(options);
-            options.RunRules += hander; 
+            var hander=   action.Invoke(options!);
+            if (options != null)
+            {
+                options.RunRules += hander;
+            }
             return app;
 
         }

diff --git a/IoTSharp.EventBus/IoTSharp.EventBus.csproj b/IoTSharp.EventBus/IoTSharp.EventBus.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/IoTSharp.Extensions.AspNetCore/IoTSharp.Extensions.AspNetCore.csproj b/IoTSharp.Extensions.AspNetCore/IoTSharp.Extensions.AspNetCore.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net7.0</TargetFramework>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Version>1.0.1</Version>
 		<Product>IoTSharp.Extensions.AspNetCore</Product>
@@ -12,7 +12,7 @@
 	</PropertyGroup>
 	<ItemGroup>
 		<FrameworkReference Include="Microsoft.AspNetCore.App" />
-		<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.1" />
-		<PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="7.0.0" />
+		<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
 	</ItemGroup>
 </Project>
diff --git a/IoTSharp.Extensions.BouncyCastle/IoTSharp.Extensions.BouncyCastle.csproj b/IoTSharp.Extensions.BouncyCastle/IoTSharp.Extensions.BouncyCastle.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Version>1.0.1</Version>
     <Authors>MaikeBing</Authors>