Bladeren bron

提交代码。

Klosszhu 2 jaren geleden
bovenliggende
commit
1f6739818e
50 gewijzigde bestanden met toevoegingen van 1445 en 395 verwijderingen
  1. BIN
      .vs/Fine.OPCDaClient/DesignTimeBuild/.dtbcache.v2
  2. BIN
      .vs/Fine.OPCDaClient/FileContentIndex/67788687-7e26-4888-8c7a-866030c1025f.vsidx
  3. BIN
      .vs/Fine.OPCDaClient/FileContentIndex/8a3ce631-6eb2-45f4-ab75-88144e5f9eb8.vsidx
  4. BIN
      .vs/Fine.OPCDaClient/FileContentIndex/9614e886-18d7-49c0-9760-2e662c5b448b.vsidx
  5. 0 0
      .vs/Fine.OPCDaClient/FileContentIndex/read.lock
  6. BIN
      .vs/ProjectEvaluation/fine.opcdaclient.metadata.v2
  7. BIN
      .vs/ProjectEvaluation/fine.opcdaclient.metadata.v7.bin
  8. BIN
      .vs/ProjectEvaluation/fine.opcdaclient.projects.v7.bin
  9. 2 1
      Fine.OPCDaClient9000/App/AppHandle.cs
  10. 1 0
      Fine.OPCDaClient9000/Form1.cs
  11. 1 1
      Fine.OPCDaClient9000/bin/Debug/config/httpserver.json
  12. 1 1
      Fine.OPCDaClient9000/config/opcserverifix.json
  13. 0 1
      Fine.OPCDaClient9000/obj/Debug/Fine.OPCDaClient9000.csproj.FileListAbsolute.txt
  14. 1 1
      Libs/OpcComRcw/obj/OpcComRcw.csproj.nuget.dgspec.json
  15. 1 1
      Libs/OpcComRcw/obj/OpcComRcw.csproj.nuget.g.props
  16. 10 2
      Libs/OpcComRcw/obj/project.assets.json
  17. 3 3
      Libs/OpcNetApi.Com/obj/OpcNetApi.Com.csproj.nuget.dgspec.json
  18. 1 1
      Libs/OpcNetApi.Com/obj/OpcNetApi.Com.csproj.nuget.g.props
  19. 10 2
      Libs/OpcNetApi.Com/obj/project.assets.json
  20. 1 1
      Libs/OpcNetApi/obj/OpcNetApi.csproj.nuget.dgspec.json
  21. 1 1
      Libs/OpcNetApi/obj/OpcNetApi.csproj.nuget.g.props
  22. 10 2
      Libs/OpcNetApi/obj/project.assets.json
  23. 125 0
      OpcAndRestAPITest/obj/Debug/OpcAndRestAPITest.csproj.App.config
  24. 0 1
      OpcClientMqtt/obj/Debug/OpcClientMqtt.csproj.FileListAbsolute.txt
  25. 3 0
      OpcComRcw/obj/Debug/net20/OpcComRcw.GeneratedMSBuildEditorConfig.editorconfig
  26. 1 1
      OpcComRcw/obj/OpcComRcw.csproj.nuget.dgspec.json
  27. 1 1
      OpcComRcw/obj/OpcComRcw.csproj.nuget.g.props
  28. 10 2
      OpcComRcw/obj/project.assets.json
  29. 3 0
      OpcNetApi/obj/Debug/net20/OpcNetApi.GeneratedMSBuildEditorConfig.editorconfig
  30. 1 1
      OpcNetApi/obj/OpcNetApi.csproj.nuget.dgspec.json
  31. 1 1
      OpcNetApi/obj/OpcNetApi.csproj.nuget.g.props
  32. 10 2
      OpcNetApi/obj/project.assets.json
  33. 23 0
      YS.Smart.Admin/obj/Debug/net5.0/YS.Smart.Admin.AssemblyInfo.cs
  34. 11 0
      YS.Smart.Admin/obj/Debug/net5.0/YS.Smart.Admin.GeneratedMSBuildEditorConfig.editorconfig
  35. 20 0
      YS.Smart.Admin/obj/Debug/net5.0/YS.Smart.Admin.RazorAssemblyInfo.cs
  36. 3 2
      YS.Smart.Admin/obj/YS.Smart.Admin.csproj.nuget.dgspec.json
  37. 1 1
      YS.Smart.Admin/obj/YS.Smart.Admin.csproj.nuget.g.props
  38. 60 19
      YS.Smart.Admin/obj/project.assets.json
  39. 23 0
      YS.Smart.Ctl/obj/Debug/netcoreapp3.1/YS.Smart.Ctl.AssemblyInfo.cs
  40. 3 0
      YS.Smart.Ctl/obj/Debug/netcoreapp3.1/YS.Smart.Ctl.GeneratedMSBuildEditorConfig.editorconfig
  41. 17 0
      YS.Smart.Ctl/obj/Debug/netcoreapp3.1/YS.Smart.Ctl.RazorAssemblyInfo.cs
  42. 3 2
      YS.Smart.Ctl/obj/YS.Smart.Ctl.csproj.nuget.dgspec.json
  43. 1 1
      YS.Smart.Ctl/obj/YS.Smart.Ctl.csproj.nuget.g.props
  44. 507 168
      YS.Smart.Ctl/obj/project.assets.json
  45. 23 0
      YS.Start.AdminLine/obj/Debug/net5.0/YS.Start.AdminLine.AssemblyInfo.cs
  46. 11 0
      YS.Start.AdminLine/obj/Debug/net5.0/YS.Start.AdminLine.GeneratedMSBuildEditorConfig.editorconfig
  47. 20 0
      YS.Start.AdminLine/obj/Debug/net5.0/YS.Start.AdminLine.RazorAssemblyInfo.cs
  48. 4 3
      YS.Start.AdminLine/obj/YS.Start.AdminLine.csproj.nuget.dgspec.json
  49. 1 1
      YS.Start.AdminLine/obj/YS.Start.AdminLine.csproj.nuget.g.props
  50. 516 171
      YS.Start.AdminLine/obj/project.assets.json

BIN
.vs/Fine.OPCDaClient/DesignTimeBuild/.dtbcache.v2


BIN
.vs/Fine.OPCDaClient/FileContentIndex/67788687-7e26-4888-8c7a-866030c1025f.vsidx


BIN
.vs/Fine.OPCDaClient/FileContentIndex/8a3ce631-6eb2-45f4-ab75-88144e5f9eb8.vsidx


BIN
.vs/Fine.OPCDaClient/FileContentIndex/9614e886-18d7-49c0-9760-2e662c5b448b.vsidx


+ 0 - 0
.vs/Fine.OPCDaClient/FileContentIndex/read.lock


BIN
.vs/ProjectEvaluation/fine.opcdaclient.metadata.v2


BIN
.vs/ProjectEvaluation/fine.opcdaclient.metadata.v7.bin


BIN
.vs/ProjectEvaluation/fine.opcdaclient.projects.v7.bin


+ 2 - 1
Fine.OPCDaClient9000/App/AppHandle.cs

@@ -70,7 +70,8 @@ namespace Fine.OPCDaClient9000.App
                     Form1.TZ();
                     rlt = "ok";
                     break;
-
+                case "api/GetStatus":
+                    rlt=Form1.OutControlStatus==null?0:Form1.OutControlStatus; break;
                 #endregion
 
                 #region 公用方法

+ 1 - 0
Fine.OPCDaClient9000/Form1.cs

@@ -70,6 +70,7 @@ namespace Fine.OPCDaClient9000
             ChangeServerStatus(true);
             damgr.AddConfigGroup();
             Listerner = true;
+            OutControlStatus = 1;
         }
 
         public static void QD() {

+ 1 - 1
Fine.OPCDaClient9000/bin/Debug/config/httpserver.json

@@ -1,5 +1,5 @@
 {
   "Host": "+",
-  "Port": 9071,
+  "Port": 9061,
   "Service": "5K线API接口服务"
 }

+ 1 - 1
Fine.OPCDaClient9000/config/opcserverifix.json

@@ -1,5 +1,5 @@
 {
-  "ServerName": "Intellution.OPCiFIX",
+  "ServerName": "Knight.OPC.Server.Demo",
   "Group": {
     "UpdateRate": 300,
     "Deadband": 0,

+ 0 - 1
Fine.OPCDaClient9000/obj/Debug/Fine.OPCDaClient9000.csproj.FileListAbsolute.txt

@@ -289,7 +289,6 @@ E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient
 E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient9000\bin\Debug\System.Text.Encodings.Web.xml
 E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient9000\bin\Debug\Microsoft.Extensions.Options.ConfigurationExtensions.xml
 E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient9000\obj\Debug\Fine.OPCDaClient9000.csproj.AssemblyReference.cache
-E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient9000\obj\Debug\Fine.OPCDaClient9000.csproj.SuggestedBindingRedirects.cache
 E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient9000\obj\Debug\Fine.OPCDaClient9000.ConfigForm.resources
 E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient9000\obj\Debug\Fine.OPCDaClient9000.Form1.resources
 E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient9000\obj\Debug\Fine.OPCDaClient9000.TestForm.resources

+ 1 - 1
Libs/OpcComRcw/obj/OpcComRcw.csproj.nuget.dgspec.json

@@ -44,7 +44,7 @@
       "frameworks": {
         "net40": {
           "targetAlias": "net40",
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.301\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.401\\RuntimeIdentifierGraph.json"
         }
       }
     }

+ 1 - 1
Libs/OpcComRcw/obj/OpcComRcw.csproj.nuget.g.props

@@ -7,7 +7,7 @@
     <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">D:\ProgramData\NugetPackage</NuGetPackageRoot>
     <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">D:\ProgramData\NugetPackage;d:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
     <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
-    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.2.1</NuGetToolVersion>
+    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.7.0</NuGetToolVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
     <SourceRoot Include="D:\ProgramData\NugetPackage\" />

+ 10 - 2
Libs/OpcComRcw/obj/project.assets.json

@@ -51,8 +51,16 @@
     "frameworks": {
       "net40": {
         "targetAlias": "net40",
-        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.301\\RuntimeIdentifierGraph.json"
+        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.401\\RuntimeIdentifierGraph.json"
       }
     }
-  }
+  },
+  "logs": [
+    {
+      "code": "NU1803",
+      "level": "Warning",
+      "warningLevel": 1,
+      "message": "正在通过 “HTTP” 源“http://nuget.finedot.cn/nuget”运行“restore”操作。将来的版本中将删除非 HTTPS 访问权限。请考虑迁移到 “HTTPS” 源。"
+    }
+  ]
 }

+ 3 - 3
Libs/OpcNetApi.Com/obj/OpcNetApi.Com.csproj.nuget.dgspec.json

@@ -44,7 +44,7 @@
       "frameworks": {
         "net40": {
           "targetAlias": "net40",
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.301\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.401\\RuntimeIdentifierGraph.json"
         }
       }
     },
@@ -95,7 +95,7 @@
       "frameworks": {
         "net40": {
           "targetAlias": "net40",
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.301\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.401\\RuntimeIdentifierGraph.json"
         }
       }
     },
@@ -139,7 +139,7 @@
       "frameworks": {
         "net40": {
           "targetAlias": "net40",
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.301\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.401\\RuntimeIdentifierGraph.json"
         }
       }
     }

+ 1 - 1
Libs/OpcNetApi.Com/obj/OpcNetApi.Com.csproj.nuget.g.props

@@ -7,7 +7,7 @@
     <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">D:\ProgramData\NugetPackage</NuGetPackageRoot>
     <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">D:\ProgramData\NugetPackage;d:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
     <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
-    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.2.1</NuGetToolVersion>
+    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.7.0</NuGetToolVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
     <SourceRoot Include="D:\ProgramData\NugetPackage\" />

+ 10 - 2
Libs/OpcNetApi.Com/obj/project.assets.json

@@ -93,8 +93,16 @@
     "frameworks": {
       "net40": {
         "targetAlias": "net40",
-        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.301\\RuntimeIdentifierGraph.json"
+        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.401\\RuntimeIdentifierGraph.json"
       }
     }
-  }
+  },
+  "logs": [
+    {
+      "code": "NU1803",
+      "level": "Warning",
+      "warningLevel": 1,
+      "message": "正在通过 “HTTP” 源“http://nuget.finedot.cn/nuget”运行“restore”操作。将来的版本中将删除非 HTTPS 访问权限。请考虑迁移到 “HTTPS” 源。"
+    }
+  ]
 }

+ 1 - 1
Libs/OpcNetApi/obj/OpcNetApi.csproj.nuget.dgspec.json

@@ -44,7 +44,7 @@
       "frameworks": {
         "net40": {
           "targetAlias": "net40",
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.301\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.401\\RuntimeIdentifierGraph.json"
         }
       }
     }

+ 1 - 1
Libs/OpcNetApi/obj/OpcNetApi.csproj.nuget.g.props

@@ -7,7 +7,7 @@
     <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">D:\ProgramData\NugetPackage</NuGetPackageRoot>
     <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">D:\ProgramData\NugetPackage;d:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
     <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
-    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.2.1</NuGetToolVersion>
+    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.7.0</NuGetToolVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
     <SourceRoot Include="D:\ProgramData\NugetPackage\" />

+ 10 - 2
Libs/OpcNetApi/obj/project.assets.json

@@ -51,8 +51,16 @@
     "frameworks": {
       "net40": {
         "targetAlias": "net40",
-        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.301\\RuntimeIdentifierGraph.json"
+        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.401\\RuntimeIdentifierGraph.json"
       }
     }
-  }
+  },
+  "logs": [
+    {
+      "code": "NU1803",
+      "level": "Warning",
+      "warningLevel": 1,
+      "message": "正在通过 “HTTP” 源“http://nuget.finedot.cn/nuget”运行“restore”操作。将来的版本中将删除非 HTTPS 访问权限。请考虑迁移到 “HTTPS” 源。"
+    }
+  ]
 }

+ 125 - 0
OpcAndRestAPITest/obj/Debug/OpcAndRestAPITest.csproj.App.config

@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <appSettings>
+    <add key="httpurl" value="http://localhost:9001/api/" />
+  </appSettings>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
+  </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Net.Http.Extensions" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.2.29.0" newVersion="2.2.29.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Net.Http.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.29.0" newVersion="4.2.29.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.9.0.0" newVersion="1.9.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Primitives" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.FileProviders.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Options" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IO.Pipelines" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.3" newVersion="6.0.0.3" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Configuration.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Security.Cryptography.Cng" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.3.1.1" newVersion="4.3.1.1" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Configuration" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Configuration.Binder" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.AspNetCore.Server.Kestrel.Core" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.1.25.0" newVersion="2.1.25.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.DependencyInjection" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Logging" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Hosting.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Configuration.EnvironmentVariables" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Configuration.FileExtensions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.AspNetCore.Http" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.1.22.0" newVersion="2.1.22.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.FileProviders.Physical" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>

+ 0 - 1
OpcClientMqtt/obj/Debug/OpcClientMqtt.csproj.FileListAbsolute.txt

@@ -734,7 +734,6 @@ E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\OpcClientMqtt\bi
 E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\OpcClientMqtt\bin\Debug\System.ValueTuple.xml
 E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\OpcClientMqtt\obj\Debug\OpcClientMqtt.csproj.App.config
 E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\OpcClientMqtt\obj\Debug\OpcClientMqtt.csproj.AssemblyReference.cache
-E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\OpcClientMqtt\obj\Debug\OpcClientMqtt.csproj.SuggestedBindingRedirects.cache
 E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\OpcClientMqtt\obj\Debug\OpcClientMqtt.csproj.CoreCompileInputs.cache
 E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\OpcClientMqtt\obj\Debug\OpcClientMqtt.csproj.CopyComplete
 E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\OpcClientMqtt\obj\Debug\OpcClientMqtt.exe

+ 3 - 0
OpcComRcw/obj/Debug/net20/OpcComRcw.GeneratedMSBuildEditorConfig.editorconfig

@@ -0,0 +1,3 @@
+is_global = true
+build_property.RootNamespace = OpcComRcw
+build_property.ProjectDir = E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\OpcComRcw\

+ 1 - 1
OpcComRcw/obj/OpcComRcw.csproj.nuget.dgspec.json

@@ -44,7 +44,7 @@
       "frameworks": {
         "net20": {
           "targetAlias": "net20",
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.301\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.401\\RuntimeIdentifierGraph.json"
         }
       }
     }

+ 1 - 1
OpcComRcw/obj/OpcComRcw.csproj.nuget.g.props

@@ -7,7 +7,7 @@
     <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">D:\ProgramData\NugetPackage</NuGetPackageRoot>
     <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">D:\ProgramData\NugetPackage;d:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
     <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
-    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.2.1</NuGetToolVersion>
+    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.7.0</NuGetToolVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
     <SourceRoot Include="D:\ProgramData\NugetPackage\" />

+ 10 - 2
OpcComRcw/obj/project.assets.json

@@ -51,8 +51,16 @@
     "frameworks": {
       "net20": {
         "targetAlias": "net20",
-        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.301\\RuntimeIdentifierGraph.json"
+        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.401\\RuntimeIdentifierGraph.json"
       }
     }
-  }
+  },
+  "logs": [
+    {
+      "code": "NU1803",
+      "level": "Warning",
+      "warningLevel": 1,
+      "message": "正在通过 “HTTP” 源“http://nuget.finedot.cn/nuget”运行“restore”操作。将来的版本中将删除非 HTTPS 访问权限。请考虑迁移到 “HTTPS” 源。"
+    }
+  ]
 }

+ 3 - 0
OpcNetApi/obj/Debug/net20/OpcNetApi.GeneratedMSBuildEditorConfig.editorconfig

@@ -0,0 +1,3 @@
+is_global = true
+build_property.RootNamespace = 
+build_property.ProjectDir = E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\OpcNetApi\

+ 1 - 1
OpcNetApi/obj/OpcNetApi.csproj.nuget.dgspec.json

@@ -44,7 +44,7 @@
       "frameworks": {
         "net20": {
           "targetAlias": "net20",
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.301\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.401\\RuntimeIdentifierGraph.json"
         }
       }
     }

+ 1 - 1
OpcNetApi/obj/OpcNetApi.csproj.nuget.g.props

@@ -7,7 +7,7 @@
     <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">D:\ProgramData\NugetPackage</NuGetPackageRoot>
     <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">D:\ProgramData\NugetPackage;d:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
     <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
-    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.2.1</NuGetToolVersion>
+    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.7.0</NuGetToolVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
     <SourceRoot Include="D:\ProgramData\NugetPackage\" />

+ 10 - 2
OpcNetApi/obj/project.assets.json

@@ -51,8 +51,16 @@
     "frameworks": {
       "net20": {
         "targetAlias": "net20",
-        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.301\\RuntimeIdentifierGraph.json"
+        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.401\\RuntimeIdentifierGraph.json"
       }
     }
-  }
+  },
+  "logs": [
+    {
+      "code": "NU1803",
+      "level": "Warning",
+      "warningLevel": 1,
+      "message": "正在通过 “HTTP” 源“http://nuget.finedot.cn/nuget”运行“restore”操作。将来的版本中将删除非 HTTPS 访问权限。请考虑迁移到 “HTTPS” 源。"
+    }
+  ]
 }

+ 23 - 0
YS.Smart.Admin/obj/Debug/net5.0/YS.Smart.Admin.AssemblyInfo.cs

@@ -0,0 +1,23 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码由工具生成。
+//     运行时版本:4.0.30319.42000
+//
+//     对此文件的更改可能会导致不正确的行为,并且如果
+//     重新生成代码,这些更改将会丢失。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Reflection;
+
+[assembly: System.Reflection.AssemblyCompanyAttribute("YS.Smart.Admin")]
+[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
+[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
+[assembly: System.Reflection.AssemblyProductAttribute("YS.Smart.Admin")]
+[assembly: System.Reflection.AssemblyTitleAttribute("YS.Smart.Admin")]
+[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
+
+// 由 MSBuild WriteCodeFragment 类生成。
+

+ 11 - 0
YS.Smart.Admin/obj/Debug/net5.0/YS.Smart.Admin.GeneratedMSBuildEditorConfig.editorconfig

@@ -0,0 +1,11 @@
+is_global = true
+build_property.TargetFramework = net5.0
+build_property.TargetPlatformMinVersion = 
+build_property.UsingMicrosoftNETSdkWeb = true
+build_property.ProjectTypeGuids = 
+build_property.InvariantGlobalization = 
+build_property.PlatformNeutralAssembly = 
+build_property.EnforceExtendedAnalyzerRules = 
+build_property._SupportedPlatformList = Linux,macOS,Windows
+build_property.RootNamespace = YS.Smart.Admin
+build_property.ProjectDir = E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\YS.Smart.Admin\

+ 20 - 0
YS.Smart.Admin/obj/Debug/net5.0/YS.Smart.Admin.RazorAssemblyInfo.cs

@@ -0,0 +1,20 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码由工具生成。
+//     运行时版本:4.0.30319.42000
+//
+//     对此文件的更改可能会导致不正确的行为,并且如果
+//     重新生成代码,这些更改将会丢失。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Reflection;
+
+[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.RelatedAssemblyAttribute("YS.Smart.Admin.Views")]
+[assembly: Microsoft.AspNetCore.Razor.Hosting.RazorLanguageVersionAttribute("5.0")]
+[assembly: Microsoft.AspNetCore.Razor.Hosting.RazorConfigurationNameAttribute("MVC-3.0")]
+[assembly: Microsoft.AspNetCore.Razor.Hosting.RazorExtensionAssemblyNameAttribute("MVC-3.0", "Microsoft.AspNetCore.Mvc.Razor.Extensions")]
+
+// 由 MSBuild WriteCodeFragment 类生成。
+

+ 3 - 2
YS.Smart.Admin/obj/YS.Smart.Admin.csproj.nuget.dgspec.json

@@ -122,7 +122,8 @@
             "net47",
             "net471",
             "net472",
-            "net48"
+            "net48",
+            "net481"
           ],
           "assetTargetFallback": true,
           "warn": true,
@@ -134,7 +135,7 @@
               "privateAssets": "all"
             }
           },
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.301\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.401\\RuntimeIdentifierGraph.json"
         }
       }
     }

+ 1 - 1
YS.Smart.Admin/obj/YS.Smart.Admin.csproj.nuget.g.props

@@ -7,7 +7,7 @@
     <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">D:\ProgramData\NugetPackage</NuGetPackageRoot>
     <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">D:\ProgramData\NugetPackage;d:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
     <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
-    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.2.1</NuGetToolVersion>
+    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.7.0</NuGetToolVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
     <SourceRoot Include="D:\ProgramData\NugetPackage\" />

+ 60 - 19
YS.Smart.Admin/obj/project.assets.json

@@ -23,10 +23,14 @@
           "Microsoft.Extensions.DependencyModel": "5.0.0"
         },
         "compile": {
-          "lib/net5.0/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.dll": {}
+          "lib/net5.0/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.dll": {
+            "related": ".xml"
+          }
         },
         "runtime": {
-          "lib/net5.0/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.dll": {}
+          "lib/net5.0/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.dll": {
+            "related": ".xml"
+          }
         },
         "frameworkReferences": [
           "Microsoft.AspNetCore.App"
@@ -62,10 +66,14 @@
           "System.Threading.Tasks.Extensions": "4.5.3"
         },
         "compile": {
-          "lib/netcoreapp3.1/Microsoft.CodeAnalysis.dll": {}
+          "lib/netcoreapp3.1/Microsoft.CodeAnalysis.dll": {
+            "related": ".pdb;.xml"
+          }
         },
         "runtime": {
-          "lib/netcoreapp3.1/Microsoft.CodeAnalysis.dll": {}
+          "lib/netcoreapp3.1/Microsoft.CodeAnalysis.dll": {
+            "related": ".pdb;.xml"
+          }
         },
         "resource": {
           "lib/netcoreapp3.1/cs/Microsoft.CodeAnalysis.resources.dll": {
@@ -115,10 +123,14 @@
           "Microsoft.CodeAnalysis.Common": "[3.7.0]"
         },
         "compile": {
-          "lib/netcoreapp3.1/Microsoft.CodeAnalysis.CSharp.dll": {}
+          "lib/netcoreapp3.1/Microsoft.CodeAnalysis.CSharp.dll": {
+            "related": ".pdb;.xml"
+          }
         },
         "runtime": {
-          "lib/netcoreapp3.1/Microsoft.CodeAnalysis.CSharp.dll": {}
+          "lib/netcoreapp3.1/Microsoft.CodeAnalysis.CSharp.dll": {
+            "related": ".pdb;.xml"
+          }
         },
         "resource": {
           "lib/netcoreapp3.1/cs/Microsoft.CodeAnalysis.CSharp.resources.dll": {
@@ -179,10 +191,14 @@
       "Microsoft.Extensions.DependencyModel/5.0.0": {
         "type": "package",
         "compile": {
-          "lib/netstandard2.0/Microsoft.Extensions.DependencyModel.dll": {}
+          "lib/netstandard2.0/Microsoft.Extensions.DependencyModel.dll": {
+            "related": ".xml"
+          }
         },
         "runtime": {
-          "lib/netstandard2.0/Microsoft.Extensions.DependencyModel.dll": {}
+          "lib/netstandard2.0/Microsoft.Extensions.DependencyModel.dll": {
+            "related": ".xml"
+          }
         }
       },
       "Microsoft.NETCore.Platforms/2.1.2": {
@@ -197,19 +213,27 @@
       "Newtonsoft.Json/13.0.3": {
         "type": "package",
         "compile": {
-          "lib/netstandard2.0/Newtonsoft.Json.dll": {}
+          "lib/netstandard2.0/Newtonsoft.Json.dll": {
+            "related": ".xml"
+          }
         },
         "runtime": {
-          "lib/netstandard2.0/Newtonsoft.Json.dll": {}
+          "lib/netstandard2.0/Newtonsoft.Json.dll": {
+            "related": ".xml"
+          }
         }
       },
       "System.Collections.Immutable/1.5.0": {
         "type": "package",
         "compile": {
-          "lib/netstandard2.0/System.Collections.Immutable.dll": {}
+          "lib/netstandard2.0/System.Collections.Immutable.dll": {
+            "related": ".xml"
+          }
         },
         "runtime": {
-          "lib/netstandard2.0/System.Collections.Immutable.dll": {}
+          "lib/netstandard2.0/System.Collections.Immutable.dll": {
+            "related": ".xml"
+          }
         }
       },
       "System.Memory/4.5.4": {
@@ -224,19 +248,27 @@
       "System.Reflection.Metadata/1.6.0": {
         "type": "package",
         "compile": {
-          "lib/netstandard2.0/System.Reflection.Metadata.dll": {}
+          "lib/netstandard2.0/System.Reflection.Metadata.dll": {
+            "related": ".xml"
+          }
         },
         "runtime": {
-          "lib/netstandard2.0/System.Reflection.Metadata.dll": {}
+          "lib/netstandard2.0/System.Reflection.Metadata.dll": {
+            "related": ".xml"
+          }
         }
       },
       "System.Runtime.CompilerServices.Unsafe/4.7.0": {
         "type": "package",
         "compile": {
-          "ref/netstandard2.0/System.Runtime.CompilerServices.Unsafe.dll": {}
+          "ref/netstandard2.0/System.Runtime.CompilerServices.Unsafe.dll": {
+            "related": ".xml"
+          }
         },
         "runtime": {
-          "lib/netcoreapp2.0/System.Runtime.CompilerServices.Unsafe.dll": {}
+          "lib/netcoreapp2.0/System.Runtime.CompilerServices.Unsafe.dll": {
+            "related": ".xml"
+          }
         }
       },
       "System.Text.Encoding.CodePages/4.5.1": {
@@ -881,7 +913,8 @@
           "net47",
           "net471",
           "net472",
-          "net48"
+          "net48",
+          "net481"
         ],
         "assetTargetFallback": true,
         "warn": true,
@@ -893,8 +926,16 @@
             "privateAssets": "all"
           }
         },
-        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.301\\RuntimeIdentifierGraph.json"
+        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.401\\RuntimeIdentifierGraph.json"
       }
     }
-  }
+  },
+  "logs": [
+    {
+      "code": "NU1803",
+      "level": "Warning",
+      "warningLevel": 1,
+      "message": "正在通过 “HTTP” 源“http://nuget.finedot.cn/nuget”运行“restore”操作。将来的版本中将删除非 HTTPS 访问权限。请考虑迁移到 “HTTPS” 源。"
+    }
+  ]
 }

+ 23 - 0
YS.Smart.Ctl/obj/Debug/netcoreapp3.1/YS.Smart.Ctl.AssemblyInfo.cs

@@ -0,0 +1,23 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码由工具生成。
+//     运行时版本:4.0.30319.42000
+//
+//     对此文件的更改可能会导致不正确的行为,并且如果
+//     重新生成代码,这些更改将会丢失。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Reflection;
+
+[assembly: System.Reflection.AssemblyCompanyAttribute("YS.Smart.Ctl")]
+[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
+[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
+[assembly: System.Reflection.AssemblyProductAttribute("YS.Smart.Ctl")]
+[assembly: System.Reflection.AssemblyTitleAttribute("YS.Smart.Ctl")]
+[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
+
+// 由 MSBuild WriteCodeFragment 类生成。
+

+ 3 - 0
YS.Smart.Ctl/obj/Debug/netcoreapp3.1/YS.Smart.Ctl.GeneratedMSBuildEditorConfig.editorconfig

@@ -0,0 +1,3 @@
+is_global = true
+build_property.RootNamespace = YS.Smart.Ctl
+build_property.ProjectDir = E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\YS.Smart.Ctl\

+ 17 - 0
YS.Smart.Ctl/obj/Debug/netcoreapp3.1/YS.Smart.Ctl.RazorAssemblyInfo.cs

@@ -0,0 +1,17 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码由工具生成。
+//     运行时版本:4.0.30319.42000
+//
+//     对此文件的更改可能会导致不正确的行为,并且如果
+//     重新生成代码,这些更改将会丢失。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Reflection;
+
+[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.RelatedAssemblyAttribute("YS.Smart.Ctl.Views")]
+
+// 由 MSBuild WriteCodeFragment 类生成。
+

+ 3 - 2
YS.Smart.Ctl/obj/YS.Smart.Ctl.csproj.nuget.dgspec.json

@@ -74,7 +74,8 @@
             "net47",
             "net471",
             "net472",
-            "net48"
+            "net48",
+            "net481"
           ],
           "assetTargetFallback": true,
           "warn": true,
@@ -86,7 +87,7 @@
               "privateAssets": "all"
             }
           },
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.301\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.401\\RuntimeIdentifierGraph.json"
         }
       }
     }

+ 1 - 1
YS.Smart.Ctl/obj/YS.Smart.Ctl.csproj.nuget.g.props

@@ -7,7 +7,7 @@
     <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">D:\ProgramData\NugetPackage</NuGetPackageRoot>
     <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">D:\ProgramData\NugetPackage;d:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
     <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
-    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.2.1</NuGetToolVersion>
+    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.7.0</NuGetToolVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
     <SourceRoot Include="D:\ProgramData\NugetPackage\" />

File diff suppressed because it is too large
+ 507 - 168
YS.Smart.Ctl/obj/project.assets.json


+ 23 - 0
YS.Start.AdminLine/obj/Debug/net5.0/YS.Start.AdminLine.AssemblyInfo.cs

@@ -0,0 +1,23 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码由工具生成。
+//     运行时版本:4.0.30319.42000
+//
+//     对此文件的更改可能会导致不正确的行为,并且如果
+//     重新生成代码,这些更改将会丢失。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Reflection;
+
+[assembly: System.Reflection.AssemblyCompanyAttribute("YS.Start.AdminLine")]
+[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
+[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
+[assembly: System.Reflection.AssemblyProductAttribute("YS.Start.AdminLine")]
+[assembly: System.Reflection.AssemblyTitleAttribute("YS.Start.AdminLine")]
+[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
+
+// 由 MSBuild WriteCodeFragment 类生成。
+

+ 11 - 0
YS.Start.AdminLine/obj/Debug/net5.0/YS.Start.AdminLine.GeneratedMSBuildEditorConfig.editorconfig

@@ -0,0 +1,11 @@
+is_global = true
+build_property.TargetFramework = net5.0
+build_property.TargetPlatformMinVersion = 
+build_property.UsingMicrosoftNETSdkWeb = true
+build_property.ProjectTypeGuids = 
+build_property.InvariantGlobalization = 
+build_property.PlatformNeutralAssembly = 
+build_property.EnforceExtendedAnalyzerRules = 
+build_property._SupportedPlatformList = Linux,macOS,Windows
+build_property.RootNamespace = YS.Start.AdminLine
+build_property.ProjectDir = E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\YS.Start.AdminLine\

+ 20 - 0
YS.Start.AdminLine/obj/Debug/net5.0/YS.Start.AdminLine.RazorAssemblyInfo.cs

@@ -0,0 +1,20 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码由工具生成。
+//     运行时版本:4.0.30319.42000
+//
+//     对此文件的更改可能会导致不正确的行为,并且如果
+//     重新生成代码,这些更改将会丢失。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Reflection;
+
+[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.RelatedAssemblyAttribute("YS.Start.AdminLine.Views")]
+[assembly: Microsoft.AspNetCore.Razor.Hosting.RazorLanguageVersionAttribute("5.0")]
+[assembly: Microsoft.AspNetCore.Razor.Hosting.RazorConfigurationNameAttribute("MVC-3.0")]
+[assembly: Microsoft.AspNetCore.Razor.Hosting.RazorExtensionAssemblyNameAttribute("MVC-3.0", "Microsoft.AspNetCore.Mvc.Razor.Extensions")]
+
+// 由 MSBuild WriteCodeFragment 类生成。
+

+ 4 - 3
YS.Start.AdminLine/obj/YS.Start.AdminLine.csproj.nuget.dgspec.json

@@ -59,7 +59,7 @@
       "frameworks": {
         "net20": {
           "targetAlias": "net20",
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.301\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.401\\RuntimeIdentifierGraph.json"
         }
       }
     },
@@ -156,7 +156,8 @@
             "net47",
             "net471",
             "net472",
-            "net48"
+            "net48",
+            "net481"
           ],
           "assetTargetFallback": true,
           "warn": true,
@@ -168,7 +169,7 @@
               "privateAssets": "all"
             }
           },
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.301\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.401\\RuntimeIdentifierGraph.json"
         }
       }
     }

+ 1 - 1
YS.Start.AdminLine/obj/YS.Start.AdminLine.csproj.nuget.g.props

@@ -7,7 +7,7 @@
     <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">D:\ProgramData\NugetPackage</NuGetPackageRoot>
     <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">D:\ProgramData\NugetPackage;d:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
     <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
-    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.2.1</NuGetToolVersion>
+    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.7.0</NuGetToolVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
     <SourceRoot Include="D:\ProgramData\NugetPackage\" />

File diff suppressed because it is too large
+ 516 - 171
YS.Start.AdminLine/obj/project.assets.json