Skip to content

IoTSharp
IoTSharp

IoTSharp / IoTSharp
大约 1 年 前同步成功

通知 15
Star 2
Fork 0
IoTSharp
IoTSharp

体验新版 GitCode，发现更多精彩内容 >>

提交 aa4a8f8d 编写于 作者: 麦壳饼's avatar 麦壳饼
浏览文件
操作

判断操作系统 给 FriendlyName 以及处理其他依赖项

上级 13c44d97
隐藏空白更改
内联 并排
Showing with 31 addition and 33 deletion
IoTSharp.Contracts/IoTSharp.Contracts.csproj
浏览文件 @ aa4a8f8d
......@@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
</ItemGroup>
</Project>
IoTSharp.Data.TimeSeries/IoTSharp.Data.TimeSeries.csproj
浏览文件 @ aa4a8f8d
......@@ -11,10 +11,10 @@
<PackageReference Include="IoTSharp.HealthChecks.InfluxDB" Version="1.0.22" />
<PackageReference Include="IoTSharp.HealthChecks.IoTDB" Version="1.0.22" />
<PackageReference Include="hyjiacan.pinyin4net" Version="4.1.1" />
<PackageReference Include="IoTSharp.Data.Taos" Version="3.0.20" />
<PackageReference Include="IoTSharp.HealthChecks.Taos" Version="3.0.20" />
<PackageReference Include="IoTSharp.Data.Taos" Version="3.0.21.74" />
<PackageReference Include="IoTSharp.HealthChecks.Taos" Version="3.0.21.74" />
<PackageReference Include="PinusDB.HealthChecks" Version="1.0.10" />
<PackageReference Include="InfluxDB.Client" Version="4.7.0" />
<PackageReference Include="InfluxDB.Client" Version="4.9.0" />
<PackageReference Include="PinusDB" Version="1.0.10" />
</ItemGroup>
<ItemGroup>
......
IoTSharp.Data/IoTSharp.Data.csproj
浏览文件 @ aa4a8f8d
......@@ -17,7 +17,7 @@
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="6.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.10" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
<PackageReference Include="ShardingCore" Version="6.8.0.5" />
</ItemGroup>
......
IoTSharp.EventBus.CAP/IoTSharp.EventBus.CAP.csproj
浏览文件 @ aa4a8f8d
......@@ -20,7 +20,7 @@
<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="EasyCaching.Core" Version="1.7.0" />
<PackageReference Include="EasyCaching.Core" Version="1.8.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" />
......
IoTSharp.EventBus.Shashlik/IoTSharp.EventBus.Shashlik.csproj
浏览文件 @ aa4a8f8d
......@@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AspNetCore.HealthChecks.NpgSql" Version="6.0.2" />
<PackageReference Include="EasyCaching.Core" Version="1.7.0" />
<PackageReference Include="EasyCaching.Core" Version="1.8.0" />
<PackageReference Include="AspNetCore.HealthChecks.Kafka" Version="6.0.3" />
<PackageReference Include="AspNetCore.HealthChecks.Rabbitmq" Version="6.0.2" />
<PackageReference Include="Shashlik.EventBus" Version="2.2.0" />
......
IoTSharp.EventBus/IoTSharp.EventBus.csproj
浏览文件 @ aa4a8f8d
......@@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="EasyCaching.Core" Version="1.7.0" />
<PackageReference Include="EasyCaching.Core" Version="1.8.0" />
</ItemGroup>
<ItemGroup>
......
IoTSharp.Extensions.EFCore/IoTSharp.Extensions.EFCore.csproj
浏览文件 @ aa4a8f8d
......@@ -12,7 +12,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.10" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
</ItemGroup>
<ItemGroup>
......
IoTSharp.Extensions.RESTful/IoTSharp.Extensions.RESTful.csproj
浏览文件 @ aa4a8f8d
......@@ -11,7 +11,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
<PackageReference Include="RestSharp" Version="108.0.3" />
</ItemGroup>
......
IoTSharp.Extensions.X509/Helpers.cs
浏览文件 @ aa4a8f8d
......@@ -28,6 +28,7 @@ namespace IoTSharp.Extensions.X509
using System;
using System.Collections.Generic;
using System.IO;
using System.Runtime.InteropServices;
using System.Security.Cryptography;
using System.Security.Cryptography.X509Certificates;
using System.Text;
......@@ -465,7 +466,10 @@ namespace IoTSharp.Extensions.X509
var newCertificate = new X509Certificate2(certBuffer, Password);
var rsaPrivateKey = DecodeRsaPrivateKey(keyBuffer);
newCertificate = newCertificate.CopyWithPrivateKey(rsaPrivateKey);
newCertificate.FriendlyName = friendlyName;
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
newCertificate.FriendlyName = friendlyName;
}
return newCertificate;
}
catch (Exception ex)
......
IoTSharp.Extensions/IoTSharp.Extensions.csproj
浏览文件 @ aa4a8f8d
......@@ -11,7 +11,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
</ItemGroup>
</Project>
IoTSharp.Interpreter/IoTSharp.Interpreter.csproj
浏览文件 @ aa4a8f8d
......@@ -4,17 +4,17 @@
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="CLanguage" Version="0.18.47" />
<PackageReference Include="CS-Script" Version="4.4.6" />
<PackageReference Include="CLanguage" Version="0.18.48" />
<PackageReference Include="CS-Script" Version="4.6.2" />
<PackageReference Include="Jint" Version="3.0.0-beta-2037" />
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.2" />
<PackageReference Include="IronPython" Version="3.4.0-alpha1" />
<PackageReference Include="IronPython" Version="3.4.0" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
<PackageReference Include="NeoLua" Version="1.3.14" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
</ItemGroup>
<ItemGroup>
<Compile Update="Properties\Resources.Designer.cs">
......
IoTSharp.SDKs/IoTSharp.Sdk.CSharp/IoTSharp.Sdk.Http.csproj
浏览文件 @ aa4a8f8d
......@@ -18,23 +18,17 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
<Reference Include="System.Net.Http" />
<Reference Include="System.ComponentModel.DataAnnotations" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
<PackageReference Include="System.ComponentModel.Annotations" Version="6.0.*" />
</ItemGroup>
<ItemGroup>
<None Include="..\docs\200x200.png">
<Pack>True</Pack>
<PackagePath></PackagePath>
</None>
</ItemGroup>
</Project>
\ No newline at end of file
IoTSharp.SDKs/IoTSharp.Sdk.MQTT/IoTSharp.Sdk.MQTT.csproj
浏览文件 @ aa4a8f8d
......@@ -19,8 +19,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MQTTnet" Version="4.1.3.436" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="MQTTnet" Version="4.1.4.563" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
</ItemGroup>
<ItemGroup>
......
IoTSharp/IoTSharp.csproj
浏览文件 @ aa4a8f8d
......@@ -53,15 +53,15 @@
<PackageReference Include="AspNetCore.HealthChecks.System" Version="6.0.5" />
<PackageReference Include="AspNetCore.HealthChecks.UI" Version="6.0.5" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="6.0.5" />
<PackageReference Include="EasyCaching.InMemory" Version="1.7.0" />
<PackageReference Include="EasyCaching.LiteDB" Version="1.7.0" />
<PackageReference Include="EasyCaching.Redis" Version="1.7.0" />
<PackageReference Include="Figgle" Version="0.4.1" />
<PackageReference Include="EasyCaching.InMemory" Version="1.8.0" />
<PackageReference Include="EasyCaching.LiteDB" Version="1.8.0" />
<PackageReference Include="EasyCaching.Redis" Version="1.8.0" />
<PackageReference Include="Figgle" Version="0.5.1" />
<PackageReference Include="hyjiacan.pinyin4net" Version="4.1.1" />
<PackageReference Include="IoTSharp.CoAP.NET" Version="2.0.8" />
<PackageReference Include="Jdenticon-net" Version="3.1.2" />
<PackageReference Include="Jdenticon.AspNetCore" Version="3.1.2" />
<PackageReference Include="LiteDB" Version="5.0.12" />
<PackageReference Include="LiteDB" Version="5.0.15" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.10" />
<PackageReference Include="Microsoft.AspNetCore.SpaProxy" Version="6.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.10">
......@@ -70,10 +70,10 @@
</PackageReference>
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />
<PackageReference Include="MimeMapping" Version="1.0.1.50" />
<PackageReference Include="MQTTnet" Version="4.1.3.436" />
<PackageReference Include="MQTTnet.AspNetCore" Version="4.1.3.436" />
<PackageReference Include="MQTTnet" Version="4.1.4.563" />
<PackageReference Include="MQTTnet.AspNetCore" Version="4.1.4.563" />
<PackageReference Include="MQTTnet.AspNetCore.Routing" Version="0.4.16" />
<PackageReference Include="NSwag.AspNetCore" Version="13.18.0" />
<PackageReference Include="NSwag.AspNetCore" Version="13.18.2" />
<PackageReference Include="Rin" Version="2.6.0" />
<PackageReference Include="Rin.Mvc" Version="2.6.0" />
<PackageReference Include="RulesEngine" Version="4.0.0" />
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或