使用最新版本的依赖。

952795 · Apr 28, 2022 · 967ae4e · 967ae4e
1 parent 3694a8e
commit 967ae4e
Show file tree

Hide file tree

Showing 12 changed files with 60 additions and 55 deletions.
diff --git a/IoTSharp.Data.InMemory/IoTSharp.Data.InMemory.csproj b/IoTSharp.Data.InMemory/IoTSharp.Data.InMemory.csproj
@@ -12,13 +12,13 @@
 	<ItemGroup>
 		<PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="6.0.4" />
 		<PackageReference Include="AspNetCore.HealthChecks.UI.Core" Version="6.0.4" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.3" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.3">
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.4" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.4">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.3" />
-		<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.3" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.4" />
+		<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.4" />
 	</ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\IoTSharp.Data\IoTSharp.Data.csproj" />

diff --git a/IoTSharp.Data.MySQL/IoTSharp.Data.MySQL.csproj b/IoTSharp.Data.MySQL/IoTSharp.Data.MySQL.csproj
@@ -8,12 +8,12 @@
     <PackageReference Include="AspNetCore.HealthChecks.MySql" Version="6.0.2" />
     <PackageReference Include="AspNetCore.HealthChecks.UI.Core" Version="6.0.4" />
     <PackageReference Include="AspNetCore.HealthChecks.UI.MySql.Storage" Version="6.0.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.3">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.3" />
-    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.4" />
+    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.4" />
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.1" />
 	  <PackageReference Include="EFCore.Sharding.MySql" Version="6.0.3" />
 	  <PackageReference Include="Pomelo.EntityFrameworkCore.MySql.NetTopologySuite" Version="6.0.1" />

diff --git a/IoTSharp.Data.Oracle/IoTSharp.Data.Oracle.csproj b/IoTSharp.Data.Oracle/IoTSharp.Data.Oracle.csproj
@@ -9,9 +9,9 @@
 		<PackageReference Include="AspNetCore.HealthChecks.UI.Core" Version="6.0.4" />
 		<PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="6.0.4" />
 		<PackageReference Include="EFCore.Sharding.Oracle" Version="6.0.3" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.3" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.4" />
 		<PackageReference Include="Oracle.EntityFrameworkCore" Version="6.21.5" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.3">
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.4">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>

diff --git a/IoTSharp.Data.PostgreSQL/IoTSharp.Data.PostgreSQL.csproj b/IoTSharp.Data.PostgreSQL/IoTSharp.Data.PostgreSQL.csproj
@@ -8,18 +8,18 @@
 		<PackageReference Include="AspNetCore.HealthChecks.NpgSql" Version="6.0.2" />
 		<PackageReference Include="AspNetCore.HealthChecks.UI.PostgreSQL.Storage" Version="6.0.4" />
 		<PackageReference Include="AspNetCore.HealthChecks.UI.Core" Version="6.0.4" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.3" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.3">
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.4" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.4">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.3" />
-		<PackageReference Include="Npgsql" Version="6.0.3" />
-		<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.3" />
+		<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.4" />
+		<PackageReference Include="Npgsql" Version="6.0.4" />
+		<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.4" />
 		<PackageReference Include="EFCore.Sharding.PostgreSql" Version="6.0.3" />
-		<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.NetTopologySuite" Version="6.0.3" />
-		<PackageReference Include="Npgsql.Json.NET" Version="6.0.3" />
-		<PackageReference Include="Npgsql.NodaTime" Version="6.0.3" />
+		<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.NetTopologySuite" Version="6.0.4" />
+		<PackageReference Include="Npgsql.Json.NET" Version="6.0.4" />
+		<PackageReference Include="Npgsql.NodaTime" Version="6.0.4" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/IoTSharp.Data.SqlServer/IoTSharp.Data.SqlServer.csproj b/IoTSharp.Data.SqlServer/IoTSharp.Data.SqlServer.csproj
@@ -9,7 +9,7 @@
     <PackageReference Include="AspNetCore.HealthChecks.UI.Core" Version="6.0.4" />
     <PackageReference Include="AspNetCore.HealthChecks.UI.SqlServer.Storage" Version="6.0.4" />
     <PackageReference Include="EFCore.Sharding.SqlServer" Version="6.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.4" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/IoTSharp.Data.Sqlite/IoTSharp.Data.Sqlite.csproj b/IoTSharp.Data.Sqlite/IoTSharp.Data.Sqlite.csproj
@@ -7,13 +7,13 @@
 		<PackageReference Include="AspNetCore.HealthChecks.Sqlite" Version="6.0.2" />
 		<PackageReference Include="AspNetCore.HealthChecks.UI.Sqlite.Storage" Version="6.0.4" />
 		<PackageReference Include="AspNetCore.HealthChecks.UI.Core" Version="6.0.4" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.3" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.3">
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.4" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.4">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.3" />
-		<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.3" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.4" />
+		<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.4" />
 		<PackageReference Include="EFCore.Sharding.SQLite" Version="6.0.3" />
 	</ItemGroup>
   <ItemGroup>

diff --git a/IoTSharp.Data/IoTSharp.Data.csproj b/IoTSharp.Data/IoTSharp.Data.csproj
@@ -6,8 +6,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.4" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
 	  <PackageReference Include="EFCore.Sharding" Version="6.0.3" />
 

diff --git a/IoTSharp.Interpreter/IoTSharp.Interpreter.csproj b/IoTSharp.Interpreter/IoTSharp.Interpreter.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="CLanguage" Version="0.17.40" />
-		<PackageReference Include="CS-Script" Version="4.4.1" />
+		<PackageReference Include="CS-Script" Version="4.4.2" />
 		<PackageReference Include="Jint" Version="3.0.0-beta-2037" />
 		<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
 		<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.1.0" />

diff --git a/IoTSharp.SDKs/IoTSharp.Sdk.MQTT/IoTSharp.Sdk.MQTT.csproj b/IoTSharp.SDKs/IoTSharp.Sdk.MQTT/IoTSharp.Sdk.MQTT.csproj
@@ -1,30 +1,34 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFrameworks>net462;netstandard2.0;netstandard2.1;net5.0;net6.0</TargetFrameworks>
-    <Version>1.0.1</Version>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <Authors>Maikebing</Authors>
-    <Product>IoTSharp</Product>
-    <PackageProjectUrl>https://github.com/IoTSharp/IoTSharp/tree/master/IoTSharp.SDKs</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/IoTSharp/IoTSharp</RepositoryUrl>
-    <Copyright>Copyright 2018-2020</Copyright>
-    <PackageIcon>200x200.png</PackageIcon>
-	  <IsPackable>true</IsPackable>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFrameworks>net462;netstandard2.0;netstandard2.1;net5.0;net6.0</TargetFrameworks>
+		<Version>1.0.1</Version>
+		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+		<PackageLicenseExpression>MIT</PackageLicenseExpression>
+		<Authors>Maikebing</Authors>
+		<Product>IoTSharp</Product>
+		<PackageProjectUrl>https://github.com/IoTSharp/IoTSharp/tree/master/IoTSharp.SDKs</PackageProjectUrl>
+		<RepositoryUrl>https://github.com/IoTSharp/IoTSharp</RepositoryUrl>
+		<Copyright>Copyright 2018-2020</Copyright>
+		<PackageIcon>200x200.png</PackageIcon>
+		<IsPackable>true</IsPackable>
+		<RestoreAdditionalProjectSources>
+			https://api.nuget.org/v3/index.json;
+			https://www.myget.org/F/mqttnet/api/v3/index.json;
+		</RestoreAdditionalProjectSources>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="MQTTnet" Version="4.0.0-preview5" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="MQTTnet" Version="4.0.0.159" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <None Include="..\docs\200x200.png">
-      <Pack>True</Pack>
-      <PackagePath></PackagePath>
-    </None>
-  </ItemGroup>
+	<ItemGroup>
+		<None Include="..\docs\200x200.png">
+			<Pack>True</Pack>
+			<PackagePath></PackagePath>
+		</None>
+	</ItemGroup>
 
 
 </Project>
diff --git a/IoTSharp.SDKs/IoTSharp.Sdk.MQTT/MQTTClient.cs b/IoTSharp.SDKs/IoTSharp.Sdk.MQTT/MQTTClient.cs
@@ -17,7 +17,7 @@ public MQTTClient(Uri  uri)
         public string DeviceId { get; set; } = string.Empty;
         public Uri BrokerUri { get; set; }
         public bool IsConnected => (Client?.IsConnected).GetValueOrDefault();
-        private MqttClient Client { get; set; }
+        private IMqttClient Client { get; set; }
         public delegate void DLogError(string message,Exception exception );
         public event DLogError LogError;
         public delegate void DLogInformation(string message);

diff --git a/IoTSharp.Test/IoTSharp.Test.csproj b/IoTSharp.Test/IoTSharp.Test.csproj
@@ -15,9 +15,9 @@
     <PackageReference Include="Ductus.FluentDocker.MsTest" Version="2.10.45" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.1.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
 	  <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.1.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/IoTSharp/IoTSharp.csproj b/IoTSharp/IoTSharp.csproj
@@ -97,6 +97,7 @@
 		<PackageReference Include="IoTSharp.Data.Taos" Version="2.0.467" />
 		<PackageReference Include="IoTSharp.HealthChecks.Taos" Version="2.0.467" />
 		<PackageReference Include="MaiKeBing.HostedService.ZeroMQ" Version="1.0.35" />
+		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.4" />
 		<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.1.0" />
 		<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" Version="4.1.0" />
 		<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.1.0" />
@@ -106,9 +107,9 @@
 		<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
 		<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.15.1" />
 		<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.3" />
-		<PackageReference Include="MQTTnet" Version="4.0.0.153" />
-		<PackageReference Include="MQTTnet.AspNetCore" Version="4.0.0-preview5" />
-		<PackageReference Include="MQTTnet.Extensions.Rpc" Version="4.0.0-preview5" />
+		<PackageReference Include="MQTTnet" Version="4.0.0.159" />
+		<PackageReference Include="MQTTnet.AspNetCore" Version="4.0.0.159" />
+		<PackageReference Include="MQTTnet.Extensions.Rpc" Version="4.0.0.159" />
 		<PackageReference Include="NetMQ" Version="4.0.1.8" />
 		<PackageReference Include="Npgsql" Version="6.0.4" />
 		<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.4" />
@@ -140,7 +141,7 @@
 		<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
 		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.0" />
-		<PackageReference Include="MQTTnet.Extensions.ManagedClient" Version="4.0.0-preview5" />
+		<PackageReference Include="MQTTnet.Extensions.ManagedClient" Version="4.0.0.159" />
 		<PackageReference Include="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="6.0.4" />
 		<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="6.0.4" />
 		<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.4" />