合并

NewLifeX · Dec 18, 2023 · bf4df78 · bf4df78
2 parents 4a780df + da6117f
commit bf4df78
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/publish-beta.yml b/.github/workflows/publish-beta.yml
@@ -17,7 +17,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v2
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
     - name: Restore
       run: |
         dotnet restore NewLife.Schneider/NewLife.Schneider.csproj

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -15,7 +15,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v2
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
     - name: Restore
       run: |
         dotnet restore NewLife.Schneider/NewLife.Schneider.csproj

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -16,7 +16,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v2
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
     - name: Build
       run: dotnet build -c Release
 

diff --git a/NewLife.Schneider/Drivers/SchneiderDriver.cs b/NewLife.Schneider/Drivers/SchneiderDriver.cs
@@ -14,11 +14,11 @@ public class SchneiderDriver : ModbusTcpDriver, ILogFeature, ITracerFeature
 {
     /// <summary>建立连接，打开驱动</summary>
     /// <param name="device"></param>
-    /// <param name="parameters"></param>
+    /// <param name="parameter"></param>
     /// <returns></returns>
-    public override INode Open(IDevice device, IDriverParameter parameters)
+    public override INode Open(IDevice device, IDriverParameter parameter)
     {
-        var modbusNode = base.Open(device, parameters);
+        var modbusNode = base.Open(device, parameter);
         if (modbusNode is ModbusNode node && Modbus != null)
         {
             Modbus.Open();

diff --git a/NewLife.Schneider/NewLife.Schneider.csproj b/NewLife.Schneider/NewLife.Schneider.csproj
@@ -44,7 +44,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.IoT" Version="2.0.2023.1212-beta0413" />
+    <PackageReference Include="NewLife.IoT" Version="2.0.2023.1214-beta1134" />
     <PackageReference Include="NewLife.Modbus" Version="1.8.2023.1212-beta0414" />
   </ItemGroup>
 

diff --git a/Test/Test.csproj b/Test/Test.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>