From fe1be7b313e23f031713628206b3cc57da26c4e1 Mon Sep 17 00:00:00 2001 From: iioter <535915157@qq.com> Date: Wed, 12 Oct 2022 14:35:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=BE=9D=E8=B5=96=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IoTGateway.DataAccess.csproj | 2 +- .../Migrations/DataContextModelSnapshot.cs | 5 +++- IoTGateway/IoTGateway.csproj | 12 ++++---- .../DriverAllenBradley.csproj | 2 +- .../DriverFanucHsl/DriverFanucHsl.csproj | 2 +- .../DriverMitsubishi/DriverMitsubishi.csproj | 2 +- .../DriverOmronFins/DriverOmronFins.csproj | 2 +- Plugins/Plugin/Plugin.csproj | 4 +-- .../PluginInterface/PluginInterface.csproj | 2 +- .../WalkingTec.Mvvm.Core.csproj | 28 +++++++++---------- .../WalkingTec.Mvvm.Mvc.csproj | 10 +++---- 11 files changed, 37 insertions(+), 34 deletions(-) diff --git a/IoTGateway.DataAccess/IoTGateway.DataAccess.csproj b/IoTGateway.DataAccess/IoTGateway.DataAccess.csproj index c590dd0..92804af 100644 --- a/IoTGateway.DataAccess/IoTGateway.DataAccess.csproj +++ b/IoTGateway.DataAccess/IoTGateway.DataAccess.csproj @@ -6,7 +6,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/IoTGateway.DataAccess/Migrations/DataContextModelSnapshot.cs b/IoTGateway.DataAccess/Migrations/DataContextModelSnapshot.cs index d98b429..a29e1d4 100644 --- a/IoTGateway.DataAccess/Migrations/DataContextModelSnapshot.cs +++ b/IoTGateway.DataAccess/Migrations/DataContextModelSnapshot.cs @@ -15,7 +15,7 @@ namespace IoTGateway.DataAccess.Migrations protected override void BuildModel(ModelBuilder modelBuilder) { #pragma warning disable 612, 618 - modelBuilder.HasAnnotation("ProductVersion", "6.0.0"); + modelBuilder.HasAnnotation("ProductVersion", "6.0.10"); modelBuilder.Entity("IoTGateway.Model.Device", b => { @@ -29,6 +29,9 @@ namespace IoTGateway.DataAccess.Migrations b.Property("CgUpload") .HasColumnType("INTEGER"); + b.Property("CmdPeriod") + .HasColumnType("INTEGER"); + b.Property("CreateBy") .HasColumnType("TEXT"); diff --git a/IoTGateway/IoTGateway.csproj b/IoTGateway/IoTGateway.csproj index 06bedf0..4986f36 100644 --- a/IoTGateway/IoTGateway.csproj +++ b/IoTGateway/IoTGateway.csproj @@ -18,12 +18,12 @@ - - - - - - + + + + + + diff --git a/Plugins/Drivers/DriverAllenBradley/DriverAllenBradley.csproj b/Plugins/Drivers/DriverAllenBradley/DriverAllenBradley.csproj index ad3f5ce..64e948b 100644 --- a/Plugins/Drivers/DriverAllenBradley/DriverAllenBradley.csproj +++ b/Plugins/Drivers/DriverAllenBradley/DriverAllenBradley.csproj @@ -9,7 +9,7 @@ - + diff --git a/Plugins/Drivers/DriverFanucHsl/DriverFanucHsl.csproj b/Plugins/Drivers/DriverFanucHsl/DriverFanucHsl.csproj index b895a3a..d64d3e5 100644 --- a/Plugins/Drivers/DriverFanucHsl/DriverFanucHsl.csproj +++ b/Plugins/Drivers/DriverFanucHsl/DriverFanucHsl.csproj @@ -9,7 +9,7 @@ - + diff --git a/Plugins/Drivers/DriverMitsubishi/DriverMitsubishi.csproj b/Plugins/Drivers/DriverMitsubishi/DriverMitsubishi.csproj index ea4f1e9..ce5bba7 100644 --- a/Plugins/Drivers/DriverMitsubishi/DriverMitsubishi.csproj +++ b/Plugins/Drivers/DriverMitsubishi/DriverMitsubishi.csproj @@ -9,7 +9,7 @@ - + diff --git a/Plugins/Drivers/DriverOmronFins/DriverOmronFins.csproj b/Plugins/Drivers/DriverOmronFins/DriverOmronFins.csproj index ea4f1e9..ce5bba7 100644 --- a/Plugins/Drivers/DriverOmronFins/DriverOmronFins.csproj +++ b/Plugins/Drivers/DriverOmronFins/DriverOmronFins.csproj @@ -9,7 +9,7 @@ - + diff --git a/Plugins/Plugin/Plugin.csproj b/Plugins/Plugin/Plugin.csproj index 2e23a46..9f1bcd3 100644 --- a/Plugins/Plugin/Plugin.csproj +++ b/Plugins/Plugin/Plugin.csproj @@ -9,9 +9,9 @@ - + - + diff --git a/Plugins/PluginInterface/PluginInterface.csproj b/Plugins/PluginInterface/PluginInterface.csproj index c042b3a..dc1f66a 100644 --- a/Plugins/PluginInterface/PluginInterface.csproj +++ b/Plugins/PluginInterface/PluginInterface.csproj @@ -8,7 +8,7 @@ - + diff --git a/WalkingTec.Mvvm/WalkingTec.Mvvm.Core/WalkingTec.Mvvm.Core.csproj b/WalkingTec.Mvvm/WalkingTec.Mvvm.Core/WalkingTec.Mvvm.Core.csproj index 77c62b3..076eb49 100644 --- a/WalkingTec.Mvvm/WalkingTec.Mvvm.Core/WalkingTec.Mvvm.Core.csproj +++ b/WalkingTec.Mvvm/WalkingTec.Mvvm.Core/WalkingTec.Mvvm.Core.csproj @@ -10,35 +10,35 @@ - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - + + + + + all runtime; build; native; contentfiles; analyzers - + - + - - - - + + + + - + diff --git a/WalkingTec.Mvvm/WalkingTec.Mvvm.Mvc/WalkingTec.Mvvm.Mvc.csproj b/WalkingTec.Mvvm/WalkingTec.Mvvm.Mvc/WalkingTec.Mvvm.Mvc.csproj index 03691ff..eff6ec3 100644 --- a/WalkingTec.Mvvm/WalkingTec.Mvvm.Mvc/WalkingTec.Mvvm.Mvc.csproj +++ b/WalkingTec.Mvvm/WalkingTec.Mvvm.Mvc/WalkingTec.Mvvm.Mvc.csproj @@ -58,12 +58,12 @@ - - - - + + + + - +