diff --git a/.vs/IoTGateway/DesignTimeBuild/.dtbcache.v2 b/.vs/IoTGateway/DesignTimeBuild/.dtbcache.v2 index edd2167..c9ec5d7 100644 Binary files a/.vs/IoTGateway/DesignTimeBuild/.dtbcache.v2 and b/.vs/IoTGateway/DesignTimeBuild/.dtbcache.v2 differ diff --git a/.vs/IoTGateway/project-colors.json b/.vs/IoTGateway/project-colors.json index b476955..1d4e3a9 100644 --- a/.vs/IoTGateway/project-colors.json +++ b/.vs/IoTGateway/project-colors.json @@ -120,7 +120,12 @@ "ProjectGuid": "96d436b4-4703-4448-a879-b69ace89ca11", "DisplayName": "WalkingTec.Mvvm.Mvc", "ColorIndex": 6 + }, + "8e2d91dc-dee4-4843-8d09-6fc06651527e": { + "ProjectGuid": "8e2d91dc-dee4-4843-8d09-6fc06651527e", + "DisplayName": "DriverModbusMaster", + "ColorIndex": 7 } }, - "NextColorIndex": 7 + "NextColorIndex": 8 } \ No newline at end of file diff --git a/.vs/IoTGateway/v17/.futdcache.v1 b/.vs/IoTGateway/v17/.futdcache.v1 index 187a3e9..a44bc01 100644 Binary files a/.vs/IoTGateway/v17/.futdcache.v1 and b/.vs/IoTGateway/v17/.futdcache.v1 differ diff --git a/.vs/IoTGateway/v17/.suo b/.vs/IoTGateway/v17/.suo index a4a1ed6..42111b8 100644 Binary files a/.vs/IoTGateway/v17/.suo and b/.vs/IoTGateway/v17/.suo differ diff --git a/.vs/IoTGateway/v17/fileList.bin b/.vs/IoTGateway/v17/fileList.bin index 0438d97..4b52e0a 100644 Binary files a/.vs/IoTGateway/v17/fileList.bin and b/.vs/IoTGateway/v17/fileList.bin differ diff --git a/IoTGateway/IoTGateway.csproj.user b/IoTGateway/IoTGateway.csproj.user index 7a791b3..81b1159 100644 --- a/IoTGateway/IoTGateway.csproj.user +++ b/IoTGateway/IoTGateway.csproj.user @@ -2,7 +2,7 @@ IoTGateway - FolderProfile + D:\Repos\iotgateway\IoTGateway\Properties\PublishProfiles\FolderProfile.pubxml ProjectDebugger diff --git a/IoTGateway/Properties/PublishProfiles/FolderProfile.pubxml b/IoTGateway/Properties/PublishProfiles/FolderProfile.pubxml index 20ed980..1dbe62d 100644 --- a/IoTGateway/Properties/PublishProfiles/FolderProfile.pubxml +++ b/IoTGateway/Properties/PublishProfiles/FolderProfile.pubxml @@ -4,17 +4,16 @@ https://go.microsoft.com/fwlink/?LinkID=208121. --> - False + True False True Release Any CPU FileSystem - bin\Release\net5.0\publish\ + bin\Release\net6.0\publish\ FileSystem - net5.0 - win-x64 + net6.0 68abbdf2-1485-4756-9a94-6afa874d69a3 false diff --git a/IoTGateway/Properties/PublishProfiles/FolderProfile.pubxml.user b/IoTGateway/Properties/PublishProfiles/FolderProfile.pubxml.user index 95754c8..211a57d 100644 --- a/IoTGateway/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/IoTGateway/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -4,7 +4,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. --> - <_PublishTargetUrl>E:\workbench\iotgateway\IoTGateway\bin\Release\net5.0\publish\ - True|2021-12-24T11:18:19.0736393Z;True|2021-12-24T16:46:49.1192015+08:00;True|2021-12-24T16:23:28.9214784+08:00;True|2021-12-24T15:20:08.6401847+08:00;True|2021-12-17T19:11:07.1655146+08:00;True|2021-12-12T14:11:08.8380502+08:00; + <_PublishTargetUrl>D:\Repos\iotgateway\IoTGateway\bin\Release\net6.0\publish\ + True|2022-01-24T15:31:28.3620602Z;True|2022-01-24T23:30:03.8991942+08:00;True|2022-01-24T23:23:16.4288882+08:00;True|2021-12-24T19:18:19.0736393+08:00;True|2021-12-24T16:46:49.1192015+08:00;True|2021-12-24T16:23:28.9214784+08:00;True|2021-12-24T15:20:08.6401847+08:00;True|2021-12-17T19:11:07.1655146+08:00;True|2021-12-12T14:11:08.8380502+08:00; \ No newline at end of file diff --git a/IoTGateway/Views/Login/Login.cshtml b/IoTGateway/Views/Login/Login.cshtml index 0bc0062..d3501e4 100644 --- a/IoTGateway/Views/Login/Login.cshtml +++ b/IoTGateway/Views/Login/Login.cshtml @@ -46,12 +46,12 @@
  • - -
  • @*@Model.Localizer["Login.InputUserName"]*@ + +
  • - -
  • @*@Model.Localizer["Login.InputPassword"]*@ + +
  • diff --git a/Plugins/Drivers/DriverModbusMaster/NModbus4/Properties/AssemblyInfo.cs b/Plugins/Drivers/DriverModbusMaster/NModbus4/Properties/AssemblyInfo.cs deleted file mode 100644 index 628e55b..0000000 --- a/Plugins/Drivers/DriverModbusMaster/NModbus4/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System; -using System.Reflection; -using System.Resources; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("NModbus4")] -[assembly: AssemblyProduct("NModbus4")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyCopyright("Copyright © 2006 Scott Alexander, 2015 Dmitry Turin")] -[assembly: AssemblyDescription("NModbus4 is a C# implementation of the Modbus protocol. " + - "Provides connectivity to Modbus slave compatible devices and applications. " + - "Supports ASCII, RTU, TCP, and UDP protocols. " + - "NModbus4 it's a fork of NModbus(https://code.google.com/p/nmodbus)")] - -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: CLSCompliant(false)] -[assembly: NeutralResourcesLanguage("en-US")] -[assembly: ComVisible(false)] -[assembly: AssemblyVersion("3.0.0.0")] -[assembly: AssemblyFileVersion("3.0.0.0")] -[assembly: AssemblyInformationalVersion("3.0.0-dev")] - -#if !SIGNED -[assembly: InternalsVisibleTo("NModbus4.UnitTests")] -[assembly: InternalsVisibleTo("NModbus4.IntegrationTests")] -[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")] -#endif