From e0f6ff03dc526a9139a5d3f2a8900bf238e94375 Mon Sep 17 00:00:00 2001
From: MysticBoy <mysticboy@live.com>
Date: Fri, 7 Jan 2022 01:34:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98=E8=A7=86?=
 =?UTF-8?q?=E5=9B=BE=E4=BF=AE=E5=A4=8Dnpgsql=20=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IoTSharp.Data.PostgreSQL.csproj                   |  3 +++
 IoTSharp.TaskAction/IoTSharp.TaskAction.csproj        |  2 +-
 IoTSharp/Controllers/DevicesController.cs             |  2 ++
 IoTSharp/IoTSharp.csproj                              | 11 +++++++++--
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/IoTSharp.Data.PostgreSQL/IoTSharp.Data.PostgreSQL.csproj b/IoTSharp.Data.PostgreSQL/IoTSharp.Data.PostgreSQL.csproj
index d45c1483..9c69b475 100644
--- a/IoTSharp.Data.PostgreSQL/IoTSharp.Data.PostgreSQL.csproj
+++ b/IoTSharp.Data.PostgreSQL/IoTSharp.Data.PostgreSQL.csproj
@@ -14,8 +14,11 @@
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
 		<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.1" />
+		<PackageReference Include="Npgsql" Version="6.0.2" />
 		<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.2" />
 		<PackageReference Include="EFCore.Sharding.PostgreSql" Version="5.0.25" />
+		<PackageReference Include="Npgsql.Json.NET" Version="6.0.2" />
+		<PackageReference Include="Npgsql.NodaTime" Version="6.0.2" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/IoTSharp.TaskAction/IoTSharp.TaskAction.csproj b/IoTSharp.TaskAction/IoTSharp.TaskAction.csproj
index 22c930fd..f84ddd8f 100644
--- a/IoTSharp.TaskAction/IoTSharp.TaskAction.csproj
+++ b/IoTSharp.TaskAction/IoTSharp.TaskAction.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="RestSharp" Version="107.0.0-preview.11" />
+    <PackageReference Include="RestSharp" Version="107.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/IoTSharp/Controllers/DevicesController.cs b/IoTSharp/Controllers/DevicesController.cs
index 6fb9bba0..8a41a4c7 100644
--- a/IoTSharp/Controllers/DevicesController.cs
+++ b/IoTSharp/Controllers/DevicesController.cs
@@ -260,6 +260,8 @@ namespace IoTSharp.Controllers
         /// <param name="deviceId"></param>
         /// <returns>一个压缩包，包含ca.crt client.crt client.key</returns>
         [HttpGet("{deviceId}/DownloadCertificates")]
+        [ProducesResponseType(typeof(ApiResult), StatusCodes.Status404NotFound)]
+        [ProducesResponseType(typeof(ApiResult), StatusCodes.Status400BadRequest)]
         public ActionResult DownloadCertificates(Guid deviceId)
         {
             try
diff --git a/IoTSharp/IoTSharp.csproj b/IoTSharp/IoTSharp.csproj
index 8451ec59..dd248f98 100644
--- a/IoTSharp/IoTSharp.csproj
+++ b/IoTSharp/IoTSharp.csproj
@@ -30,11 +30,12 @@
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<IsPackable>true</IsPackable>
 		<PackageLicenseExpression></PackageLicenseExpression>
-		<Copyright>Copyright 2018-2021  Yanhong Ma</Copyright>
+		<Copyright>Copyright 2018-2022  Yanhong Ma</Copyright>
 		<AssemblyVersion>2.0.1.0</AssemblyVersion>
 		<FileVersion>2.0.1.0</FileVersion>
 		<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
 		<PackageIcon>96x96.png</PackageIcon>
+		<PackageReadmeFile>README.md</PackageReadmeFile>
 	 
 	 
 		
@@ -98,12 +99,14 @@
 		<PackageReference Include="MQTTnet.AspNetCoreEx" Version="3.1.2" />
 		<PackageReference Include="MQTTnet.Extensions.Rpc" Version="3.1.1" />
 		<PackageReference Include="NetMQ" Version="4.0.1.6" />
+		<PackageReference Include="Npgsql" Version="6.0.2" />
+		<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.2" />
 		<PackageReference Include="NSwag.AspNetCore" Version="13.15.5" />
 		<PackageReference Include="PinusDB" Version="1.0.10" />
 		<PackageReference Include="PinusDB.HealthChecks" Version="1.0.10" />
 		<PackageReference Include="ProxyKit" Version="2.3.4" />
 		<PackageReference Include="Quartz.Serialization.Json" Version="3.3.3" />
-		<PackageReference Include="RestSharp" Version="107.0.0-preview.11" />
+		<PackageReference Include="RestSharp" Version="107.0.0" />
 		<PackageReference Include="Rin" Version="2.6.0" />
 		<PackageReference Include="Rin.Mvc" Version="2.6.0" />
 		<PackageReference Include="RulesEngine" Version="3.5.0" />
@@ -171,6 +174,10 @@
 		  <Pack>True</Pack>
 		  <PackagePath></PackagePath>
 		</None>
+		<None Include="..\README.md">
+		  <Pack>True</Pack>
+		  <PackagePath>\</PackagePath>
+		</None>
 		<None Include="wwwroot\fonts\fontawesome-webfont.svg" />
 		<None Include="wwwroot\fonts\glyphicons-halflings-regular.woff2" />
 	</ItemGroup>
-- 
GitLab