修复部分图标不显示的问题

Avalonia/ShakerApp/Views/Setting/DataDirectoryView.axaml.cs

@@ -1,6 +1,7 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
+using Avalonia.Media;
 
 namespace ShakerApp.Views;
 
@@ -14,5 +15,5 @@ public partial class DataDirectoryView : UserControl,ISettingPageView
 
     public string DisplayName => "DataDirectory";
 
-    public string Icon { get; } = App.Current?.FindResource("DataDirectoryIcon") + "";
+    public StreamGeometry Icon { get; } = (StreamGeometry)App.Current?.FindResource("DataDirectoryIcon");
 }

Avalonia/ShakerApp/Views/Setting/ISettingPageView.cs

@@ -1,4 +1,5 @@
-using System;
+using Avalonia.Media;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -9,7 +10,7 @@ namespace ShakerApp.Views
     public interface ISettingPageView
     {
         public string DisplayName { get; }
-        public string Icon { get; }
+        public StreamGeometry Icon { get; }
     }
     public sealed class SettingPageAttribute:Attribute
     {

Avalonia/ShakerApp/Views/Setting/LanguageView.axaml.cs

@@ -1,6 +1,7 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
+using Avalonia.Media;
 
 namespace ShakerApp.Views;
 
@@ -14,5 +15,5 @@ public partial class LanguageView : UserControl,ISettingPageView
 
     public string DisplayName => "Language";
 
-    public string Icon { get; } = App.Current?.FindResource("LanguageIcon") + "";
+    public StreamGeometry Icon { get; } = (StreamGeometry)App.Current?.FindResource("LanguageIcon");
 }

Avalonia/ShakerApp/Views/Setting/NetworkSettingView.axaml.cs

@@ -1,6 +1,7 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
+using Avalonia.Media;
 using ShakerApp.Views;
 
 namespace ShakerApp;
@@ -15,6 +16,6 @@ public partial class NetworkSettingView : UserControl,ISettingPageView
 
     public string DisplayName => "Network";
 
-    public string Icon { get; } = App.Current?.FindResource("NetworkIcon")+"";
+    public StreamGeometry Icon { get; } = (StreamGeometry)App.Current?.FindResource("NetworkIcon");
 
 }

Communication/TcpEventBus/TcpEventBus.csproj

@@ -12,15 +12,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AsyncIO" Version="0.1.69" />
     <PackageReference Include="MessagePack" Version="3.1.3" />
-    <PackageReference Include="MessagePack.Annotations" Version="3.1.3" />
     <PackageReference Include="MessagePackAnalyzer" Version="3.1.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="NaCl.Net" Version="0.1.13" />
-    <PackageReference Include="System.ServiceModel.Primitives" Version="8.1.1" />
   </ItemGroup>
 
   <ItemGroup>

PLCConnect/ModBus/ModBus.csproj

@@ -1,12 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net480</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <LangVersion>10.0</LangVersion>
-  </PropertyGroup>
-
-  <Import Project="..\NModbus\NModbus.projitems" Label="Shared" />
-
-</Project>

PLCConnect/NModbus/Data/FileRecordCollection.cs

@@ -13,9 +13,13 @@ namespace NModbus.Data
 {
     public class FileRecordCollection : IModbusMessageDataCollection
     {
+#if NET5_0_OR_GREATER
         [AllowNull]
+#endif
         private IReadOnlyList<byte> networkBytes;
+#if NET5_0_OR_GREATER
         [AllowNull]
+#endif
         private IReadOnlyList<byte> dataBytes;
 
         public FileRecordCollection(ushort fileNumber, ushort startingAddress, byte[] data)

PLCConnect/NModbus/Message/ModbusMessageImpl.cs

@@ -42,7 +42,9 @@ namespace NModbus.Message
         public ushort? StartAddress { get; set; }
 
         public ushort? SubFunctionCode { get; set; }
+#if NET5_0_OR_GREATER
         [AllowNull]
+#endif
         public IModbusMessageDataCollection Data { get; set; }
 
         public byte[] MessageFrame

PLCConnect/NModbus/Message/ReadWriteMultipleRegistersRequest.cs

@@ -9,9 +9,13 @@ namespace NModbus.Message
 {
     public class ReadWriteMultipleRegistersRequest : AbstractModbusMessageWithData<RegisterCollection>, IModbusRequest
     {
+#if NET5_0_OR_GREATER
         [AllowNull]
+#endif
         private ReadHoldingInputRegistersRequest _readRequest;
+#if NET5_0_OR_GREATER
         [AllowNull]
+#endif
         private WriteMultipleRegistersRequest _writeRequest;
 
         public ReadWriteMultipleRegistersRequest()

PLCConnect/NModbus/SlaveException.cs

@@ -20,7 +20,9 @@ namespace NModbus
         private const string SlaveAddressPropertyName = "SlaveAdress";
         private const string FunctionCodePropertyName = "FunctionCode";
         private const string SlaveExceptionCodePropertyName = "SlaveExceptionCode";
+#if NET5_0_OR_GREATER
         [AllowNull]
+#endif
         private readonly SlaveExceptionResponse _slaveExceptionResponse;
 
         /// <summary>