From da6117fb952373d92b0cafa52d0e14e8599c4139 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=99=BA=E8=83=BD=E5=A4=A7=E7=9F=B3=E5=A4=B4?= Date: Mon, 18 Dec 2023 22:19:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7IoT=E6=9E=B6=E6=9E=84?= =?UTF-8?q?=E5=88=B0net8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/publish-beta.yml | 2 +- .github/workflows/publish.yml | 2 +- .github/workflows/test.yml | 2 +- NewLife.Schneider/Drivers/SchneiderDriver.cs | 6 +++--- NewLife.Schneider/NewLife.Schneider.csproj | 6 +++--- Test/Test.csproj | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/publish-beta.yml b/.github/workflows/publish-beta.yml index b96a35e..7d5bc4e 100644 --- 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 index c9b0745..2f2503d 100644 --- 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 index c1e31e2..284c05d 100644 --- 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 index 9dcdcb8..97d13a0 100644 --- a/NewLife.Schneider/Drivers/SchneiderDriver.cs +++ b/NewLife.Schneider/Drivers/SchneiderDriver.cs @@ -14,11 +14,11 @@ public class SchneiderDriver : ModbusTcpDriver, ILogFeature, ITracerFeature { /// 建立连接,打开驱动 /// - /// + /// /// - public override INode Open(IDevice device, IDictionary 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 index 27939ea..3f410da 100644 --- a/NewLife.Schneider/NewLife.Schneider.csproj +++ b/NewLife.Schneider/NewLife.Schneider.csproj @@ -37,15 +37,15 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/Test/Test.csproj b/Test/Test.csproj index e3f336f..b741c8b 100644 --- a/Test/Test.csproj +++ b/Test/Test.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable