From 6c9deba793354fcee29055ee983f20320b0e4297 Mon Sep 17 00:00:00 2001 From: "liulb@mesnac.com" Date: Tue, 26 Mar 2024 18:43:59 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=A8=E4=BD=93?= =?UTF-8?q?=E3=80=81=E6=B3=A1=E5=89=8D=E5=BA=93=20=E5=8D=A1=E9=A1=BF?= =?UTF-8?q?=E3=80=81=E5=9B=BE=E8=A1=A8=E6=98=BE=E7=A4=BA=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=EF=BC=8C=E6=9C=89=E9=97=AE=E9=A2=98=E7=9A=84?= =?UTF-8?q?=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin.Core.Api.csproj.nuget.dgspec.json | 803 +++++++----------- .../obj/Admin.Core.Api.csproj.nuget.g.props | 14 +- .../net6.0/Admin.Core.Api.AssemblyInfo.cs | 2 +- .../Admin.Core.Api.AssemblyInfoInputs.cache | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 4 +- .../Debug/net6.0/Admin.Core.Api.assets.cache | Bin 144998 -> 143057 bytes Admin.Core.Api/obj/project.assets.json | 51 +- Admin.Core.Api/obj/project.nuget.cache | 458 +++++----- .../net6.0/Admin.Core.Common.AssemblyInfo.cs | 2 +- ...Admin.Core.Common.AssemblyInfoInputs.cache | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../Admin.Core.EventBus.AssemblyInfo.cs | 2 +- ...min.Core.EventBus.AssemblyInfoInputs.cache | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../Admin.Core.Extensions.AssemblyInfo.cs | 2 +- ...n.Core.Extensions.AssemblyInfoInputs.cache | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../Admin.Core.IRepository.AssemblyInfo.cs | 2 +- ....Core.IRepository.AssemblyInfoInputs.cache | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../Admin.Core.IService.AssemblyInfo.cs | 2 +- ...min.Core.IService.AssemblyInfoInputs.cache | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../net6.0/Admin.Core.Model.AssemblyInfo.cs | 2 +- .../Admin.Core.Model.AssemblyInfoInputs.cache | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../Admin.Core.Repository.AssemblyInfo.cs | 2 +- ...n.Core.Repository.AssemblyInfoInputs.cache | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../Admin.Core.Serilog.Es.AssemblyInfo.cs | 2 +- ...n.Core.Serilog.Es.AssemblyInfoInputs.cache | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../net6.0/Admin.Core.Service.AssemblyInfo.cs | 2 +- ...dmin.Core.Service.AssemblyInfoInputs.cache | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../net6.0/Admin.Core.Tasks.AssemblyInfo.cs | 2 +- .../Admin.Core.Tasks.AssemblyInfoInputs.cache | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../Business/InStoreBusiness.cs | 5 +- .../Business/TeamSwitchBusiness.cs | 4 +- .../ViewModels/FoamMachinesPageViewModel.cs | 73 +- .../ViewModels/FoamMonitorPageViewModel.cs | 10 - .../ViewModels/MainWindowViewModel.cs | 93 +- .../EnterWarehouseStatisticsPageView.xaml | 2 +- Aucma.Core.BoxFoam/Views/IndexPageView.xaml | 2 +- Aucma.Core.BoxFoam/Views/MainWindow.xaml | 17 +- .../Views/RealTimePageView.xaml | 43 +- Aucma.Core.PrintTo/Report/MaterialBar.frx123 | 40 + .../SupplementPrintPageViewModel.cs | 14 +- .../ViewModels/SupplementViewModel.cs | 16 +- Aucma.Core.PrintTo/Views/SupplementView.xaml | 2 +- .../GeneratedInternalTypeHelper.g.i.cs | 2 +- .../HwControlLib.AssemblyInfo.cs | 2 +- .../HwControlLib.AssemblyInfoInputs.cache | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../net6.0-windows/HwControlLib.assets.cache | Bin 324 -> 239 bytes .../HwControlLib_MarkupCompile.i.cache | 6 +- .../obj/HwControlLib.csproj.nuget.dgspec.json | 31 +- .../obj/HwControlLib.csproj.nuget.g.props | 10 +- HwControlLib/obj/project.assets.json | 33 +- HwControlLib/obj/project.nuget.cache | 4 +- 61 files changed, 835 insertions(+), 972 deletions(-) create mode 100644 Aucma.Core.PrintTo/Report/MaterialBar.frx123 diff --git a/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.dgspec.json b/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.dgspec.json index d14128d3..a6a7db48 100644 --- a/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.dgspec.json +++ b/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.dgspec.json @@ -1,26 +1,23 @@ { "format": 1, "restore": { - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj": {} + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj": {} }, "projects": { - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", "projectName": "Admin.Core.Api", - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", - "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", - "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\obj\\", + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", + "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", + "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\开发环境\\DevExpress\\Components\\Offline Packages", - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -28,22 +25,21 @@ "net6.0" ], "sources": { - "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, - "https://api.nuget.org/v3/index.json": {}, - "https://nuget.cnblogs.com/v3/index.json": {} + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj" }, - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj" }, - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj" } } } @@ -52,11 +48,6 @@ "warnAsError": [ "NU1605" ] - }, - "restoreAuditProperties": { - "enableAudit": "true", - "auditLevel": "low", - "auditMode": "direct" } }, "frameworks": { @@ -91,27 +82,24 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj", "projectName": "Admin.Core.Common", - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj", - "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", - "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\obj\\", + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj", + "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", + "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\开发环境\\DevExpress\\Components\\Offline Packages", - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -119,16 +107,15 @@ "net6.0" ], "sources": { - "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, - "https://api.nuget.org/v3/index.json": {}, - "https://nuget.cnblogs.com/v3/index.json": {} + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj" } } } @@ -137,11 +124,6 @@ "warnAsError": [ "NU1605" ] - }, - "restoreAuditProperties": { - "enableAudit": "true", - "auditLevel": "low", - "auditMode": "direct" } }, "frameworks": { @@ -289,27 +271,24 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj", "projectName": "Admin.Core.EventBus", - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj", - "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", - "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\obj\\", + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj", + "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", + "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\开发环境\\DevExpress\\Components\\Offline Packages", - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -317,16 +296,15 @@ "net6.0" ], "sources": { - "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, - "https://api.nuget.org/v3/index.json": {}, - "https://nuget.cnblogs.com/v3/index.json": {} + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" } } } @@ -335,11 +313,6 @@ "warnAsError": [ "NU1605" ] - }, - "restoreAuditProperties": { - "enableAudit": "true", - "auditLevel": "low", - "auditMode": "direct" } }, "frameworks": { @@ -371,27 +344,24 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj", "projectName": "Admin.Core.Extensions", - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj", - "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", - "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\obj\\", + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj", + "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", + "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\开发环境\\DevExpress\\Components\\Offline Packages", - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -399,52 +369,51 @@ "net6.0" ], "sources": { - "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, - "https://api.nuget.org/v3/index.json": {}, - "https://nuget.cnblogs.com/v3/index.json": {} + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" }, - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj" }, - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj" }, - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj" }, - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Socket\\Admin.Core.Socket.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Socket\\Admin.Core.Socket.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Socket\\Admin.Core.Socket.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Socket\\Admin.Core.Socket.csproj" }, - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj" }, - "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PerfusionTask\\Aucma.Core.PerfusionTask.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PerfusionTask\\Aucma.Core.PerfusionTask.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PerfusionTask\\Aucma.Core.PerfusionTask.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PerfusionTask\\Aucma.Core.PerfusionTask.csproj" }, - "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj" }, - "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj" }, - "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj" }, - "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.SheetMetalTasks\\Aucma.Core.SheetMetalTasks.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.SheetMetalTasks\\Aucma.Core.SheetMetalTasks.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.SheetMetalTasks\\Aucma.Core.SheetMetalTasks.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.SheetMetalTasks\\Aucma.Core.SheetMetalTasks.csproj" }, - "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj" }, - "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj" } } } @@ -453,11 +422,6 @@ "warnAsError": [ "NU1605" ] - }, - "restoreAuditProperties": { - "enableAudit": "true", - "auditLevel": "low", - "auditMode": "direct" } }, "frameworks": { @@ -485,27 +449,24 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj", "projectName": "Admin.Core.IRepository", - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj", - "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", - "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\obj\\", + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj", + "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", + "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\开发环境\\DevExpress\\Components\\Offline Packages", - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -513,19 +474,18 @@ "net6.0" ], "sources": { - "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, - "https://api.nuget.org/v3/index.json": {}, - "https://nuget.cnblogs.com/v3/index.json": {} + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" }, - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj" } } } @@ -534,11 +494,6 @@ "warnAsError": [ "NU1605" ] - }, - "restoreAuditProperties": { - "enableAudit": "true", - "auditLevel": "low", - "auditMode": "direct" } }, "frameworks": { @@ -560,27 +515,24 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj", "projectName": "Admin.Core.IService", - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj", - "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", - "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\obj\\", + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj", + "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", + "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\开发环境\\DevExpress\\Components\\Offline Packages", - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -588,19 +540,18 @@ "net6.0" ], "sources": { - "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, - "https://api.nuget.org/v3/index.json": {}, - "https://nuget.cnblogs.com/v3/index.json": {} + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" }, - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj" } } } @@ -609,11 +560,6 @@ "warnAsError": [ "NU1605" ] - }, - "restoreAuditProperties": { - "enableAudit": "true", - "auditLevel": "low", - "auditMode": "direct" } }, "frameworks": { @@ -635,27 +581,24 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj", "projectName": "Admin.Core.Model", - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj", - "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", - "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\obj\\", + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj", + "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", + "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\开发环境\\DevExpress\\Components\\Offline Packages", - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -663,16 +606,15 @@ "net6.0" ], "sources": { - "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, - "https://api.nuget.org/v3/index.json": {}, - "https://nuget.cnblogs.com/v3/index.json": {} + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" } } } @@ -681,11 +623,6 @@ "warnAsError": [ "NU1605" ] - }, - "restoreAuditProperties": { - "enableAudit": "true", - "auditLevel": "low", - "auditMode": "direct" } }, "frameworks": { @@ -707,27 +644,24 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj", "projectName": "Admin.Core.Repository", - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj", - "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", - "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\obj\\", + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj", + "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", + "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\开发环境\\DevExpress\\Components\\Offline Packages", - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -735,16 +669,15 @@ "net6.0" ], "sources": { - "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, - "https://api.nuget.org/v3/index.json": {}, - "https://nuget.cnblogs.com/v3/index.json": {} + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj" } } } @@ -753,11 +686,6 @@ "warnAsError": [ "NU1605" ] - }, - "restoreAuditProperties": { - "enableAudit": "true", - "auditLevel": "low", - "auditMode": "direct" } }, "frameworks": { @@ -779,27 +707,24 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj", "projectName": "Admin.Core.Serilog.Es", - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj", - "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", - "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\obj\\", + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj", + "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", + "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Serilog.Es\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\开发环境\\DevExpress\\Components\\Offline Packages", - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -807,9 +732,8 @@ "net6.0" ], "sources": { - "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, - "https://api.nuget.org/v3/index.json": {}, - "https://nuget.cnblogs.com/v3/index.json": {} + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} }, "frameworks": { "net6.0": { @@ -821,11 +745,6 @@ "warnAsError": [ "NU1605" ] - }, - "restoreAuditProperties": { - "enableAudit": "true", - "auditLevel": "low", - "auditMode": "direct" } }, "frameworks": { @@ -877,27 +796,24 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj", "projectName": "Admin.Core.Service", - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj", - "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", - "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\obj\\", + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj", + "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", + "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\开发环境\\DevExpress\\Components\\Offline Packages", - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -905,22 +821,21 @@ "net6.0" ], "sources": { - "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, - "https://api.nuget.org/v3/index.json": {}, - "https://nuget.cnblogs.com/v3/index.json": {} + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj" }, - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj" }, - "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj" } } } @@ -929,11 +844,6 @@ "warnAsError": [ "NU1605" ] - }, - "restoreAuditProperties": { - "enableAudit": "true", - "auditLevel": "low", - "auditMode": "direct" } }, "frameworks": { @@ -955,27 +865,24 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Socket\\Admin.Core.Socket.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Socket\\Admin.Core.Socket.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Socket\\Admin.Core.Socket.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Socket\\Admin.Core.Socket.csproj", "projectName": "Admin.Core.Socket", - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Socket\\Admin.Core.Socket.csproj", - "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", - "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Socket\\obj\\", + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Socket\\Admin.Core.Socket.csproj", + "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", + "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Socket\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\开发环境\\DevExpress\\Components\\Offline Packages", - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -983,19 +890,18 @@ "net6.0" ], "sources": { - "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, - "https://api.nuget.org/v3/index.json": {}, - "https://nuget.cnblogs.com/v3/index.json": {} + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" }, - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj" } } } @@ -1004,11 +910,6 @@ "warnAsError": [ "NU1605" ] - }, - "restoreAuditProperties": { - "enableAudit": "true", - "auditLevel": "low", - "auditMode": "direct" } }, "frameworks": { @@ -1044,27 +945,24 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj", "projectName": "Admin.Core.Tasks", - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj", - "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", - "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\obj\\", + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj", + "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", + "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\开发环境\\DevExpress\\Components\\Offline Packages", - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -1072,28 +970,27 @@ "net6.0" ], "sources": { - "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, - "https://api.nuget.org/v3/index.json": {}, - "https://nuget.cnblogs.com/v3/index.json": {} + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" }, - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj" }, - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj" }, - "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" }, - "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj" } } } @@ -1102,11 +999,6 @@ "warnAsError": [ "NU1605" ] - }, - "restoreAuditProperties": { - "enableAudit": "true", - "auditLevel": "low", - "auditMode": "direct" } }, "frameworks": { @@ -1134,27 +1026,24 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj", "projectName": "Aucma.Core.HwPLc", - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj", - "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", - "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\obj\\", + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj", + "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", + "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\开发环境\\DevExpress\\Components\\Offline Packages", - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -1162,9 +1051,8 @@ "netstandard2.1" ], "sources": { - "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, - "https://api.nuget.org/v3/index.json": {}, - "https://nuget.cnblogs.com/v3/index.json": {} + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} }, "frameworks": { "netstandard2.1": { @@ -1176,11 +1064,6 @@ "warnAsError": [ "NU1605" ] - }, - "restoreAuditProperties": { - "enableAudit": "true", - "auditLevel": "low", - "auditMode": "direct" } }, "frameworks": { @@ -1208,27 +1091,24 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PerfusionTask\\Aucma.Core.PerfusionTask.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PerfusionTask\\Aucma.Core.PerfusionTask.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PerfusionTask\\Aucma.Core.PerfusionTask.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PerfusionTask\\Aucma.Core.PerfusionTask.csproj", "projectName": "Aucma.Core.PerfusionTask", - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PerfusionTask\\Aucma.Core.PerfusionTask.csproj", - "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", - "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PerfusionTask\\obj\\", + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PerfusionTask\\Aucma.Core.PerfusionTask.csproj", + "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", + "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PerfusionTask\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\开发环境\\DevExpress\\Components\\Offline Packages", - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -1236,22 +1116,21 @@ "net6.0" ], "sources": { - "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, - "https://api.nuget.org/v3/index.json": {}, - "https://nuget.cnblogs.com/v3/index.json": {} + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj" }, - "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" }, - "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj" } } } @@ -1260,11 +1139,6 @@ "warnAsError": [ "NU1605" ] - }, - "restoreAuditProperties": { - "enableAudit": "true", - "auditLevel": "low", - "auditMode": "direct" } }, "frameworks": { @@ -1286,27 +1160,24 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj", "projectName": "Aucma.Core.PLc", - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj", - "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", - "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\obj\\", + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj", + "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", + "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\开发环境\\DevExpress\\Components\\Offline Packages", - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -1314,9 +1185,8 @@ "netstandard2.1" ], "sources": { - "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, - "https://api.nuget.org/v3/index.json": {}, - "https://nuget.cnblogs.com/v3/index.json": {} + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} }, "frameworks": { "netstandard2.1": { @@ -1328,11 +1198,6 @@ "warnAsError": [ "NU1605" ] - }, - "restoreAuditProperties": { - "enableAudit": "true", - "auditLevel": "low", - "auditMode": "direct" } }, "frameworks": { @@ -1360,27 +1225,24 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj", "projectName": "Aucma.Core.RunPlc", - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj", - "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", - "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\obj\\", + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj", + "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", + "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\开发环境\\DevExpress\\Components\\Offline Packages", - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -1388,19 +1250,18 @@ "net6.0" ], "sources": { - "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, - "https://api.nuget.org/v3/index.json": {}, - "https://nuget.cnblogs.com/v3/index.json": {} + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" }, - "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" } } } @@ -1409,11 +1270,6 @@ "warnAsError": [ "NU1605" ] - }, - "restoreAuditProperties": { - "enableAudit": "true", - "auditLevel": "low", - "auditMode": "direct" } }, "frameworks": { @@ -1435,27 +1291,24 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj", "projectName": "Aucma.Core.ScannerGun", - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj", - "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", - "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\obj\\", + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj", + "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", + "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\开发环境\\DevExpress\\Components\\Offline Packages", - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -1463,16 +1316,15 @@ "net6.0" ], "sources": { - "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, - "https://api.nuget.org/v3/index.json": {}, - "https://nuget.cnblogs.com/v3/index.json": {} + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" } } } @@ -1481,11 +1333,6 @@ "warnAsError": [ "NU1605" ] - }, - "restoreAuditProperties": { - "enableAudit": "true", - "auditLevel": "low", - "auditMode": "direct" } }, "frameworks": { @@ -1513,27 +1360,24 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj", "projectName": "Aucma.Core.Scanner", - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj", - "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", - "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\obj\\", + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj", + "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", + "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\开发环境\\DevExpress\\Components\\Offline Packages", - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -1541,19 +1385,18 @@ "net6.0" ], "sources": { - "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, - "https://api.nuget.org/v3/index.json": {}, - "https://nuget.cnblogs.com/v3/index.json": {} + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" }, - "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj" } } } @@ -1562,11 +1405,6 @@ "warnAsError": [ "NU1605" ] - }, - "restoreAuditProperties": { - "enableAudit": "true", - "auditLevel": "low", - "auditMode": "direct" } }, "frameworks": { @@ -1594,27 +1432,24 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.SheetMetalTasks\\Aucma.Core.SheetMetalTasks.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.SheetMetalTasks\\Aucma.Core.SheetMetalTasks.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.SheetMetalTasks\\Aucma.Core.SheetMetalTasks.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.SheetMetalTasks\\Aucma.Core.SheetMetalTasks.csproj", "projectName": "Aucma.Core.SheetMetalTasks", - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.SheetMetalTasks\\Aucma.Core.SheetMetalTasks.csproj", - "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", - "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.SheetMetalTasks\\obj\\", + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.SheetMetalTasks\\Aucma.Core.SheetMetalTasks.csproj", + "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", + "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.SheetMetalTasks\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\开发环境\\DevExpress\\Components\\Offline Packages", - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -1622,19 +1457,18 @@ "net6.0" ], "sources": { - "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, - "https://api.nuget.org/v3/index.json": {}, - "https://nuget.cnblogs.com/v3/index.json": {} + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj" }, - "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" } } } @@ -1643,11 +1477,6 @@ "warnAsError": [ "NU1605" ] - }, - "restoreAuditProperties": { - "enableAudit": "true", - "auditLevel": "low", - "auditMode": "direct" } }, "frameworks": { @@ -1669,27 +1498,24 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj", "projectName": "Aucma.Core.Tasks", - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj", - "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", - "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\obj\\", + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj", + "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", + "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Tasks\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\开发环境\\DevExpress\\Components\\Offline Packages", - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -1697,22 +1523,21 @@ "net6.0" ], "sources": { - "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, - "https://api.nuget.org/v3/index.json": {}, - "https://nuget.cnblogs.com/v3/index.json": {} + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" }, - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj" }, - "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" } } } @@ -1721,11 +1546,6 @@ "warnAsError": [ "NU1605" ] - }, - "restoreAuditProperties": { - "enableAudit": "true", - "auditLevel": "low", - "auditMode": "direct" } }, "frameworks": { @@ -1747,27 +1567,24 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" } } }, - "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj": { + "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj", "projectName": "Aucma.Core.TemperatureTask", - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj", - "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", - "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.TemperatureTask\\obj\\", + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj", + "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", + "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.TemperatureTask\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\开发环境\\DevExpress\\Components\\Offline Packages", - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -1775,16 +1592,15 @@ "net6.0" ], "sources": { - "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, - "https://api.nuget.org/v3/index.json": {}, - "https://nuget.cnblogs.com/v3/index.json": {} + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { - "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj" } } } @@ -1793,11 +1609,6 @@ "warnAsError": [ "NU1605" ] - }, - "restoreAuditProperties": { - "enableAudit": "true", - "auditLevel": "low", - "auditMode": "direct" } }, "frameworks": { @@ -1819,7 +1630,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" } } } diff --git a/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.g.props b/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.g.props index 58649efa..7b07b2b8 100644 --- a/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.g.props +++ b/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.g.props @@ -5,22 +5,20 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\Lenovo\.nuget\packages\;D:\开发环境\DevExpress\Components\Offline Packages;D:\开发工具\Visual Studio 2019\Shared\NuGetPackages;C:\Program Files\dotnet\sdk\NuGetFallbackFolder + C:\Users\admin\.nuget\packages\;D:\install\VS\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages PackageReference - 6.9.1 + 6.8.1 - - - - + + - C:\Users\Lenovo\.nuget\packages\touchsocket.core\2.0.0 - C:\Users\Lenovo\.nuget\packages\microsoft.extensions.apidescription.server\3.0.0 + C:\Users\admin\.nuget\packages\touchsocket.core\2.0.0 + C:\Users\admin\.nuget\packages\microsoft.extensions.apidescription.server\3.0.0 \ No newline at end of file diff --git a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfo.cs b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfo.cs index 66ca61e7..3dfd9782 100644 --- a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfo.cs +++ b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfo.cs @@ -15,7 +15,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Api")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+6a2914f353b30226bd3c46eef3e158fc962c6d2c")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+16f3acbdbe85f778cc8d1ee28a9293ce4e762a6f")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Api")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Api")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfoInputs.cache b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfoInputs.cache index 0e08a47e..99d9f32e 100644 --- a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfoInputs.cache +++ b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfoInputs.cache @@ -1 +1 @@ -84860ed5a97fc98413e2de33692ffc705dd54b8b7b2dda2f269c04c5cd160790 +de6ac9747009c799ceafdfcd4b0643c2cd3426201f673b5a54e10ff69697fbbd diff --git a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.GeneratedMSBuildEditorConfig.editorconfig index 60b6cf63..2da89fb6 100644 --- a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.GeneratedMSBuildEditorConfig.editorconfig @@ -9,11 +9,11 @@ build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Api build_property.RootNamespace = Admin.Core.Api -build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Api\ +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Api\ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = build_property.RazorLangVersion = 6.0 build_property.SupportLocalizedComponentNames = build_property.GenerateRazorMetadataSourceChecksumAttributes = -build_property.MSBuildProjectDirectory = E:\桌面\AUCMA_SCADA\Admin.Core.Api +build_property.MSBuildProjectDirectory = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Api build_property._RazorSourceGeneratorDebug = diff --git a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.assets.cache b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.assets.cache index f43e60d74734ea0f581f7adaa9524bc31dbaac05..4dfe8b1d4ec8f5bb7b4d5e0079b4c6fbb28782fd 100644 GIT binary patch delta 18448 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 + _sysUserInfoServices = App.ServiceProvider.GetService(); CollectionFoamMachine.RefreshLastShotDataDelegateEvent += RefreshData; CollectionFoamMachine.RefreshGunDataDelegateEvent += RefreshGunData; CollectionFoamMachine.RefreshSystemDataDelegateEvent += RefreshSystemData; - _boxLastShotRecordServices = App.ServiceProvider.GetService(); - LoadData(); - //Task.WaitAll(LoadData()); + + Task.Run(async () => + { + await LoadData(); + }); } @@ -218,41 +222,40 @@ namespace Aucma.Core.BoxFoam.ViewModels { try { - System.Windows.Application.Current.Dispatcher.Invoke((Action)(() => + System.Windows.Application.Current.Dispatcher.Invoke((Action)(async () => { LastShotRecordDataGrid.Clear(); - - int i = 1; - var list = _boxLastShotRecordServices.QueryAsync(x => x.StationNumber == "1005").Result; - if (list == null) return; - list.OrderBy(d => d.CreateTime).Take(10); - //list.OrderByDescending(d => d.CreateTime); - foreach (var item in list) + var sysDateList = await _sysUserInfoServices.GetTeamData(); + if (sysDateList != null && sysDateList.Count > 0) { - string system = string.Empty; - if (item.System == "1") { system = "1系统"; } - if (item.System == "2") { system = "2系统"; } - LastShotRecordModel model = new LastShotRecordModel(); - //if (LastShotRecordDataGrid.Count() == 0) - //{ - // model.No = 1; - //} - //else - //{ - model.No = LastShotRecordDataGrid.Count() + 1; - // } - // model.No = i; - model.System = system; - model.GunHead = item.GunCode; - model.PolInjectionpressure = item.PolHp; - model.IsoInjectionpressure = item.IsoHp; - model.PolInjectiontemperature = item.PolTemp; - model.IsoInjectiontemperature = item.IsoTemp; - model.LastTime = item.CreateTime; - model.Createtime = item.CreateTime; - model.StationNumber = item.PourNu; - LastShotRecordDataGrid.Insert(0, model); + var sysUserInfo = sysDateList.First(); + var minTime = sysDateList.Min(d => d.StartTime); + var maxTime = sysDateList.Max(d => d.EndTime); + + var list = await _boxLastShotRecordServices.QueryAsync(x => x.StationNumber == "1005" && (x.CreateTime >= minTime && x.CreateTime<= maxTime)); + if (list == null || list.Count == 0) return; + list.OrderBy(d => d.CreateTime).Take(10); + //list.OrderByDescending(d => d.CreateTime); + foreach (var item in list) + { + string system = string.Empty; + if (item.System == "1") { system = "1系统"; } + if (item.System == "2") { system = "2系统"; } + LastShotRecordModel model = new LastShotRecordModel(); + model.No = LastShotRecordDataGrid.Count() + 1; + model.System = system; + model.GunHead = item.GunCode; + model.PolInjectionpressure = item.PolHp; + model.IsoInjectionpressure = item.IsoHp; + model.PolInjectiontemperature = item.PolTemp; + model.IsoInjectiontemperature = item.IsoTemp; + model.LastTime = item.CreateTime; + model.Createtime = item.CreateTime; + model.StationNumber = item.PourNu; + LastShotRecordDataGrid.Insert(0, model); + } } + })); } catch (Exception ex) diff --git a/Aucma.Core.BoxFoam/ViewModels/FoamMonitorPageViewModel.cs b/Aucma.Core.BoxFoam/ViewModels/FoamMonitorPageViewModel.cs index ece0ce51..aacad2ef 100644 --- a/Aucma.Core.BoxFoam/ViewModels/FoamMonitorPageViewModel.cs +++ b/Aucma.Core.BoxFoam/ViewModels/FoamMonitorPageViewModel.cs @@ -55,13 +55,6 @@ namespace Aucma.Core.BoxFoam.ViewModels CollectionFoamLine.RefreshBoxFoamDataDelegateEvent += InitData; - //timer2.Elapsed += new System.Timers.ElapsedEventHandler(RealTimeFoamingTask); //到达时间的时候执行事件； - //timer2.AutoReset = true;//设置是执行一次（false）还是一直执行(true)； - //timer2.Enabled = true;//需要调用 timer.Start()或者timer.Enabled = true来启动它， - //timer2.Start();//timer.Start()的内部原理还是设置timer.Enabled = true - - //Task.WaitAll(InitData - // Task.Run(() => { while (true) @@ -381,9 +374,6 @@ namespace Aucma.Core.BoxFoam.ViewModels } #endregion - - - #region 更新夹具型号 /// /// 更新夹具型号 diff --git a/Aucma.Core.BoxFoam/ViewModels/MainWindowViewModel.cs b/Aucma.Core.BoxFoam/ViewModels/MainWindowViewModel.cs index 7ce2d2f8..fa69b91d 100644 --- a/Aucma.Core.BoxFoam/ViewModels/MainWindowViewModel.cs +++ b/Aucma.Core.BoxFoam/ViewModels/MainWindowViewModel.cs @@ -1,4 +1,5 @@ using Admin.Core.Common; +using Admin.Core.IService; using Admin.Core.Socket; using Aucma.Core.BoxFoam.Business; using Aucma.Core.BoxFoam.Views; @@ -7,6 +8,7 @@ using Aucma.Core.Scanner; using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; using log4net; +using Microsoft.Extensions.DependencyInjection; using NPOI.SS.Formula.Functions; using System; using System.Collections.ObjectModel; @@ -22,6 +24,7 @@ namespace Aucma.Core.BoxFoam.ViewModels public partial class MainWindowViewModel : ObservableObject { private static readonly log4net.ILog log = LogManager.GetLogger(typeof(MainWindowViewModel)); + private ISysUserInfoServices _sysUserInfoServices; private IndexPageView firstPage = new IndexPageView();//首页 CollectionFoamLine line = new CollectionFoamLine(); CollectionFoamMachine machine = new CollectionFoamMachine(); @@ -35,16 +38,23 @@ namespace Aucma.Core.BoxFoam.ViewModels public MainWindowViewModel() { UserContent = firstPage; + _sysUserInfoServices = App.ServiceProvider.GetService(); TouchSocketService.RefreshStateEvent += RefreshScanner; string address = Appsettings.app("Middleware", "TouchSocket", "Address").ObjToString(); RefreshScanner(address, false); - Task.Run(() => + Task.Run(async () => { - init(); + await init(); + await RefreshTeamTime();//班组时间 }); - + TeamSwitchBusiness teamSwitchBusiness = new TeamSwitchBusiness(); - teamSwitchBusiness.Init(); + teamSwitchBusiness.Init();//切换班组清空发泡产量 + //实时更新界面时间 + DispatcherTimer timer = new DispatcherTimer(); + timer.Interval = new TimeSpan(0, 0, 1); //间隔1秒 + timer.Tick += new EventHandler(timer_Tick); + timer.Start(); } public Task init() @@ -57,10 +67,10 @@ namespace Aucma.Core.BoxFoam.ViewModels timer.Start(); // 创建一个DispatcherTimer对象 - DispatcherTimer dispatcherTimer = new DispatcherTimer(); - dispatcherTimer.Interval = TimeSpan.FromSeconds(1); - dispatcherTimer.Tick += Timer_Tick; - dispatcherTimer.Start(); + //DispatcherTimer dispatcherTimer = new DispatcherTimer(); + //dispatcherTimer.Interval = TimeSpan.FromSeconds(1); + //dispatcherTimer.Tick += Timer_Tick; + //dispatcherTimer.Start(); return Task.CompletedTask; } @@ -429,12 +439,25 @@ namespace Aucma.Core.BoxFoam.ViewModels } #endregion + #region 班组信息 + /// + /// 班组信息 + /// + public string _teamName; + public string TeamName + { + get => _teamName; + set => SetProperty(ref _teamName, value); + } + #endregion + + #region MyRegion public string _currentDateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); public string CurrentDateTime { get => _currentDateTime; set => SetProperty(ref _currentDateTime, value); - } + } public string _shiftStr = string.Empty; public string ShiftStr @@ -442,22 +465,54 @@ namespace Aucma.Core.BoxFoam.ViewModels get => _shiftStr; set => SetProperty(ref _shiftStr, value); } + #endregion - private void Timer_Tick(object sender, EventArgs e) + #region 切换班组 + public async Task RefreshTeamTime() { - DateTime now = DateTime.Now; - - // 判断当前是否是白班时间段 - if (now.Hour >= 8 && now.Hour < 20) + while (true) { - ShiftStr = $"白班 08点-20点"; + var list = await _sysUserInfoServices.GetTeamData(); + if (list != null && list.Count > 0) + { + var sysUserInfo = list.First(); + TeamName = $"{sysUserInfo.TeamName}({list.Min(d => d.StartTime).ToString("HH:mm")}~{list.Max(d => d.EndTime).ToString("HH:mm")})"; + //TeamName = $"{sysUserInfo.TeamName}"; + } + Thread.Sleep(5000); } - else + } + #endregion + + #region 定时刷新时间 + void timer_Tick(object sender, EventArgs e) + { + System.Windows.Application.Current.Dispatcher.Invoke((Action)(() => { + CurrentDateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + + })); - ShiftStr = $"夜班 20点-08点"; - } - CurrentDateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); } + #endregion + + #region MyRegion + //private void Timer_Tick(object sender, EventArgs e) + //{ + // DateTime now = DateTime.Now; + + // // 判断当前是否是白班时间段 + // if (now.Hour >= 8 && now.Hour < 20) + // { + // ShiftStr = $"白班 08点-20点"; + // } + // else + // { + + // ShiftStr = $"夜班 20点-08点"; + // } + // CurrentDateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + //} + #endregion } } diff --git a/Aucma.Core.BoxFoam/Views/EnterWarehouseStatisticsPageView.xaml b/Aucma.Core.BoxFoam/Views/EnterWarehouseStatisticsPageView.xaml index 4522b3a7..371327c4 100644 --- a/Aucma.Core.BoxFoam/Views/EnterWarehouseStatisticsPageView.xaml +++ b/Aucma.Core.BoxFoam/Views/EnterWarehouseStatisticsPageView.xaml @@ -54,7 +54,7 @@ - + diff --git a/Aucma.Core.BoxFoam/Views/IndexPageView.xaml b/Aucma.Core.BoxFoam/Views/IndexPageView.xaml index 5936a662..c8ddc9b6 100644 --- a/Aucma.Core.BoxFoam/Views/IndexPageView.xaml +++ b/Aucma.Core.BoxFoam/Views/IndexPageView.xaml @@ -135,7 +135,7 @@ MinHeight="70" MaxHeight="100" MinWidth="420" IsReadOnly="True" Foreground="White" VerticalAlignment="Top" Margin="30 0 0 0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" AcceptsReturn="True" Text="{Binding Prompt,Mode=TwoWay}" - IsEnabled="{Binding Path=IsChecked, ElementName=MaterialDesignOutlinedTextBoxEnabledComboBox}" + Style="{StaticResource MaterialDesignOutlinedTextBox}" TextWrapping="Wrap" VerticalScrollBarVisibility="Auto" /> diff --git a/Aucma.Core.BoxFoam/Views/MainWindow.xaml b/Aucma.Core.BoxFoam/Views/MainWindow.xaml index 7846fe06..1b61e29f 100644 --- a/Aucma.Core.BoxFoam/Views/MainWindow.xaml +++ b/Aucma.Core.BoxFoam/Views/MainWindow.xaml @@ -38,19 +38,14 @@ - - - + + - - - + + + + diff --git a/Aucma.Core.DoorFoam/Views/RealTimePageView.xaml b/Aucma.Core.DoorFoam/Views/RealTimePageView.xaml index fa7bb553..1200a6cb 100644 --- a/Aucma.Core.DoorFoam/Views/RealTimePageView.xaml +++ b/Aucma.Core.DoorFoam/Views/RealTimePageView.xaml @@ -170,31 +170,24 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/Aucma.Core.PrintTo/Report/MaterialBar.frx123 b/Aucma.Core.PrintTo/Report/MaterialBar.frx123 new file mode 100644 index 00000000..12f1a785 --- /dev/null +++ b/Aucma.Core.PrintTo/Report/MaterialBar.frx123 @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Aucma.Core.PrintTo/ViewModels/SupplementPrintPageViewModel.cs b/Aucma.Core.PrintTo/ViewModels/SupplementPrintPageViewModel.cs index 598d0468..b6a207e5 100644 --- a/Aucma.Core.PrintTo/ViewModels/SupplementPrintPageViewModel.cs +++ b/Aucma.Core.PrintTo/ViewModels/SupplementPrintPageViewModel.cs @@ -1,5 +1,6 @@ using Admin.Core.IRepository; using Admin.Core.IService; +using Admin.Core.Model; using Admin.Core.Service; using Admin.Core.Service.Service_New; using Aucma.Core.PrintTo.Models; @@ -72,6 +73,17 @@ namespace Aucma.Core.PrintTo.ViewModels MessageBox.Show("请选中要补打的条码！", "系统提醒"); return; } + int Id = Convert.ToInt32(obj); + var printSuppleMentBarCode = _printSuppleMentBarCodeServices.FirstAsync(d => d.ObjId == Id).Result; + if (printSuppleMentBarCode != null) + { + if (printSuppleMentBarCode.IsPrint==1) + { + MessageBox.Show("选中的条码已补打过，请选择其他未补打条码！", "系统提醒"); + return; + } + + } var orderCode = SelectedCells.OrderCode; var materialCode = SelectedCells.MaterialCode; var materialName = SelectedCells.MaterialName; @@ -80,7 +92,7 @@ namespace Aucma.Core.PrintTo.ViewModels var baseOrderInfo=await _baseOrderInfoServices.FirstAsync(d => d.OrderCode == orderCode); if (baseOrderInfo!=null) { - int Id = Convert.ToInt32(obj); + SupplementView printToDev = new SupplementView(Id); printToDev.ShowDialog(); } diff --git a/Aucma.Core.PrintTo/ViewModels/SupplementViewModel.cs b/Aucma.Core.PrintTo/ViewModels/SupplementViewModel.cs index 6998aa67..bae51344 100644 --- a/Aucma.Core.PrintTo/ViewModels/SupplementViewModel.cs +++ b/Aucma.Core.PrintTo/ViewModels/SupplementViewModel.cs @@ -43,14 +43,14 @@ namespace Aucma.Core.PrintTo.ViewModels _barCode = printSuppleMentBarCode.MaterialBarCode; PrintAmount = 1; PrintName = printSuppleMentBarCode.PrintName; - Progress = 0; - MaxProgress = 1;//最大数 - State = "Green"; - ErrorNum = 0;//异常 - SuspendEnabled = "False";//暂停打印 - OperateEnabled = "True";//打印 + } - + Progress = 0; + MaxProgress = 1;//最大数 + State = "Green"; + ErrorNum = 0;//异常 + SuspendEnabled = "False";//暂停打印 + OperateEnabled = "True";//打印 } #region 打印 @@ -62,7 +62,7 @@ namespace Aucma.Core.PrintTo.ViewModels string printer = Appsettings.app("Printer", "PrinterName"); #region 打印 - + Progress = 1; //对接打印机 Report barReport = new Report(); barReport.Load(System.Environment.CurrentDirectory + @"\Report\MaterialBar.frx");//打印报表位置 diff --git a/Aucma.Core.PrintTo/Views/SupplementView.xaml b/Aucma.Core.PrintTo/Views/SupplementView.xaml index 27c4d438..47191edd 100644 --- a/Aucma.Core.PrintTo/Views/SupplementView.xaml +++ b/Aucma.Core.PrintTo/Views/SupplementView.xaml @@ -61,7 +61,7 @@ - + diff --git a/HwControlLib/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs b/HwControlLib/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs index daa86c24..98fffa86 100644 --- a/HwControlLib/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs +++ b/HwControlLib/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs @@ -15,7 +15,7 @@ namespace XamlGeneratedNamespace { /// GeneratedInternalTypeHelper /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.3.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.2.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper { diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfo.cs b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfo.cs index 05d9b129..2d191be8 100644 --- a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfo.cs +++ b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("HwControlLib")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+6a2914f353b30226bd3c46eef3e158fc962c6d2c")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+16f3acbdbe85f778cc8d1ee28a9293ce4e762a6f")] [assembly: System.Reflection.AssemblyProductAttribute("HwControlLib")] [assembly: System.Reflection.AssemblyTitleAttribute("HwControlLib")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfoInputs.cache b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfoInputs.cache index fa5843bf..7528f6f7 100644 --- a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfoInputs.cache +++ b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfoInputs.cache @@ -1 +1 @@ -b91ffe37e030c240ecd7b16c17437ce65a00168fe7f65b58028d7a99cfe75f6a +c3ebcb17731f91ca186d52d2e00c1c8aecff28451257f31ea7be4a71a3c9dfe1 diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig index ff214ef2..0ce5799b 100644 --- a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig +++ b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig @@ -8,6 +8,6 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = HwControlLib -build_property.ProjectDir = E:\桌面\AUCMA_SCADA\HwControlLib\ +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\HwControlLib\ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.assets.cache b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.assets.cache index 51e71961ca4bb7875ddebacffd8186c27e2916c4..7a09d7d63753189f9c507989ccd35e7cc6e7fdd0 100644 GIT binary patch literal 239 zcmWIWc6a1qU|@JZ(@)^z|H;p$S!>_Oeg9-pO=Zkf_X)wlFDEwtTk&%Fxz|87!~!Ou zLV0Jan9$(E>i-UpIHtQ)-KHuOGwyVKb`lHg01>-=I~o>4vauWL;@C| zIt6E|n9$$p8Pq#09+PXa^EVH;Y zF-IY|q%NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\Lenovo\.nuget\packages\;D:\开发环境\DevExpress\Components\Offline Packages;D:\开发工具\Visual Studio 2019\Shared\NuGetPackages;C:\Program Files\dotnet\sdk\NuGetFallbackFolder + C:\Users\admin\.nuget\packages\;D:\install\VS\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages PackageReference - 6.9.1 + 6.8.1 - - - - + + \ No newline at end of file diff --git a/HwControlLib/obj/project.assets.json b/HwControlLib/obj/project.assets.json index a3f1b835..80881cd8 100644 --- a/HwControlLib/obj/project.assets.json +++ b/HwControlLib/obj/project.assets.json @@ -8,28 +8,23 @@ "net6.0-windows7.0": [] }, "packageFolders": { - "C:\\Users\\Lenovo\\.nuget\\packages\\": {}, - "D:\\开发环境\\DevExpress\\Components\\Offline Packages": {}, - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages": {}, - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} + "C:\\Users\\admin\\.nuget\\packages\\": {}, + "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj", + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj", "projectName": "HwControlLib", - "projectPath": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj", - "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", - "outputPath": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\obj\\", + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj", + "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", + "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\开发环境\\DevExpress\\Components\\Offline Packages", - "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -37,9 +32,8 @@ "net6.0-windows" ], "sources": { - "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, - "https://api.nuget.org/v3/index.json": {}, - "https://nuget.cnblogs.com/v3/index.json": {} + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} }, "frameworks": { "net6.0-windows7.0": { @@ -51,11 +45,6 @@ "warnAsError": [ "NU1605" ] - }, - "restoreAuditProperties": { - "enableAudit": "true", - "auditLevel": "low", - "auditMode": "direct" } }, "frameworks": { @@ -80,7 +69,7 @@ "privateAssets": "none" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" } } } diff --git a/HwControlLib/obj/project.nuget.cache b/HwControlLib/obj/project.nuget.cache index 6939b358..c8fba8ac 100644 --- a/HwControlLib/obj/project.nuget.cache +++ b/HwControlLib/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "8VHCZjfxPgjrzPcG94ZcZRTYMLoR3BoZWYVsc5F8CcWA2w5qr9WzBXilpzCvLkq4aV7eWTwXrr0qnESvVVeeyQ==", + "dgSpecHash": "Lldp0WwKv+WofUzsqhZJ/oOT3RuTSOiglpZojOboMh6lba8xJ+wNaDv46uD9G2F52iYt2kUp+s3r14ZwXLdqWw==", "success": true, - "projectFilePath": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj", + "projectFilePath": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj", "expectedPackageFiles": [], "logs": [] } \ No newline at end of file From 80855072cfd26687ca78afc936ada8b716b600bb Mon Sep 17 00:00:00 2001 From: wenjy Date: Tue, 26 Mar 2024 18:59:13 +0800 Subject: [PATCH 2/4] =?UTF-8?q?change=20-=20=E4=BF=AE=E6=94=B9=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=87=87=E9=9B=86=E6=A8=A1=E5=9D=97=EF=BC=8C=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=AE=B1=E5=A3=B3=E3=80=81=E5=86=85=E8=83=86=E3=80=81?= =?UTF-8?q?=E6=B3=A1=E5=90=8E=E6=95=B0=E6=8D=AE=E9=87=87=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../net6.0/Admin.Core.Api.AssemblyInfo.cs | 2 +- .../Admin.Core.Api.AssemblyInfoInputs.cache | 2 +- .../net6.0/Admin.Core.Common.AssemblyInfo.cs | 2 +- ...Admin.Core.Common.AssemblyInfoInputs.cache | 2 +- .../Admin.Core.EventBus.AssemblyInfo.cs | 2 +- ...min.Core.EventBus.AssemblyInfoInputs.cache | 2 +- .../Admin.Core.Extensions.AssemblyInfo.cs | 2 +- ...n.Core.Extensions.AssemblyInfoInputs.cache | 2 +- .../Admin.Core.FrameWork.AssemblyInfo.cs | 2 +- ...in.Core.FrameWork.AssemblyInfoInputs.cache | 2 +- .../Admin.Core.IRepository.AssemblyInfo.cs | 2 +- ....Core.IRepository.AssemblyInfoInputs.cache | 2 +- .../Admin.Core.IService.AssemblyInfo.cs | 2 +- ...min.Core.IService.AssemblyInfoInputs.cache | 2 +- .../net6.0/Admin.Core.Model.AssemblyInfo.cs | 2 +- .../Admin.Core.Model.AssemblyInfoInputs.cache | 2 +- ...Admin.Core.RealTimeService.AssemblyInfo.cs | 2 +- ...e.RealTimeService.AssemblyInfoInputs.cache | 2 +- .../Admin.Core.Repository.AssemblyInfo.cs | 2 +- ...n.Core.Repository.AssemblyInfoInputs.cache | 2 +- .../Admin.Core.Serilog.Es.AssemblyInfo.cs | 2 +- ...n.Core.Serilog.Es.AssemblyInfoInputs.cache | 2 +- .../net6.0/Admin.Core.Service.AssemblyInfo.cs | 2 +- ...dmin.Core.Service.AssemblyInfoInputs.cache | 2 +- .../net6.0/Admin.Core.Tasks.AssemblyInfo.cs | 2 +- .../Admin.Core.Tasks.AssemblyInfoInputs.cache | 2 +- .../DataCollectorFactory.cs | 52 ++++++++++- .../DataCollectorSetup.cs | 67 ++++++++++++++ .../Factory/BoxFoamFactory.cs | 91 +++++++++++++++++++ .../Factory/LinerStoreFactory.cs | 91 +++++++++++++++++++ .../Factory/PalletizFactory.cs | 67 +++----------- .../Factory/ShellStoreFactory.cs | 91 +++++++++++++++++++ .../HwControlLib.AssemblyInfo.cs | 2 +- .../HwControlLib.AssemblyInfoInputs.cache | 2 +- 34 files changed, 431 insertions(+), 84 deletions(-) create mode 100644 Aucma.Core.DataCollector/DataCollectorSetup.cs create mode 100644 Aucma.Core.DataCollector/Factory/BoxFoamFactory.cs create mode 100644 Aucma.Core.DataCollector/Factory/LinerStoreFactory.cs create mode 100644 Aucma.Core.DataCollector/Factory/ShellStoreFactory.cs diff --git a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfo.cs b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfo.cs index afc9914f..f2bf5dbf 100644 --- a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfo.cs +++ b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfo.cs @@ -15,7 +15,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Api")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+91808221759aca287573a9c1018fc2e65b1bfd59")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+95797c6d9a18bfc6da212ef8f1ab31fca740c669")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Api")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Api")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfoInputs.cache b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfoInputs.cache index 1fe19e64..d393015e 100644 --- a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfoInputs.cache +++ b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfoInputs.cache @@ -1 +1 @@ -7ce13daf26e56bd8d3c3406081a61aabff4db9fa4cbea6946a0de6ad91f7687f +b2337fe7e5d6fda0ca43b7463be7bbc56ef4d6f810a4050486b6e1940f30b088 diff --git a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs index 0759c892..3ed5a932 100644 --- a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs +++ b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Common")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+91808221759aca287573a9c1018fc2e65b1bfd59")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+95797c6d9a18bfc6da212ef8f1ab31fca740c669")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Common")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Common")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache index bc5bb666..a85eb88b 100644 --- a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache +++ b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache @@ -1 +1 @@ -62ae8b13d646c1bee38f596428b0c65aebc8cacc7f8546b0fc7f279f33ddbb5f +a618e8897232ac6ea4e91122b9779d78e457ffe9a6ccd359c19bbb88b3c45edd diff --git a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs index de925944..85d0ea9b 100644 --- a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs +++ b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.EventBus")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+91808221759aca287573a9c1018fc2e65b1bfd59")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+95797c6d9a18bfc6da212ef8f1ab31fca740c669")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.EventBus")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.EventBus")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache index 360a1fdc..2c880bc1 100644 --- a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache +++ b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache @@ -1 +1 @@ -9f6d3940f2a70f8fd050d6fe20a1178b54354adc92bcb268eeb7e95d388fdd79 +ea3e4733aaa18e40a302d1139b12a468c5c4b1a7942ddaa4050bf9fc4640f955 diff --git a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs index f0a23bfd..fdac58fe 100644 --- a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs +++ b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Extensions")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+91808221759aca287573a9c1018fc2e65b1bfd59")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+95797c6d9a18bfc6da212ef8f1ab31fca740c669")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Extensions")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Extensions")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache index 9f6c42c3..ad3408f5 100644 --- a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache +++ b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache @@ -1 +1 @@ -6fb9d9c8187ad98357a41595af7692e35588e2f7d760b068489ada94d6798f74 +0f93dbc77ec673200bd7368b0df86e38f4ed62930373a730eaff15686dd7c7b6 diff --git a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs index ea7fb157..e1e63863 100644 --- a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs +++ b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.FrameWork")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+91808221759aca287573a9c1018fc2e65b1bfd59")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+95797c6d9a18bfc6da212ef8f1ab31fca740c669")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.FrameWork")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.FrameWork")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache index ecb2e587..d5e1da33 100644 --- a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache +++ b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache @@ -1 +1 @@ -7a1813a9a5d1d19b18e25488399390e5b0d29d88f5978494e031c73a36870caf +7fb166de25c175187e65a7a6f6ffb17b4d86d3d6f47f3d39800f450985890ae4 diff --git a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfo.cs b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfo.cs index 8c521226..17a0de31 100644 --- a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfo.cs +++ b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.IRepository")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+91808221759aca287573a9c1018fc2e65b1bfd59")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+95797c6d9a18bfc6da212ef8f1ab31fca740c669")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.IRepository")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.IRepository")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfoInputs.cache b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfoInputs.cache index d31786d7..4629c6f7 100644 --- a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfoInputs.cache +++ b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfoInputs.cache @@ -1 +1 @@ -e8dda769d754c133979679ea930a6ef1414630c974be509211ac8b020c80e812 +d1de46d4cea04a95f16ffdd3c5c78f8a095cd4a4de4af8bdb815cf8eb11b5ece diff --git a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfo.cs b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfo.cs index 1a38e4bb..af3aeffa 100644 --- a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfo.cs +++ b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.IService")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+91808221759aca287573a9c1018fc2e65b1bfd59")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+95797c6d9a18bfc6da212ef8f1ab31fca740c669")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.IService")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.IService")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfoInputs.cache b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfoInputs.cache index 123e1e63..ef920498 100644 --- a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfoInputs.cache +++ b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfoInputs.cache @@ -1 +1 @@ -ca087abdcdbbd7244fdd8502c33b3a29363be91638d305d0b22c5f768402d46f +2d250522305d6e2e5025a59c967b0a68c64d3d1a170cbaaff284984ea0372026 diff --git a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs index 11de203e..7df7ac0c 100644 --- a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs +++ b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Model")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+91808221759aca287573a9c1018fc2e65b1bfd59")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+95797c6d9a18bfc6da212ef8f1ab31fca740c669")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Model")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Model")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfoInputs.cache b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfoInputs.cache index e131b515..02dfce6d 100644 --- a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfoInputs.cache +++ b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfoInputs.cache @@ -1 +1 @@ -791e45baa48214d65e9377a8397597943892aba54a1a10d284895eacbbfa4352 +8561683fdff2f8094ea69771ec03792a7434406a280d6b6087be70ccf45950b5 diff --git a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs index 174fdd1b..2792bab6 100644 --- a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs +++ b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.RealTimeService")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+91808221759aca287573a9c1018fc2e65b1bfd59")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+95797c6d9a18bfc6da212ef8f1ab31fca740c669")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.RealTimeService")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.RealTimeService")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache index 40ad3584..73378fcb 100644 --- a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache +++ b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache @@ -1 +1 @@ -b90aaf21ce2e9da9e13b0fb64d65797eba9a93af543963c310c73e113c750708 +ba4c9f410f5a53ca2418c45fb63499b8408c300e758240a71ce6f546c9f6e71a diff --git a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfo.cs b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfo.cs index 2956b448..96345368 100644 --- a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfo.cs +++ b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Repository")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+91808221759aca287573a9c1018fc2e65b1bfd59")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+95797c6d9a18bfc6da212ef8f1ab31fca740c669")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Repository")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Repository")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfoInputs.cache b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfoInputs.cache index 25b8adf1..41c7d1a1 100644 --- a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfoInputs.cache +++ b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfoInputs.cache @@ -1 +1 @@ -7ef6935943cbb87b58f408d9001fa5f238f2ee69bd00ae4bb77d9cdef1c5a8e6 +829e21d51dcc0fcc2158d7a2d0886e1f2eaf68c2cd64a201aa7728ea368ab90a diff --git a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs index 7a204c65..915a4ec8 100644 --- a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs +++ b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Serilog.Es")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+91808221759aca287573a9c1018fc2e65b1bfd59")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+95797c6d9a18bfc6da212ef8f1ab31fca740c669")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Serilog.Es")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Serilog.Es")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfoInputs.cache b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfoInputs.cache index a23e3ab9..7c08c3bb 100644 --- a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfoInputs.cache +++ b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfoInputs.cache @@ -1 +1 @@ -7e4c0482a63e6bdc9d58ba83f484a41ef7633ab886d66aa8de108234c74c3e9b +c8f478eecd1ef8a52cf42637f8b161109c9603f8ad626a88a98b9837d0907947 diff --git a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs index 73ce3340..5bbd43c6 100644 --- a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs +++ b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Service")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+91808221759aca287573a9c1018fc2e65b1bfd59")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+95797c6d9a18bfc6da212ef8f1ab31fca740c669")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Service")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Service")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache index a57cf2d5..ed3dc8ed 100644 --- a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache +++ b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache @@ -1 +1 @@ -64cffb2d314040efeb0c4c286bc1d1b31d9ca3601ab470ebea09444eaf3d81e8 +931cb7f6ab57ef1e4fe5830b07b1e7f8967fd7528de4847745341f2c4fa682bf diff --git a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs index 137c66cf..02bfd32f 100644 --- a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs +++ b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Tasks")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+91808221759aca287573a9c1018fc2e65b1bfd59")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+95797c6d9a18bfc6da212ef8f1ab31fca740c669")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Tasks")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Tasks")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache index 079fd69a..168a3dd3 100644 --- a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache +++ b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache @@ -1 +1 @@ -ed2444c9be6f03c06e36309150ba72a30e6eef0501c11fcb012bc3a49ae67b45 +daee51f4ae0b8018b8c418b16172fb8ecd139d668d52bb1ab537277927f58958 diff --git a/Aucma.Core.DataCollector/DataCollectorFactory.cs b/Aucma.Core.DataCollector/DataCollectorFactory.cs index e21fd67a..3f7218f0 100644 --- a/Aucma.Core.DataCollector/DataCollectorFactory.cs +++ b/Aucma.Core.DataCollector/DataCollectorFactory.cs @@ -1,4 +1,8 @@ -using Admin.Core.Model.Model_New; +using Admin.Core.IService.IService_New; +using Admin.Core.Model.Model_New; +using Aucma.Core.DataCollector.Factory; +using Aucma.Core.HwPLc; +using log4net; using System; using System.Collections.Generic; using System.Linq; @@ -12,6 +16,18 @@ namespace Aucma.Core.DataCollector /// public abstract class DataCollectorFactory { + public readonly log4net.ILog _logger = LogManager.GetLogger(typeof(DataCollectorFactory)); + + public readonly IBaseDeviceParamServices _deviceParamServices; + public readonly IRecordDeviceAlarmInfoServices _deviceAlarmInfoServices; + public readonly IRecordDeviceElectricityServices _deviceElectricityServices; + + public DataCollectorFactory(IBaseDeviceParamServices deviceParamServices, IRecordDeviceAlarmInfoServices deviceAlarmInfoServices, IRecordDeviceElectricityServices deviceElectricityServices) + { + _deviceParamServices = deviceParamServices; + _deviceAlarmInfoServices = deviceAlarmInfoServices; + _deviceElectricityServices = deviceElectricityServices; + } /// /// 采集设备报警信息 @@ -24,5 +40,39 @@ namespace Aucma.Core.DataCollector /// /// public abstract void CollectDeviceElectricity(out Record_DeviceElectricity deviceElectricity); + + /// + /// 读取PLC数据 + /// + /// + /// + /// + /// + public void ReadParamValueByPlc(IPlc _plc, string addr, string dataType, out int paramValue) + { + object result = null; + switch (dataType) + { + case "int": + result = _plc.ReadInt16(addr); + break; + case "float": + result = _plc.ReadFloat(addr); + break; + case "bool": + result = _plc.ReadBool(addr); + break; + default: + result = _plc.ReadInt16(addr); + break; + } + + if (result == null) + { + result = "0"; + } + + paramValue = Convert.ToInt32(result); + } } } diff --git a/Aucma.Core.DataCollector/DataCollectorSetup.cs b/Aucma.Core.DataCollector/DataCollectorSetup.cs new file mode 100644 index 00000000..f7f95a90 --- /dev/null +++ b/Aucma.Core.DataCollector/DataCollectorSetup.cs @@ -0,0 +1,67 @@ +using Admin.Core.Common; +using Admin.Core.IService.IService_New; +using Aucma.Core.DataCollector.Factory; +using Microsoft.AspNetCore.Builder; +using Microsoft.Extensions.DependencyInjection; +using Org.BouncyCastle.Crypto.Tls; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Aucma.Core.DataCollector +{ + public static class DataCollectorSetup + { + public static IApplicationBuilder UseDataCollectorExtensions(this IApplicationBuilder app) + { + if (app == null) throw new ArgumentNullException(nameof(app)); + + var stationCode = Appsettings.app("StationInfo", "StationCode"); + + var _deviceParamServices = app.ApplicationServices.GetService(); + var _deviceAlarmInfoServices = app.ApplicationServices.GetService(); + var _deviceElectricityServices = app.ApplicationServices.GetService< IRecordDeviceElectricityServices>(); + + if (!string.IsNullOrEmpty(stationCode)) + { + if(stationCode == "1002") //箱壳、内胆，包含预装线、集存库 + { + Task.Run(() => + { + DataCollectorFactory collector = new ShellStoreFactory(_deviceParamServices, _deviceAlarmInfoServices, _deviceElectricityServices); + + Parallel.Invoke(() => collector.CollectDeviceAlarmInfo(out var alarmInfos), () => collector.CollectDeviceElectricity(out var electricity)); + }); + + Task.Run(() => + { + DataCollectorFactory collector = new LinerStoreFactory(_deviceParamServices, _deviceAlarmInfoServices, _deviceElectricityServices); + + Parallel.Invoke(() => collector.CollectDeviceAlarmInfo(out var alarmInfos), () => collector.CollectDeviceElectricity(out var electricity)); + }); + }else if(stationCode == "1005")//泡前库、发泡线、发泡机、泡后库 + { + Task.Run(() => + { + DataCollectorFactory collector = new BoxFoamFactory(_deviceParamServices, _deviceAlarmInfoServices, _deviceElectricityServices); + + Parallel.Invoke(() => collector.CollectDeviceAlarmInfo(out var alarmInfos), () => collector.CollectDeviceElectricity(out var electricity)); + }); + }else if(stationCode == "1010")//成品分垛 + { + Task.Run(() => + { + DataCollectorFactory collector = new PalletizFactory(_deviceParamServices, _deviceAlarmInfoServices, _deviceElectricityServices); + + Parallel.Invoke(() => collector.CollectDeviceAlarmInfo(out var alarmInfos), () => collector.CollectDeviceElectricity(out var electricity)); + }); + } + } + + + return app; + } + } +} diff --git a/Aucma.Core.DataCollector/Factory/BoxFoamFactory.cs b/Aucma.Core.DataCollector/Factory/BoxFoamFactory.cs new file mode 100644 index 00000000..30566052 --- /dev/null +++ b/Aucma.Core.DataCollector/Factory/BoxFoamFactory.cs @@ -0,0 +1,91 @@ +using Admin.Core.IService.IService_New; +using Admin.Core.Model.Model_New; +using Aucma.Core.HwPLc; +using log4net; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Aucma.Core.DataCollector.Factory +{ + /// + /// 泡前库、发泡线、发泡机、泡后库数据采集 + /// + public class BoxFoamFactory : DataCollectorFactory + { + private PlcModel _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("Test")); + + public BoxFoamFactory(IBaseDeviceParamServices deviceParamServices, IRecordDeviceAlarmInfoServices deviceAlarmInfoServices, IRecordDeviceElectricityServices deviceElectricityServices) : base(deviceParamServices, deviceAlarmInfoServices, deviceElectricityServices) + { + } + + /// + /// 采集泡前库、发泡线、发泡机、泡后库设备报警信息 + /// + /// + public override void CollectDeviceAlarmInfo(out List deviceAlarmInfos) + { + while (true) + { + try + { + + if (_plc != null) + { + Console.WriteLine($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}采集泡前库、发泡线、发泡机、泡后库设备报警信息"); + var plc = _plc.plc; + + var deviceParams = base._deviceParamServices.Query(x => x.DeviceCode == "E00009"); + + if (deviceParams != null) + { + deviceAlarmInfos = new List(); + string batchId = System.Guid.NewGuid().ToString("N"); + foreach (var item in deviceParams) + { + base.ReadParamValueByPlc(plc, item.ParamAddress, item.ParamType, out int paramValue); + + if (paramValue != 0) + { + deviceAlarmInfos.Add(new Record_DeviceAlarmInfo() + { + BatchId = batchId, + DeviceCode = item.DeviceCode, + DeviceType = "1", + ParamCode = item.ParamCode, + ParamValue = paramValue.ToString(), + AlarmInfo = item.ParamName, + AlarmTime = DateTime.Now, + CreadtedTime = DateTime.Now, + }); + } + + } + if (deviceAlarmInfos.Count > 0) + { + base._deviceAlarmInfoServices.AddAsync(deviceAlarmInfos); + } + } + Task.Delay(1000 * 5).Wait(); + } + else + { + Task.Delay(1000 * 5).Wait(); + _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("Test")); + } + } + catch (Exception ex) + { + base._logger.Error($"采集泡前库、发泡线、发泡机、泡后库设备报警信息:{ex.Message}"); + } + } + } + + public override void CollectDeviceElectricity(out Record_DeviceElectricity deviceElectricity) + { + throw new NotImplementedException(); + } + } +} diff --git a/Aucma.Core.DataCollector/Factory/LinerStoreFactory.cs b/Aucma.Core.DataCollector/Factory/LinerStoreFactory.cs new file mode 100644 index 00000000..d8f90199 --- /dev/null +++ b/Aucma.Core.DataCollector/Factory/LinerStoreFactory.cs @@ -0,0 +1,91 @@ +using Admin.Core.IService.IService_New; +using Admin.Core.Model.Model_New; +using Aucma.Core.HwPLc; +using log4net; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Aucma.Core.DataCollector.Factory +{ + /// + /// 内胆预装、内胆库数据采集 + /// + public class LinerStoreFactory : DataCollectorFactory + { + private PlcModel _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("Test")); + + public LinerStoreFactory(IBaseDeviceParamServices deviceParamServices, IRecordDeviceAlarmInfoServices deviceAlarmInfoServices, IRecordDeviceElectricityServices deviceElectricityServices) : base(deviceParamServices, deviceAlarmInfoServices, deviceElectricityServices) + { + } + + /// + /// 采集内胆预装、内胆库设备报警信息 + /// + /// + public override void CollectDeviceAlarmInfo(out List deviceAlarmInfos) + { + while (true) + { + try + { + + if (_plc != null) + { + Console.WriteLine($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}采集内胆预装、内胆库设备报警信息"); + var plc = _plc.plc; + + var deviceParams = base._deviceParamServices.Query(x => x.DeviceCode == "E00024" || x.DeviceCode == "E00032"); + + if (deviceParams != null) + { + deviceAlarmInfos = new List(); + string batchId = System.Guid.NewGuid().ToString("N"); + foreach (var item in deviceParams) + { + base.ReadParamValueByPlc(plc, item.ParamAddress, item.ParamType, out int paramValue); + + if (paramValue != 0) + { + deviceAlarmInfos.Add(new Record_DeviceAlarmInfo() + { + BatchId = batchId, + DeviceCode = item.DeviceCode, + DeviceType = "1", + ParamCode = item.ParamCode, + ParamValue = paramValue.ToString(), + AlarmInfo = item.ParamName, + AlarmTime = DateTime.Now, + CreadtedTime = DateTime.Now, + }); + } + + } + if (deviceAlarmInfos.Count > 0) + { + base._deviceAlarmInfoServices.AddAsync(deviceAlarmInfos); + } + } + Task.Delay(1000 * 5).Wait(); + } + else + { + Task.Delay(1000 * 5).Wait(); + _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("Test")); + } + } + catch (Exception ex) + { + base._logger.Error($"采集内胆预装、内胆库设备报警信息异常:{ex.Message}"); + } + } + } + + public override void CollectDeviceElectricity(out Record_DeviceElectricity deviceElectricity) + { + throw new NotImplementedException(); + } + } +} diff --git a/Aucma.Core.DataCollector/Factory/PalletizFactory.cs b/Aucma.Core.DataCollector/Factory/PalletizFactory.cs index 3039d939..43ae9cc9 100644 --- a/Aucma.Core.DataCollector/Factory/PalletizFactory.cs +++ b/Aucma.Core.DataCollector/Factory/PalletizFactory.cs @@ -12,23 +12,14 @@ namespace Aucma.Core.DataCollector.Factory /// public class PalletizFactory : DataCollectorFactory { + private PlcModel _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("Test")); - private static readonly log4net.ILog _logger = LogManager.GetLogger(typeof(PalletizFactory)); - private readonly IBaseDeviceParamServices _deviceParamServices; - private readonly IRecordDeviceAlarmInfoServices _deviceAlarmInfoServices; - private readonly IRecordDeviceElectricityServices _deviceElectricityServices; - - public PalletizFactory(IBaseDeviceParamServices deviceParamServices, IRecordDeviceAlarmInfoServices deviceAlarmInfoServices, IRecordDeviceElectricityServices deviceElectricityServices) + public PalletizFactory(IBaseDeviceParamServices deviceParamServices, IRecordDeviceAlarmInfoServices deviceAlarmInfoServices, IRecordDeviceElectricityServices deviceElectricityServices) : base(deviceParamServices, deviceAlarmInfoServices, deviceElectricityServices) { - _deviceParamServices = deviceParamServices; - _deviceAlarmInfoServices = deviceAlarmInfoServices; - _deviceElectricityServices = deviceElectricityServices; } - private PlcModel _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("Test")); - /// - /// 采集设备报警信息 + /// 采集成品分垛设备报警信息 /// /// /// @@ -41,10 +32,10 @@ namespace Aucma.Core.DataCollector.Factory if (_plc != null) { - Console.WriteLine($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}采集设备报警信息"); + Console.WriteLine($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}采集成品分垛设备报警信息"); var plc = _plc.plc; - var deviceParams = _deviceParamServices.Query(x => x.DeviceCode == "E00002"); + var deviceParams = base._deviceParamServices.Query(x => x.DeviceCode == "E00002"); if (deviceParams != null) { @@ -52,9 +43,9 @@ namespace Aucma.Core.DataCollector.Factory string batchId = System.Guid.NewGuid().ToString("N"); foreach (var item in deviceParams) { - ReadParamValueByPlc(plc, item.ParamAddress, item.ParamType, out string paramValue); + base.ReadParamValueByPlc(plc, item.ParamAddress, item.ParamType, out int paramValue); - if (paramValue != "0") + if (paramValue != 0) { deviceAlarmInfos.Add(new Record_DeviceAlarmInfo() { @@ -62,7 +53,7 @@ namespace Aucma.Core.DataCollector.Factory DeviceCode = item.DeviceCode, DeviceType = "1", ParamCode = item.ParamCode, - ParamValue = paramValue as string, + ParamValue = paramValue.ToString(), AlarmInfo = item.ParamName, AlarmTime = DateTime.Now, CreadtedTime = DateTime.Now, @@ -72,7 +63,7 @@ namespace Aucma.Core.DataCollector.Factory } if (deviceAlarmInfos.Count > 0) { - _deviceAlarmInfoServices.AddAsync(deviceAlarmInfos); + base._deviceAlarmInfoServices.AddAsync(deviceAlarmInfos); } } Task.Delay(1000 * 5).Wait(); @@ -85,7 +76,7 @@ namespace Aucma.Core.DataCollector.Factory } catch(Exception ex) { - _logger.Error($"成品分垛设备报警信息采集异常:{ex.Message}"); + base._logger.Error($"采集成品分垛设备报警信息异常:{ex.Message}"); } } } @@ -150,7 +141,7 @@ namespace Aucma.Core.DataCollector.Factory if(deviceElectricity.Zxyg > 0) { - var result = _deviceElectricityServices.AddAsync(deviceElectricity); + var result = base._deviceElectricityServices.AddAsync(deviceElectricity); } } Task.Delay(1000 * 5).Wait(); @@ -164,45 +155,11 @@ namespace Aucma.Core.DataCollector.Factory } catch(Exception ex) { - _logger.Error($"成品分垛设备用电数据采集异常:{ex.Message}"); + base._logger.Error($"成品分垛设备用电数据采集异常:{ex.Message}"); } } } - /// - /// 读取PLC数据 - /// - /// - /// - /// - /// - private void ReadParamValueByPlc(IPlc _plc,string addr,string dataType,out string paramValue) - { - object result = null; - switch (dataType) - { - case "int": - result = _plc.ReadInt16(addr); - break; - case "float": - result = _plc.ReadFloat(addr); - break; - case "bool": - result = _plc.ReadBool(addr); - break; - default: - result = _plc.ReadInt16(addr); - break; - } - - if(result == null) - { - result = "0"; - } - - paramValue = result.ToString(); - } - /// /// 用电数据解析 /// diff --git a/Aucma.Core.DataCollector/Factory/ShellStoreFactory.cs b/Aucma.Core.DataCollector/Factory/ShellStoreFactory.cs new file mode 100644 index 00000000..31eed6cc --- /dev/null +++ b/Aucma.Core.DataCollector/Factory/ShellStoreFactory.cs @@ -0,0 +1,91 @@ +using Admin.Core.IService.IService_New; +using Admin.Core.Model.Model_New; +using Aucma.Core.HwPLc; +using log4net; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Aucma.Core.DataCollector.Factory +{ + /// + /// 箱壳预装、箱壳库数据采集 + /// + public class ShellStoreFactory : DataCollectorFactory + { + private PlcModel _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("Test")); + + public ShellStoreFactory(IBaseDeviceParamServices deviceParamServices, IRecordDeviceAlarmInfoServices deviceAlarmInfoServices, IRecordDeviceElectricityServices deviceElectricityServices) : base(deviceParamServices, deviceAlarmInfoServices, deviceElectricityServices) + { + } + + /// + /// 采集箱壳预装、箱壳库设备报警信息 + /// + /// + public override void CollectDeviceAlarmInfo(out List deviceAlarmInfos) + { + while (true) + { + try + { + + if (_plc != null) + { + Console.WriteLine($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}采集箱壳预装、箱壳库设备报警信息"); + var plc = _plc.plc; + + var deviceParams = base._deviceParamServices.Query(x => x.DeviceCode == "E00019" || x.DeviceCode == "E00031"); + + if (deviceParams != null) + { + deviceAlarmInfos = new List(); + string batchId = System.Guid.NewGuid().ToString("N"); + foreach (var item in deviceParams) + { + base.ReadParamValueByPlc(plc, item.ParamAddress, item.ParamType, out int paramValue); + + if (paramValue != 0) + { + deviceAlarmInfos.Add(new Record_DeviceAlarmInfo() + { + BatchId = batchId, + DeviceCode = item.DeviceCode, + DeviceType = "1", + ParamCode = item.ParamCode, + ParamValue = paramValue.ToString(), + AlarmInfo = item.ParamName, + AlarmTime = DateTime.Now, + CreadtedTime = DateTime.Now, + }); + } + + } + if (deviceAlarmInfos.Count > 0) + { + base._deviceAlarmInfoServices.AddAsync(deviceAlarmInfos); + } + } + Task.Delay(1000 * 5).Wait(); + } + else + { + Task.Delay(1000 * 5).Wait(); + _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("Test")); + } + } + catch (Exception ex) + { + base._logger.Error($"采集箱壳预装、箱壳库设备报警信息异常:{ex.Message}"); + } + } + } + + public override void CollectDeviceElectricity(out Record_DeviceElectricity deviceElectricity) + { + throw new NotImplementedException(); + } + } +} diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfo.cs b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfo.cs index 1dc23a92..4a33a11a 100644 --- a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfo.cs +++ b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("HwControlLib")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+91808221759aca287573a9c1018fc2e65b1bfd59")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+95797c6d9a18bfc6da212ef8f1ab31fca740c669")] [assembly: System.Reflection.AssemblyProductAttribute("HwControlLib")] [assembly: System.Reflection.AssemblyTitleAttribute("HwControlLib")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfoInputs.cache b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfoInputs.cache index 1608a5dd..3d9b2ffc 100644 --- a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfoInputs.cache +++ b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfoInputs.cache @@ -1 +1 @@ -49ea3a11ac512c6a9f0475e17a7baf5c555a64a4dbb032b671d1b48f6eb1e163 +540ef5d666d7f5ad016f7d96d8ec52a237608fb458897649dffe82d6e1a7f754 From d543bd47abbff9762adec5f4401d6abc5fc05815 Mon Sep 17 00:00:00 2001 From: wenjy Date: Tue, 26 Mar 2024 19:06:02 +0800 Subject: [PATCH 3/4] =?UTF-8?q?change=20-=20=E6=95=B0=E6=8D=AE=E9=87=87?= =?UTF-8?q?=E9=9B=86=E5=88=9D=E5=A7=8B=E5=8C=96=E5=BC=82=E5=B8=B8=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin.Core.Api.csproj.nuget.dgspec.json | 804 +++++++++++------- .../obj/Admin.Core.Api.csproj.nuget.g.props | 14 +- .../net6.0/Admin.Core.Api.AssemblyInfo.cs | 2 +- .../Admin.Core.Api.AssemblyInfoInputs.cache | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 4 +- .../Debug/net6.0/Admin.Core.Api.assets.cache | Bin 143057 -> 144998 bytes Admin.Core.Api/obj/project.assets.json | 52 +- Admin.Core.Api/obj/project.nuget.cache | 458 +++++----- .../net6.0/Admin.Core.Common.AssemblyInfo.cs | 10 +- ...Admin.Core.Common.AssemblyInfoInputs.cache | 10 +- ....GeneratedMSBuildEditorConfig.editorconfig | 4 +- .../Admin.Core.EventBus.AssemblyInfo.cs | 10 +- ...min.Core.EventBus.AssemblyInfoInputs.cache | 10 +- ....GeneratedMSBuildEditorConfig.editorconfig | 4 +- .../Admin.Core.Extensions.AssemblyInfo.cs | 10 +- ...n.Core.Extensions.AssemblyInfoInputs.cache | 10 +- ....GeneratedMSBuildEditorConfig.editorconfig | 4 +- .../Admin.Core.FrameWork.AssemblyInfo.cs | 10 +- ...in.Core.FrameWork.AssemblyInfoInputs.cache | 10 +- ....GeneratedMSBuildEditorConfig.editorconfig | 4 +- .../Admin.Core.IRepository.AssemblyInfo.cs | 6 +- ....Core.IRepository.AssemblyInfoInputs.cache | 6 +- ....GeneratedMSBuildEditorConfig.editorconfig | 4 +- .../Admin.Core.IService.AssemblyInfo.cs | 6 +- ...min.Core.IService.AssemblyInfoInputs.cache | 6 +- ....GeneratedMSBuildEditorConfig.editorconfig | 4 +- .../net6.0/Admin.Core.Model.AssemblyInfo.cs | 6 +- .../Admin.Core.Model.AssemblyInfoInputs.cache | 6 +- ....GeneratedMSBuildEditorConfig.editorconfig | 4 +- ...Admin.Core.RealTimeService.AssemblyInfo.cs | 10 +- ...e.RealTimeService.AssemblyInfoInputs.cache | 10 +- ....GeneratedMSBuildEditorConfig.editorconfig | 4 +- .../Admin.Core.Repository.AssemblyInfo.cs | 6 +- ...n.Core.Repository.AssemblyInfoInputs.cache | 6 +- ....GeneratedMSBuildEditorConfig.editorconfig | 4 +- .../Admin.Core.Serilog.Es.AssemblyInfo.cs | 10 +- ...n.Core.Serilog.Es.AssemblyInfoInputs.cache | 10 +- ....GeneratedMSBuildEditorConfig.editorconfig | 4 +- .../net6.0/Admin.Core.Service.AssemblyInfo.cs | 6 +- ...dmin.Core.Service.AssemblyInfoInputs.cache | 6 +- ....GeneratedMSBuildEditorConfig.editorconfig | 4 +- .../net6.0/Admin.Core.Tasks.AssemblyInfo.cs | 10 +- .../Admin.Core.Tasks.AssemblyInfoInputs.cache | 10 +- ....GeneratedMSBuildEditorConfig.editorconfig | 4 +- .../DataCollectorSetup.cs | 61 +- .../GeneratedInternalTypeHelper.g.i.cs | 2 +- .../HwControlLib.AssemblyInfo.cs | 2 +- .../HwControlLib.AssemblyInfoInputs.cache | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 4 +- .../net6.0-windows/HwControlLib.assets.cache | Bin 239 -> 324 bytes .../HwControlLib_MarkupCompile.i.cache | 6 +- .../obj/HwControlLib.csproj.nuget.dgspec.json | 31 +- .../obj/HwControlLib.csproj.nuget.g.props | 10 +- HwControlLib/obj/project.assets.json | 33 +- HwControlLib/obj/project.nuget.cache | 4 +- 55 files changed, 924 insertions(+), 815 deletions(-) diff --git a/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.dgspec.json b/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.dgspec.json index 5173e3e6..d14128d3 100644 --- a/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.dgspec.json +++ b/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.dgspec.json @@ -1,23 +1,26 @@ { "format": 1, "restore": { - "E:\\c#\\AUCMA\\new\\Admin.Core.Api\\Admin.Core.Api.csproj": {} + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj": {} }, "projects": { - "E:\\c#\\AUCMA\\new\\Admin.Core.Api\\Admin.Core.Api.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\c#\\AUCMA\\new\\Admin.Core.Api\\Admin.Core.Api.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", "projectName": "Admin.Core.Api", - "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Api\\Admin.Core.Api.csproj", - "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", - "outputPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Api\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" + "D:\\开发环境\\DevExpress\\Components\\Offline Packages", + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -25,22 +28,22 @@ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "C:\\Program Files\\dotnet\\sdk\\7.0.306\\Sdks\\Microsoft.NET.Sdk.Web\\library-packs": {}, - "https://api.nuget.org/v3/index.json": {} + "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "E:\\c#\\AUCMA\\new\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": { - "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj" }, - "E:\\c#\\AUCMA\\new\\Admin.Core.Service\\Admin.Core.Service.csproj": { - "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Service\\Admin.Core.Service.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj" }, - "E:\\c#\\AUCMA\\new\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { - "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj" } } } @@ -49,6 +52,11 @@ "warnAsError": [ "NU1605" ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" } }, "frameworks": { @@ -83,24 +91,27 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" } } }, - "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj", "projectName": "Admin.Core.Common", - "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj", - "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", - "outputPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" + "D:\\开发环境\\DevExpress\\Components\\Offline Packages", + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -108,15 +119,16 @@ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "E:\\c#\\AUCMA\\new\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj": { - "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj" } } } @@ -125,6 +137,11 @@ "warnAsError": [ "NU1605" ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" } }, "frameworks": { @@ -272,24 +289,27 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" } } }, - "E:\\c#\\AUCMA\\new\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\c#\\AUCMA\\new\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj", "projectName": "Admin.Core.EventBus", - "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj", - "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", - "outputPath": "E:\\c#\\AUCMA\\new\\Admin.Core.EventBus\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" + "D:\\开发环境\\DevExpress\\Components\\Offline Packages", + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -297,15 +317,16 @@ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" } } } @@ -314,6 +335,11 @@ "warnAsError": [ "NU1605" ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" } }, "frameworks": { @@ -345,24 +371,27 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" } } }, - "E:\\c#\\AUCMA\\new\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\c#\\AUCMA\\new\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj", "projectName": "Admin.Core.Extensions", - "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj", - "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", - "outputPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Extensions\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" + "D:\\开发环境\\DevExpress\\Components\\Offline Packages", + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -370,51 +399,52 @@ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" }, - "E:\\c#\\AUCMA\\new\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj": { - "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj" }, - "E:\\c#\\AUCMA\\new\\Admin.Core.Repository\\Admin.Core.Repository.csproj": { - "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Repository\\Admin.Core.Repository.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj" }, - "E:\\c#\\AUCMA\\new\\Admin.Core.Service\\Admin.Core.Service.csproj": { - "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Service\\Admin.Core.Service.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj" }, - "E:\\c#\\AUCMA\\new\\Admin.Core.Socket\\Admin.Core.Socket.csproj": { - "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Socket\\Admin.Core.Socket.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Socket\\Admin.Core.Socket.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Socket\\Admin.Core.Socket.csproj" }, - "E:\\c#\\AUCMA\\new\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { - "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj" }, - "E:\\c#\\AUCMA\\new\\Aucma.Core.PerfusionTask\\Aucma.Core.PerfusionTask.csproj": { - "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.PerfusionTask\\Aucma.Core.PerfusionTask.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PerfusionTask\\Aucma.Core.PerfusionTask.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PerfusionTask\\Aucma.Core.PerfusionTask.csproj" }, - "E:\\c#\\AUCMA\\new\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj": { - "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj" }, - "E:\\c#\\AUCMA\\new\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj": { - "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj" }, - "E:\\c#\\AUCMA\\new\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": { - "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj" }, - "E:\\c#\\AUCMA\\new\\Aucma.Core.SheetMetalTasks\\Aucma.Core.SheetMetalTasks.csproj": { - "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.SheetMetalTasks\\Aucma.Core.SheetMetalTasks.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.SheetMetalTasks\\Aucma.Core.SheetMetalTasks.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.SheetMetalTasks\\Aucma.Core.SheetMetalTasks.csproj" }, - "E:\\c#\\AUCMA\\new\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj": { - "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj" }, - "E:\\c#\\AUCMA\\new\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj": { - "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj" } } } @@ -423,6 +453,11 @@ "warnAsError": [ "NU1605" ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" } }, "frameworks": { @@ -450,24 +485,27 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" } } }, - "E:\\c#\\AUCMA\\new\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\c#\\AUCMA\\new\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj", "projectName": "Admin.Core.IRepository", - "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj", - "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", - "outputPath": "E:\\c#\\AUCMA\\new\\Admin.Core.IRepository\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" + "D:\\开发环境\\DevExpress\\Components\\Offline Packages", + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -475,18 +513,19 @@ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" }, - "E:\\c#\\AUCMA\\new\\Admin.Core.Model\\Admin.Core.Model.csproj": { - "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Model\\Admin.Core.Model.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj" } } } @@ -495,6 +534,11 @@ "warnAsError": [ "NU1605" ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" } }, "frameworks": { @@ -516,24 +560,27 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" } } }, - "E:\\c#\\AUCMA\\new\\Admin.Core.IService\\Admin.Core.IService.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\c#\\AUCMA\\new\\Admin.Core.IService\\Admin.Core.IService.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj", "projectName": "Admin.Core.IService", - "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.IService\\Admin.Core.IService.csproj", - "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", - "outputPath": "E:\\c#\\AUCMA\\new\\Admin.Core.IService\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" + "D:\\开发环境\\DevExpress\\Components\\Offline Packages", + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -541,18 +588,19 @@ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" }, - "E:\\c#\\AUCMA\\new\\Admin.Core.Model\\Admin.Core.Model.csproj": { - "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Model\\Admin.Core.Model.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj" } } } @@ -561,6 +609,11 @@ "warnAsError": [ "NU1605" ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" } }, "frameworks": { @@ -582,24 +635,27 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" } } }, - "E:\\c#\\AUCMA\\new\\Admin.Core.Model\\Admin.Core.Model.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\c#\\AUCMA\\new\\Admin.Core.Model\\Admin.Core.Model.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj", "projectName": "Admin.Core.Model", - "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Model\\Admin.Core.Model.csproj", - "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", - "outputPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Model\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" + "D:\\开发环境\\DevExpress\\Components\\Offline Packages", + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -607,15 +663,16 @@ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" } } } @@ -624,6 +681,11 @@ "warnAsError": [ "NU1605" ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" } }, "frameworks": { @@ -645,24 +707,27 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" } } }, - "E:\\c#\\AUCMA\\new\\Admin.Core.Repository\\Admin.Core.Repository.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\c#\\AUCMA\\new\\Admin.Core.Repository\\Admin.Core.Repository.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj", "projectName": "Admin.Core.Repository", - "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Repository\\Admin.Core.Repository.csproj", - "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", - "outputPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Repository\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" + "D:\\开发环境\\DevExpress\\Components\\Offline Packages", + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -670,15 +735,16 @@ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "E:\\c#\\AUCMA\\new\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { - "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj" } } } @@ -687,6 +753,11 @@ "warnAsError": [ "NU1605" ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" } }, "frameworks": { @@ -708,24 +779,27 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" } } }, - "E:\\c#\\AUCMA\\new\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\c#\\AUCMA\\new\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj", "projectName": "Admin.Core.Serilog.Es", - "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj", - "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", - "outputPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Serilog.Es\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" + "D:\\开发环境\\DevExpress\\Components\\Offline Packages", + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -733,8 +807,9 @@ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { @@ -746,6 +821,11 @@ "warnAsError": [ "NU1605" ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" } }, "frameworks": { @@ -797,24 +877,27 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" } } }, - "E:\\c#\\AUCMA\\new\\Admin.Core.Service\\Admin.Core.Service.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\c#\\AUCMA\\new\\Admin.Core.Service\\Admin.Core.Service.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj", "projectName": "Admin.Core.Service", - "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Service\\Admin.Core.Service.csproj", - "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", - "outputPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Service\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" + "D:\\开发环境\\DevExpress\\Components\\Offline Packages", + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -822,21 +905,22 @@ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "E:\\c#\\AUCMA\\new\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { - "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj" }, - "E:\\c#\\AUCMA\\new\\Admin.Core.IService\\Admin.Core.IService.csproj": { - "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.IService\\Admin.Core.IService.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj" }, - "E:\\c#\\AUCMA\\new\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { - "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj" } } } @@ -845,6 +929,11 @@ "warnAsError": [ "NU1605" ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" } }, "frameworks": { @@ -866,24 +955,27 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" } } }, - "E:\\c#\\AUCMA\\new\\Admin.Core.Socket\\Admin.Core.Socket.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Socket\\Admin.Core.Socket.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\c#\\AUCMA\\new\\Admin.Core.Socket\\Admin.Core.Socket.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Socket\\Admin.Core.Socket.csproj", "projectName": "Admin.Core.Socket", - "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Socket\\Admin.Core.Socket.csproj", - "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", - "outputPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Socket\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Socket\\Admin.Core.Socket.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Socket\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" + "D:\\开发环境\\DevExpress\\Components\\Offline Packages", + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -891,18 +983,19 @@ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" }, - "E:\\c#\\AUCMA\\new\\Admin.Core.IService\\Admin.Core.IService.csproj": { - "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.IService\\Admin.Core.IService.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj" } } } @@ -911,6 +1004,11 @@ "warnAsError": [ "NU1605" ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" } }, "frameworks": { @@ -946,24 +1044,27 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" } } }, - "E:\\c#\\AUCMA\\new\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\c#\\AUCMA\\new\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj", "projectName": "Admin.Core.Tasks", - "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj", - "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", - "outputPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Tasks\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" + "D:\\开发环境\\DevExpress\\Components\\Offline Packages", + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -971,27 +1072,28 @@ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" }, - "E:\\c#\\AUCMA\\new\\Admin.Core.Model\\Admin.Core.Model.csproj": { - "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Model\\Admin.Core.Model.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj" }, - "E:\\c#\\AUCMA\\new\\Admin.Core.Service\\Admin.Core.Service.csproj": { - "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Service\\Admin.Core.Service.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj" }, - "E:\\c#\\AUCMA\\new\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { - "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" }, - "E:\\c#\\AUCMA\\new\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": { - "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj" } } } @@ -1000,6 +1102,11 @@ "warnAsError": [ "NU1605" ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" } }, "frameworks": { @@ -1027,24 +1134,27 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" } } }, - "E:\\c#\\AUCMA\\new\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\c#\\AUCMA\\new\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj", "projectName": "Aucma.Core.HwPLc", - "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj", - "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", - "outputPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.HwPLc\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" + "D:\\开发环境\\DevExpress\\Components\\Offline Packages", + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -1052,8 +1162,9 @@ "netstandard2.1" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "netstandard2.1": { @@ -1065,6 +1176,11 @@ "warnAsError": [ "NU1605" ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" } }, "frameworks": { @@ -1092,24 +1208,27 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" } } }, - "E:\\c#\\AUCMA\\new\\Aucma.Core.PerfusionTask\\Aucma.Core.PerfusionTask.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PerfusionTask\\Aucma.Core.PerfusionTask.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\c#\\AUCMA\\new\\Aucma.Core.PerfusionTask\\Aucma.Core.PerfusionTask.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PerfusionTask\\Aucma.Core.PerfusionTask.csproj", "projectName": "Aucma.Core.PerfusionTask", - "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.PerfusionTask\\Aucma.Core.PerfusionTask.csproj", - "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", - "outputPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.PerfusionTask\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PerfusionTask\\Aucma.Core.PerfusionTask.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PerfusionTask\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" + "D:\\开发环境\\DevExpress\\Components\\Offline Packages", + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -1117,21 +1236,22 @@ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "E:\\c#\\AUCMA\\new\\Admin.Core.IService\\Admin.Core.IService.csproj": { - "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.IService\\Admin.Core.IService.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj" }, - "E:\\c#\\AUCMA\\new\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { - "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" }, - "E:\\c#\\AUCMA\\new\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { - "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj" } } } @@ -1140,6 +1260,11 @@ "warnAsError": [ "NU1605" ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" } }, "frameworks": { @@ -1161,24 +1286,27 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" } } }, - "E:\\c#\\AUCMA\\new\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\c#\\AUCMA\\new\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj", "projectName": "Aucma.Core.PLc", - "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj", - "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", - "outputPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.PLc\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" + "D:\\开发环境\\DevExpress\\Components\\Offline Packages", + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -1186,8 +1314,9 @@ "netstandard2.1" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "netstandard2.1": { @@ -1199,6 +1328,11 @@ "warnAsError": [ "NU1605" ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" } }, "frameworks": { @@ -1226,24 +1360,27 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" } } }, - "E:\\c#\\AUCMA\\new\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\c#\\AUCMA\\new\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj", "projectName": "Aucma.Core.RunPlc", - "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj", - "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", - "outputPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.RunPlc\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" + "D:\\开发环境\\DevExpress\\Components\\Offline Packages", + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -1251,18 +1388,19 @@ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" }, - "E:\\c#\\AUCMA\\new\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { - "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" } } } @@ -1271,6 +1409,11 @@ "warnAsError": [ "NU1605" ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" } }, "frameworks": { @@ -1292,24 +1435,27 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" } } }, - "E:\\c#\\AUCMA\\new\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\c#\\AUCMA\\new\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj", "projectName": "Aucma.Core.ScannerGun", - "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj", - "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", - "outputPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.ScannerGun\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" + "D:\\开发环境\\DevExpress\\Components\\Offline Packages", + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -1317,15 +1463,16 @@ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" } } } @@ -1334,6 +1481,11 @@ "warnAsError": [ "NU1605" ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" } }, "frameworks": { @@ -1361,24 +1513,27 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" } } }, - "E:\\c#\\AUCMA\\new\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\c#\\AUCMA\\new\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj", "projectName": "Aucma.Core.Scanner", - "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj", - "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", - "outputPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.Scanner\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" + "D:\\开发环境\\DevExpress\\Components\\Offline Packages", + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -1386,18 +1541,19 @@ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" }, - "E:\\c#\\AUCMA\\new\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { - "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj" } } } @@ -1406,6 +1562,11 @@ "warnAsError": [ "NU1605" ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" } }, "frameworks": { @@ -1433,24 +1594,27 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" } } }, - "E:\\c#\\AUCMA\\new\\Aucma.Core.SheetMetalTasks\\Aucma.Core.SheetMetalTasks.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.SheetMetalTasks\\Aucma.Core.SheetMetalTasks.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\c#\\AUCMA\\new\\Aucma.Core.SheetMetalTasks\\Aucma.Core.SheetMetalTasks.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.SheetMetalTasks\\Aucma.Core.SheetMetalTasks.csproj", "projectName": "Aucma.Core.SheetMetalTasks", - "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.SheetMetalTasks\\Aucma.Core.SheetMetalTasks.csproj", - "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", - "outputPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.SheetMetalTasks\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.SheetMetalTasks\\Aucma.Core.SheetMetalTasks.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.SheetMetalTasks\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" + "D:\\开发环境\\DevExpress\\Components\\Offline Packages", + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -1458,18 +1622,19 @@ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "E:\\c#\\AUCMA\\new\\Admin.Core.IService\\Admin.Core.IService.csproj": { - "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.IService\\Admin.Core.IService.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj" }, - "E:\\c#\\AUCMA\\new\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { - "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" } } } @@ -1478,6 +1643,11 @@ "warnAsError": [ "NU1605" ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" } }, "frameworks": { @@ -1499,24 +1669,27 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" } } }, - "E:\\c#\\AUCMA\\new\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\c#\\AUCMA\\new\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj", "projectName": "Aucma.Core.Tasks", - "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj", - "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", - "outputPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.Tasks\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" + "D:\\开发环境\\DevExpress\\Components\\Offline Packages", + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -1524,21 +1697,22 @@ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj": { - "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" }, - "E:\\c#\\AUCMA\\new\\Admin.Core.IService\\Admin.Core.IService.csproj": { - "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.IService\\Admin.Core.IService.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj" }, - "E:\\c#\\AUCMA\\new\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { - "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" } } } @@ -1547,6 +1721,11 @@ "warnAsError": [ "NU1605" ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" } }, "frameworks": { @@ -1568,24 +1747,27 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" } } }, - "E:\\c#\\AUCMA\\new\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj": { + "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\c#\\AUCMA\\new\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj", "projectName": "Aucma.Core.TemperatureTask", - "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj", - "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\", - "outputPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.TemperatureTask\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.TemperatureTask\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages" + "D:\\开发环境\\DevExpress\\Components\\Offline Packages", + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -1593,15 +1775,16 @@ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "E:\\c#\\AUCMA\\new\\Admin.Core.IService\\Admin.Core.IService.csproj": { - "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.IService\\Admin.Core.IService.csproj" + "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj" } } } @@ -1610,6 +1793,11 @@ "warnAsError": [ "NU1605" ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" } }, "frameworks": { @@ -1631,7 +1819,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" } } } diff --git a/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.g.props b/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.g.props index 3652bdb0..58649efa 100644 --- a/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.g.props +++ b/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.g.props @@ -5,20 +5,22 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\ADMIN\.nuget\packages\;D:\mesnacSoft\c#\vs2022\sdk\NuGetPackages + C:\Users\Lenovo\.nuget\packages\;D:\开发环境\DevExpress\Components\Offline Packages;D:\开发工具\Visual Studio 2019\Shared\NuGetPackages;C:\Program Files\dotnet\sdk\NuGetFallbackFolder PackageReference - 6.6.0 + 6.9.1 - - + + + + - C:\Users\ADMIN\.nuget\packages\touchsocket.core\2.0.0 - C:\Users\ADMIN\.nuget\packages\microsoft.extensions.apidescription.server\3.0.0 + C:\Users\Lenovo\.nuget\packages\touchsocket.core\2.0.0 + C:\Users\Lenovo\.nuget\packages\microsoft.extensions.apidescription.server\3.0.0 \ No newline at end of file diff --git a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfo.cs b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfo.cs index f2bf5dbf..f8b57d1a 100644 --- a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfo.cs +++ b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfo.cs @@ -15,7 +15,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Api")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+95797c6d9a18bfc6da212ef8f1ab31fca740c669")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+08f039f79c4354fdb0c81441e2a211c05029eb3e")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Api")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Api")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfoInputs.cache b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfoInputs.cache index d393015e..d7959ca7 100644 --- a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfoInputs.cache +++ b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfoInputs.cache @@ -1 +1 @@ -b2337fe7e5d6fda0ca43b7463be7bbc56ef4d6f810a4050486b6e1940f30b088 +5f4e2ee8fc211df14a848b4897149bd6d0e0d55a0665d4227786650c6ae357f5 diff --git a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.GeneratedMSBuildEditorConfig.editorconfig index 2da89fb6..60b6cf63 100644 --- a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.GeneratedMSBuildEditorConfig.editorconfig @@ -9,11 +9,11 @@ build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Api build_property.RootNamespace = Admin.Core.Api -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Api\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Api\ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = build_property.RazorLangVersion = 6.0 build_property.SupportLocalizedComponentNames = build_property.GenerateRazorMetadataSourceChecksumAttributes = -build_property.MSBuildProjectDirectory = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Api +build_property.MSBuildProjectDirectory = E:\桌面\AUCMA_SCADA\Admin.Core.Api build_property._RazorSourceGeneratorDebug = diff --git a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.assets.cache b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.assets.cache index 4dfe8b1d4ec8f5bb7b4d5e0079b4c6fbb28782fd..f43e60d74734ea0f581f7adaa9524bc31dbaac05 100644 GIT binary patch delta 21121 zcmbtcdt6mj_HUC3coEN4Zem-YTnUAp8;W2@Z$&Ka zbYEnBlBwl3H&!=S)(5B5)Y<3Tsu~wG*caI5SJm3G7pB@5q*T_`&8(bNo6=ZUWp9Qb zuK2<(_a)Z#E@^I}neeQKV%_bM_OBi*ty^8tl%aj2JG|-H=u*2(+YZ-ECirt7AE`;d zET^wjLW#*@eawZ91;AcYy>vHU=e#P-_p$bR9uaur>Owf&*J54e zLQi}_@tz?q(^q*KH&NJ6sc_ZXVt$rukV(_~wOiHA=kzYRv^fn5B}J;&H)`D;*!imm zv~G!kQz*9!<*_i!EZX+g?V+%IYY|9&OyJkwM=(uV2@e?gL=x=oubA)U#)Tzl6Cr&; z8elU&ZY1`Gy#p2sj+R5)8)|%N%<6XipH*^*YvDfy9R*YzTl zVySZI@VAJ^0h!NEhv)!Bx=X)`dC!faueg&5&^OWpJ_+zKw{!E5_uM_|I<^M-@cL{S zZIK={%#)0VJ{F_BV6!X|uQ1pw9&}?Lk_?4G7V+3v5!f3v->NQ=QyV;SyDyczaDBE6 zvPcd3v9rEk9#ml7&J9_UxYN0P$y{}Z{8RCfmWuQz2G2AiC)mz^><0;fqj( zcN47J2SCuU29a$-tzqTTG<|h}!^@=t{f})gPJs`HE7ELU5DXD@QIH*`NR#!#!6OGi zdsv*5$qS;ud&E$_@xddbAgJC8?j51Ji2q%?g+Tfz&ZYTb{tIEWNM=_reou9Lt=e~f|GM=6}o2MrDBFmALWW#~1!8pgvW z6zIJy+NO|r@QkoXB{~%*@q^5W9Bx}_lH5oyI2=)GD6KY-bVXK6%Y|)qVT~=Xroo$5 zg}d0*HfiP%JOa4`Jm@n+hz~zuYLAsM?(o=aqZICBQZkI>!LqRyzP+Qv$sl-l>?~e~NoeVCG6o(PCswqBU$jLk z)OQpWedt4BsJI%%cN&R3Y48X#5`MjLnH{W5Q;bELp{oZP-pqh+VibOP^TJ64Jvov@ z!J_ek3y-4w9tfUbk(TJHq~=j*&tF7Ii$D?q{bFbE$86qcJZ4|V3e4fW96uNuSHQ32 z@2zAA1iw8BPR1$HVtrF64S|spE3N9i;go4UU?o2A2CAwtm9wg$@a)^6uw|7A9*GZ* zWc_lghQ>Qc5Y&Ha?#%auig)`#V1iUESxO5M^ zcNhFTN#P6(9C$Af7Qc_Hafb<(CHipd1&Ig!Y1~+1hC_+T`~{VG&<0B;D*_)j@!(K; zYAnfxpeYu?Ri1b-1X>TJ!%I^X=hqtY4*JmaXzY}KQm&{|A+Ys>82BWKw_!M*5Zbzo z41j>7p>R357j5u&GeLc_g*!{EDD3@H99&Hn+<%D&17K20F=voaD}YwCl3=<$hFHON zy9WfO`tTOU+(t%0ZR(^*7F#*9OJMUyX>e$|34+pm_-mP+yUmCDf;}yp@0upeg%MK) zZdb=Ke;D;~9=wIZT-~{Zj$;Av`o|$KI$e?G@WMdYa>PUv?js(sIz5#;)~L=(WI#%W zU?!QcJ)?+s1T{e)*mE=)Dl!#m7T>T1{x5Snk7slon+!Qw3NNTUZh?(i$-FOBdAtNt zvjw;L>Er3}1`4=Q=Y3KLQ*spk#LUZS6#eK2rJu$?LN0$p!MqcjX#HoaN^WwlLL=>Ew>fpG=JJSu@wc&(sJnyX(`CYV}S#NAN91Robx3nErcBGCt@ zkN{}Evx;9|EJ3r9hy>4_FvHe6&9o(nctLrQ#i~Zn&Ky8`Dv3nErDm2qI8c`Su|2$JE@ZwngVKejiosI%pl#Tml-EnugP}m<%%#4=G^amx;J{S^a zrAvAw8WQcd!-c=a!j)MHf4mayLm;JUx(kRwo_zpZI+F?m?80gn@ivmJ$0_>^@e((j zoebM%3oZnvb@6N*469b0za1;irNORhg$q495-jlDxj`^+j>38E9SOssc22C6t)JmX zzm0<*<_t5!@S_ChhN1gMI%mPv8kq|?ROnyB?q_fw0WetopL69KppAVYy>>FMs6h{7 z;M-c6-}!AXvN%11n-5??wfBhL@OGVS6pjxu4#ij3E22<53cjzGMWOXLNNbQqv2vv- zPR`{nP%So$h>C%S8f9(@Sd5nqq)FzE5({gp;bD{*g*EXoc%IB%qZC7%s^@pi8yeiw z3(1~f-OjL$Zdh2297Ge+4wco&Nnn{<#wAU#oq4tOOnb-KhxeR$a)m9)epmA1re^#6 z`L-#I^-YZp_J#%XZ8@`N*VQ!GgL56aOf~wt>Y07p&aB*LE3BEnu(B>Vf5F0-J z%4VIijPEf-1I8&Hw*5}#0~@vn&UsCSF^|gvC;Ex2&G6ylvdgSfJQQw{dGA1Do|533 zO|l{L)PxP2VE1M(ml>#Xh~3$zw?;7oT6&Fl$`RqZD2oB>R?#70p#Ac#je^P1B#dh+ z6+{^*?dF*#LhmPK10DvcD8@AvvSkb^bSz^o{>ziTjv5*Fln%D1WPvyDC^84WJYfRM z(_RAK^?EIJPtOptMk=|K1Xkq_F^p%j!GE5S#r;K|sg}ED zz`-#^!-(f(A-}Yq*TKPe^Gf4j&wf)-^UY=)X(H7Qg2xUo@hW$7O_O2$4%r3Y5ZNU7 zYDXy##<0#d?aVSJlHjME%VEck9(z0#cI_$=fLPu1&7|E`{Apyu!@Fk-pe80M+cQ_V zq}LgvBAB^XU|71F)EJ}jaCxun8f%mbcl};)*RlFrLdL*%C^Tk{tbZsJP3(2%C>;L& z2idShZy5jlG~NYg1ktYN%lPY@2}ZpzTV!Dvb2JIAyddxx17Ez8_ZHh;EHUy(qagkz z*@!s`g7qjAvPTzR3KBb>+57k@U~G>Kj-W)q_Kbt@Kgv9Tfs9W9JcAMe#7AO}AUK7k;4+1F5ko=hdX|MC~k=F2*G3jswrA8!B z45YllA5~3PBZ4Xn0)(_TWf7G!(;#X{IdG$>;Ur4+DFbTM0JGi_oOBk{4viZJpS>l6 z=~%b5qYgSGiNj2pgi#@r;pE%0^AI_8&>@q-{*G+@jg-jW-|_pclt`!x2$9NZG$y1# z2KoVB?|C`zdw0_!vjn%vf%hKbPN0JhN$RmeJqeId2s|jmtAFcWJ(SHCxKs}6BMZhI zk_GpXMt!(IarLA=?+V*$JvjC_5r^$J9Y>%;dYOu@~c^>Zl-g_%F3#Gom%dLhUh`51TuV74tu8v_>ez z9+&xxzVi4y{@OZyypkVr-Y4}vcmBK_WbZ!hX|7cCwe-^*Zmk^@MmV_tSrmb3G)4|= zMJb=mrcoJL5d9f%Q5|$f5oc;uLD#fI*z$$RQiTb*EWF=WWuMD@7|dvh*9sCk|046SE0awv91qJ;$Yt_~*a=U#_80lL zvlB6VH}Q;gvl5eB<{YLAOe#Bk8sCrxd0nD8WF^*hExH+_FyqvnF5DLmMqwgEd?lD; zt#h7m*H^h57TAMT$b`wKW!_4t+NUS-$6VtG7_$%o!Cwn35-U*t^=#fEX_|~(D0Pih z$cDH6DsX66y(4hi4kWpymIM{63mTTjzbh*dX`c=fZCO?l^j32^XV4@x^A| z#xsIq_@!t*@4w+v17F4YOU+_TR?Yc8e>qw#?Q}2gyygM>e+YLm^*`wE9nL$74v;nz zBL5NX5-{ouoBpxsH>LjPvtb|qXShqvJ6-_%%LLo6g!2~v^py>+Vzd8R$-9)NudwX@ zg(5*H_+4Eh@QI(e`kagSYs-%ddE2RBuS*SZ*Ux`?#$~)U4X*theG?9DBy9O5T7-`v z0xKdS7zV~N{;%Qscw7q?OpjJV%lLokTC~7P!V(%18~L9FLMTfWGZeNMH`0cwBwTR5 z9F=%)c$u^r1Fu`e048hR8!+LYZgeBjLflkET}7+X198P{|9_ciTrcdP=+VFe`h72~ zUHqn@JKulr4<>r>Hmt!g;UC0fV9EY8)tyB1{-gtmZ4jcc_o$tI(}RTbifrv1Y5w&F zbN-`3rq69%R6JzQ>O*R{Bj_XKnJ8zb{Th~zB zIQo8n66G3eJay~7We$tdlge#oQ-dH=yQ*&k~a z!nfWdJn6ek%Js(a0)VCkV9i{Q{`&;L#Pt2>_W{Hr0)nGyb|6;IA#?a5;CI|2Fnkz9 z*zkDj8-%rpo&&5E0mCsgd=Pe9|NfJ`1)#4oiRdu^ja5)0!iSr=xKx8TGb6^(tYGYz z5!}n310>LY+^9$f-8k5=hOWpAns7Uc^-;9ezTM%ZvHl|oT0>{|CL0lGgF+tp`DPtY z1XAfw!?0dXsr#KkwNP^-7d_DK_W{*6c^goEBRRecC>H_Q8MJC74vpI!-H!t1@RuTc z5b%2;{=J!tl36YddkBz7M~}wI;Eouk%>0gKBRj+UYl=Dg;hjBFQ4x;d3*cU?p>0!_V7Y!p!e+0r+qL z<^AcYSe)ank$79=j3GJBhe6$V`9S*Z7}6lP$MGEj{W1#onEn7F6s*1zXb?EJ4m|um z!L_bo;pz0NaU|OLRq6)Bm+<$L23t?0VKD-8a2>a1Ir?^P%Tfn$9YSlzlc-2%6ZGlp z<4Fte;5hQ@=}QxE`t&>B0V4;{vsT>r5g7s09*Z64yrlo)#_D3vH3EyG7AK|Cbf$=uG2I)S*yWBYY-7sz# zy^xFt$ff*oTA4ybSukvI5zM8R=b!~X6t5X?1zK9&X;CVPv8s=uok=@{3Y$U?r;>&I zEu>x&S}uA&X2b$IZ6WkX8b$*A2QpZ{FfpC3or)uN{*4s_i783P-NJ2jZNx0^JdU1D z7lt9-MJ|^4(HR+}P6!m!%Ncl%^gak?WwRXgY4rU}yv z`6?qE*j=+X6|?%%xE!p&01=L*U*ure#XrbqxbUSjx6$-ma*qoUss;@E(7t(Ot`P{F zNKfTq&xDKBa8_m)l^LW%p0MStnJ$}#rj3hP*rHuL>q9S2Bjrw8bEr5sh-oUY>70qa zkdF=M0~<$bIgOf*Lj8+SEw@~u2d3jFL<#0}QUQq-h1!l(KX1CffV9xhOUQNF8ADDj z4bYq3T}YOjS8!J9dWqh2O)&_7m_W9GLw z*%LKnFx@`~7f&erxA^BFu=ZZx>zy4%z31ZYRBCbe)asJ>Y2JJiOTVo}7f}C&7ftkN z9jP|Z`oP<5Fx@*J&(gj10#H!Xzgkb4IOl?i66xiBZULJ9cMYhoH*Z>@xo&QK>CQSb zj6T+ASZK3^Yp3=ky$K76Mv_Q_&2B+jp`TeHy`9&ZJJn2Xqs!)zGHIS*rqB>Gc|NLo7JlrwqpT#Q^Mj#R8JVPg3PVGMU)kYpg|35Mv zX}(bO!9ce#`sE^Ax}-%06BbKfS!B5Mcw+3_C8I5P)7_*Ov$ZzvHtQirtJ;@_Eg?hc zPfM_U{dIM{WQDQlHmWQorMxXs(|B4B`P288l9lxF<;2vTIqt{;+GxICf6SN;OArdA zIrrh`5E4G{y8bMhe!2{2>E(N{m-?w>Ar!uU_GK*%raJ@NBwDbXqzW8nM~+Y!y|kPx z6*jNt5QWj#TF4S(`IG$4#xU(k0|#;QVQ>0v8`&u65Ay~b;sABX^zyy9rS)irBO+7N zf22p&qSd<`OT1{)eRvwXR^W{2_gzng`}kO?L!5sAy@y@gKI#$v1TeLY(mnc?aqd~j z@|bxer_Dt84mOhBzJ{zatDh?SpH4aC`);IqYAspi0?&z$Xz5cAkq-W@bmWD|G^w5R zS7#x3n43bohPt`a0}tbMxkfY&44YJq4)Y@hV)i6gqSw|DkM2rG(zc)Fo1JLNS~Jk2 zOrm%=xKF33TIGG|s}u<^o`KY&H1u{JML3u{<4pM!230r>3Iv@UKx6MkFk$#?Xah$qLb$&F>ZM=+l+CWye#Ial#CRw`|i7M(#VS+2H(2lW(7QGvT3bKJPQt(?AlZb3x=Of>6SgR(SusPAnfZ_rDY1w2L6x)C){jWh4B2E zTZ1-Hc$W0z7}(=(lWd%EFR?r$4&a=3I8;8cNDcV(SY&BeX`Je@#PWy=Nb>Z7tsZ5T z9cplm`aSEndqBswTo`6HLqktLwf6e$vq-?MH3`$@Gl=>n0gjm!i>8Ba@a2wdhxL_S ze%cbH0XI11Ri?x$ysK1`ZPykm3?=VQf^U56+A;-}s8w5DRyn5h`DU14v1@G#rG1t< zZC>~1c&nU6K&Ee=RwD!b;jC|t>}KD6;c#TnGX^j~DzWuSA!e~D$S0e0Z!32>s1-Lgi3L&qzaVY#@pC13iZGMts%KjR7!)BNLo3ei>{JcNUG2P}6KY8)E!0uO5!M(3t zo(O^XfrU+j!+mX1z;aK9*sHaM?jZ*B9B=kwJ>aN4+w!7369+mUk_tTF?NC2$sY3k^ zz1ak~k?Vm0e&pZBMH?xvN5G2*v*1QQIgJRz4u6&gPd#Xp(k12f5peN$i4fLb5vD1x zKLwZj+ocTW7B7us51>7OCBl*cHf_EzH4VXZv44Wz`<%Rcy*A6Aa z)m$?S4fm7Wm>0fG@vI*n2x3W)FwmyW6-KdoP+!aqX321pK=JHxf<5tY+jSU9{HVbf|QumIu)+qIPL&oL#G^@iJTg#Z#b zMFvN0Y;xZ?#4Zkk>m|UPAp^uwa9{#_J;bJ^%f@0LEz&Ng2~Oz8>fl18O>`{Y>c=Xe zcBoCu=xz$yhZbtHx<5nT{*)2f!))3l0odQ4MtX<vIuD4I48mrvn$ zq66T<@bTL8?h5cubRd2n#zw%RC^-Z<=rfR+q3u{A+#hY1!p$i#88$_$wA-{5((49b z-5@pvj*qa3Ie{sISrA$xSRNFOv`G#k)Q%@3SUg-Hw7R=tu3HE*Vx$=5fE|AtOpAJa zga>8}VSZYbtZRqY{wo@0kCGBq*N=~6nP3_%=i#u?4PsVc)kCZ=E+5J=z!EEII8Z2w z%~7iz9!6??<7`@C_c20rdeISPGQ&cqa>I)&Mw6_ACKopKA0QNdclc9zL5K+CoYd?A^hNhz!X2Z z3UaEzq(5ZBi4?nhFmX?u7{jWde!NY}U#`7>e2(Op_S1p5GC_AAWTeK3n-jF39ssYU z7R%$|KtfuBbjAg*fvqhIRXQrV`70;FRUbge*RoC?3*ONjXO5? zd?E~=EKfnlyy5fnsqjAGV$~g;9SA;CnzbC^ebL!LaQ#mM;M5emBC3Mn>?dX@|0D|X zGF1`F@hNbHF!6AV&JKpCtZ9mI@aH|@XjY9jQyNRNbOk(^T_rxl`Dx4sNjd3aWx#>q zV5@c}XGM-X9#3N$bmqt>6_4O?>zM^2G6SJ3caUQ84goiK>GLsEyV#|0c3NYh@VKjN?id4pC5r2cOL<2}37jrb zkG!+o6Oz9g3o~XI80akTgL5|0(*JSBbZxm5;sHPc&{|rm+*KW*Pg$LGVr2EVQ=qQKE=3+GVrC%=gi|%ST3PpH z#rZ|7AKodXyWsLG!O&DYNE2u`E>Q_RX4%AO=fH#D_1$P#J4>341H{|K%pc;%`C?NB zl^nLZIJJ$TS4YEGWzu@^P}zMg5whyl z$-4WRJM6755$`(f<7_Z|&RDT-Y#%oWkIi6qcz2FX%Mu*fuaxd}!{!b!AS6TJ*|}CZ z&^cSF6OyG6GtVm4u?{w~d0vgQ0bg^=h7k=`HLLV+!z4*TzvGUCh(@dArQF83q6hfR zjc$83^;NHq0O7*P6;k2TCae0Y7u{@CT--*(dU`Hj#U{fYdak&R#Y4q>t9WENZWWFz z$EO5}?CP-5*)XNWDrUv6RrVJIDyr-TXlS*HN0qKcRrc%uXblVPZ6cQ1-aQT=`dR-u zQ`5$j);G2;sG2vgv?#wcx237BrK%xxLjAnj*3hsKaf{MywLmw3v23|O7mw|wba&>W-rXBU65Nk9HIK@d=()&zpK(tBkLRp1_oXw}#Aq6UK0T(v&fl7$ zVvCm%i(LX!cFT;b`t!a1Ps{hS&+NeY>Oh#^2Lm#KPA1cv)grQE9M@sP1gIq4QS^}HFb?eY>s7r5c%-G$P*!=EQ= zY2fp`Rpw$jSo-|q(*1=$-)ET!Ex$3?gEDfqPu-j44xJMBWoUlByr%7H-9pLPC z8oc^~Rjw^bKxeoMl(g_hf6i_fITpLfx!Ad?#dg@Cn0v`8S7;8*2afocK*7saxzKUq z2VO2ybJjZJod6qOQFxk^iS>S5t+^^78?NoODyP3T_Yuilc!FBM}B9O5TXYO_JyQbOQWHpaDOf2n*kk z4~wq+^cc8J5<+ehKb;SY-?WM~1MGUUSS%O7$xru(NpHyoN%LECjkxI;gG$96mLE2# zJw78q_yWS&37X!O6NuMpWm5OtZNYMpo)^iDNc-QwY;@*4-ng04kQ04$2Hg7KRyb6 zLzuA8oMi0ExcWojDJhAatZN)>KcyI#&b(&B=#S;iTW4P4n_ix##nx8R*YB0b3%Sfjaq`2mAhHRj?tPfK5;YmWzDNki5&u)w7?>RE&+2tMRb; zzpaWfxQN$ueuxK8qUIo8tZ$+}nTXAUU7yM~mV?>j!Q(UOxr>kuhxr5w$Dx{(^@8t7 zRNU}+pm!l5%09XN!b`E{z6U(E+7!IUT~TO#d3kKXVlcuka|Ip z797lV5VVuwA_+*XBD%mdSoo#1(>b;jov1CANpKN zLC00~+UWdd5>#E2i)9`dyRYSo!*(p0&Tl5b-0N1cZq_-@zHo{l;rqCg=d?lW4XcXh zOoXjB?BW*Keku$4+>9}xKMUl5{+0R!u_AQRo>}m>&R7FtDgsvBic$4qZi1Xn519FV zq=L0dhd+NGBh}sme`t~R&}(ja@beEbioVQ7N&k#{68!vQjC=v+BuV81GvLJE3_zbA zGcd}`JYfC*MHx)UpAtb+qf)H2}2ofspos~K`{n>W40BBd)oH@wd>1#1|KF(Tea z;Qb~RE8dKGvnTKA9ErP4Oc4v5{@{(BXU8mAg zajJ#%r7l-Od2{GGDG#_`L+ly&l`qXl;6}Q3hmOEUdy#LAT0~zoV%wHVdqv9Y{c({W zYmqA-oqo&0W`9Z?@uR4dgIg>mqq9#GKkGvim)4#dMRBi{?1_EiU75IMi7#=oaLc9R zKxg1a<12v*f8~Wop)H8XZMIIXtwk!goK#w?bnbQK*yfA72=Qx0c-}@MP&9#JQ3y>} z_$cRM*-E5}EVr=$m-Qu$llQ5*(GmMXss z;+;@3BqRjy0o^7>C1>nF@d+^=KYoxrA~I1#*{xI2bxmT~LXDqUxMTpCP<(D|md<*e zrwhkrVWc5mQ#jp5?Vq!xxavaECGxEz)<|Nd0;tA21LJci;!b?xwutQ8Vwtrhe1PWG9m-$>hfGBs<=8lN8+?$ zMtaodxlAl!oh_b&aouoIGwAayR{#_7g(%XHnZhYJGFo0ZPX6&u&jh>}tvClAFmLyK z(uik_!^tDbtl|Uo3sPRVT0C)Y45=ut{hV!VP;f51tuq7hKa8Mk%Qr+?CkBR9l2;x4{@O&K2 zMhtIm)X74wkjo(_N~EJdMvP&N@~J`+oO#?N#;%K5Y?O`ajA0(OB+{tcy6=k)uJK}8 z77iLqpqevu_$U~k2{oCq;s@q~SGcU$BGiTU8;GluNJ7XT&inE1%Qeyp>%?CizL!i| z!Y$P?uMy+eL(&ndQ+Nd!mZBKB&c_Ae&J>Cb@$l6~*C%!z9g7OJf z=UU~ZaIBfcn&qNe*X1385jbozTQ0iAk*hj0rQu&Evzc<8>N2sT!_HSM2=O~ zAoalw+3X?pxScJ6kI2_a=X(CIBtcywkEbXJ65KpqL+gXe0NQrzhc z-U9gOz4)y_yfu}4C8n*5wxa$%+?`JXqPM$nSIyD^L(O~mZGqY>@7{aZkky*0VzQnU zXLpyZdH|D(*$Oe&@4{`W{rYYfp1QG8XQz7O^yy5+>~ng`kDoq4kV}1fHt@v0B~0oC z>_S-i{wiH@-3w2bkY9vSRHv`{;nW$l%xeBBU&UQ560a<-A7Xmo7o|+Drkp?1^uR4; zY^CL4A)~o+ChqQQ^1$Wgtj6-F0za(OnuIq@bWT_*NlRsQ5}vMPP2w^^UU)Pn&!l|5 z{uJ}W&ihTFc({r-UhyY-PPsM(;Q0RE8{M8E105qxZfJKWD`Tozn&mBV`0cgSefdf? z`_%Hb0wPN_?5q;HWm%_C2*kEJY6RWC%7RU^Ss32-FbzcCI(qX4BkBFdh91Du*=&#H zU8QP7J?k)lM$REfylbOls$=J}ebVlvLqB<&tbEjVoHUQFv4@p!eapubg4%o*g7yZs z!*cANLNOTI$eywsQVLydWalmKD50CpwEj1nXi*IDOU6*o&3>jne2huB)6bNMXXcQ# zEiH6wo727I;iY#1hPJX=iR^M9XIojFp-vBcasewBt4-bHH+@WzSiX>=R;Xb(oQBtD z5tWh?X!63QMJxcr9-@Ow*vGlx^QwnwShR?hsm7avhXQDA946xzlS#47nM|f&=u+m6 z&4HAdnSmxvm%h%Wn`PfPrOyVMY`Wl{CHF8Zu>*V#DfnHGsjsfxbD4UcDYzrp-r~82W+*t`|3@-XRc*JsxKd8>0)?uxPYANHbjg7`=P&6Y^5=+XMZm%kS=~V8-wI)7qYV zf+ysfyTjonQto+gOnQ=SRhPFM^?8bI5mTQ|cUM<{2ku_0pI{5c&=aMWOSgc7*#q$a z9U}Yy^uih8v?;f(qj;$79;t9w&iffohL1Fv;m)V@>%ny_7{@+M9uP8!S0DW2d;mAx zhyO-$x;9&|=@fZPdq@TxRsY}Dv$dA}Vi0hr>A(CLj2E9_TP*wjjf4je7k^Bi%wjRD zohGL)%lWT){P5Lww!-q9$|5hQ>E}GVEnDt^2I=#q!rhLYLrgyS63}scFMEz)_UEO( zQ{(-OUCgF{iO$I3V zlv!{avZpQ2-b-T9b8MZ=mh*Mu!=dYp^{!VMaoOf>;m;-L5@W{Lt?UWRL>>>>>> 95797c6d9a18bfc6da212ef8f1ab31fca740c669 ->>>>>>> 410541322fe10bd94eabc88d4c68315f856e4511 +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+08f039f79c4354fdb0c81441e2a211c05029eb3e")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Common")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Common")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache index 35f99f13..7ddf5f94 100644 --- a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache +++ b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache @@ -1,9 +1 @@ -<<<<<<< HEAD -a618e8897232ac6ea4e91122b9779d78e457ffe9a6ccd359c19bbb88b3c45edd -======= -<<<<<<< HEAD -3c08b2a6f95957043123cba0d01dcd1675663fc7 -======= -62ae8b13d646c1bee38f596428b0c65aebc8cacc7f8546b0fc7f279f33ddbb5f ->>>>>>> 95797c6d9a18bfc6da212ef8f1ab31fca740c669 ->>>>>>> 410541322fe10bd94eabc88d4c68315f856e4511 +2243688838db6018a22c7440847ec442cd6029eb96e6f1b2bd7ea732d532ed79 diff --git a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.GeneratedMSBuildEditorConfig.editorconfig index e43b7078..e37f6034 100644 --- a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,6 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Common -build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.Common\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Common\ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs index 0cf98124..c38f40d8 100644 --- a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs +++ b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs @@ -14,15 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.EventBus")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -<<<<<<< HEAD -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+95797c6d9a18bfc6da212ef8f1ab31fca740c669")] -======= -<<<<<<< HEAD -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] -======= -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+91808221759aca287573a9c1018fc2e65b1bfd59")] ->>>>>>> 95797c6d9a18bfc6da212ef8f1ab31fca740c669 ->>>>>>> 410541322fe10bd94eabc88d4c68315f856e4511 +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+08f039f79c4354fdb0c81441e2a211c05029eb3e")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.EventBus")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.EventBus")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache index ba8e21c6..4a80ac50 100644 --- a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache +++ b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache @@ -1,9 +1 @@ -<<<<<<< HEAD -ea3e4733aaa18e40a302d1139b12a468c5c4b1a7942ddaa4050bf9fc4640f955 -======= -<<<<<<< HEAD -2af60005099f8dd0481f84ac0dfadb89cc4b6f1d -======= -9f6d3940f2a70f8fd050d6fe20a1178b54354adc92bcb268eeb7e95d388fdd79 ->>>>>>> 95797c6d9a18bfc6da212ef8f1ab31fca740c669 ->>>>>>> 410541322fe10bd94eabc88d4c68315f856e4511 +edb1816a98be2ad63e8a0b77823356dd5a831d47af0a32ba396b318ef10d8d46 diff --git a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.GeneratedMSBuildEditorConfig.editorconfig index 987e6af9..bf1e4ba3 100644 --- a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,6 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.EventBus -build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.EventBus\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.EventBus\ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs index 439d20ce..ee278a8d 100644 --- a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs +++ b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs @@ -14,15 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Extensions")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -<<<<<<< HEAD -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+95797c6d9a18bfc6da212ef8f1ab31fca740c669")] -======= -<<<<<<< HEAD -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] -======= -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+91808221759aca287573a9c1018fc2e65b1bfd59")] ->>>>>>> 95797c6d9a18bfc6da212ef8f1ab31fca740c669 ->>>>>>> 410541322fe10bd94eabc88d4c68315f856e4511 +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+08f039f79c4354fdb0c81441e2a211c05029eb3e")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Extensions")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Extensions")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache index 5de16e9d..9ccf2ae0 100644 --- a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache +++ b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache @@ -1,9 +1 @@ -<<<<<<< HEAD -0f93dbc77ec673200bd7368b0df86e38f4ed62930373a730eaff15686dd7c7b6 -======= -<<<<<<< HEAD -790ffd47e6e46a3c8a83558ad3550154a5c81377 -======= -6fb9d9c8187ad98357a41595af7692e35588e2f7d760b068489ada94d6798f74 ->>>>>>> 95797c6d9a18bfc6da212ef8f1ab31fca740c669 ->>>>>>> 410541322fe10bd94eabc88d4c68315f856e4511 +6a2a15f37be19613480d30f63088b9d1080fb956cbef0ad04ecf6bb66f52fd82 diff --git a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.GeneratedMSBuildEditorConfig.editorconfig index 75d65c67..9ff4dd0c 100644 --- a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,6 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Extensions -build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.Extensions\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Extensions\ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs index 082b6d58..e302cfac 100644 --- a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs +++ b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs @@ -14,15 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.FrameWork")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -<<<<<<< HEAD -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+95797c6d9a18bfc6da212ef8f1ab31fca740c669")] -======= -<<<<<<< HEAD -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] -======= -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+91808221759aca287573a9c1018fc2e65b1bfd59")] ->>>>>>> 95797c6d9a18bfc6da212ef8f1ab31fca740c669 ->>>>>>> 410541322fe10bd94eabc88d4c68315f856e4511 +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+08f039f79c4354fdb0c81441e2a211c05029eb3e")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.FrameWork")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.FrameWork")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache index e77193d6..09a6ee6f 100644 --- a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache +++ b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache @@ -1,9 +1 @@ -<<<<<<< HEAD -7fb166de25c175187e65a7a6f6ffb17b4d86d3d6f47f3d39800f450985890ae4 -======= -<<<<<<< HEAD -7d60a94dd38c10522cbfe4a021ccb6e9c5da0354 -======= -7a1813a9a5d1d19b18e25488399390e5b0d29d88f5978494e031c73a36870caf ->>>>>>> 95797c6d9a18bfc6da212ef8f1ab31fca740c669 ->>>>>>> 410541322fe10bd94eabc88d4c68315f856e4511 +fad90fcc3b6583900b74d5fd78b359c3c39898e3edc954e0d716ab6813336265 diff --git a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.GeneratedMSBuildEditorConfig.editorconfig index a3871f56..d158aae3 100644 --- a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.GeneratedMSBuildEditorConfig.editorconfig @@ -1,3 +1,5 @@ is_global = true build_property.RootNamespace = Admin.Core.FrameWork -build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.FrameWork\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.FrameWork\ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfo.cs b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfo.cs index 61cfb5cb..df484d87 100644 --- a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfo.cs +++ b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfo.cs @@ -14,11 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.IRepository")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -<<<<<<< HEAD -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+95797c6d9a18bfc6da212ef8f1ab31fca740c669")] -======= -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] ->>>>>>> 410541322fe10bd94eabc88d4c68315f856e4511 +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+08f039f79c4354fdb0c81441e2a211c05029eb3e")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.IRepository")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.IRepository")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfoInputs.cache b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfoInputs.cache index 1c3659bd..c7852b9b 100644 --- a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfoInputs.cache +++ b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfoInputs.cache @@ -1,5 +1 @@ -<<<<<<< HEAD -d1de46d4cea04a95f16ffdd3c5c78f8a095cd4a4de4af8bdb815cf8eb11b5ece -======= -80bb097f76aa594dc58289065a284d1acbd8bdff ->>>>>>> 410541322fe10bd94eabc88d4c68315f856e4511 +f1a863a9c1c93bbc362f4256691bb86b79622140ea78a6a12cd325472bfa41f0 diff --git a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.GeneratedMSBuildEditorConfig.editorconfig index 7d227ef6..8e921e97 100644 --- a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,6 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.IRepository -build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.IRepository\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.IRepository\ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfo.cs b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfo.cs index 524c8f1c..7cf9a218 100644 --- a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfo.cs +++ b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfo.cs @@ -14,11 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.IService")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -<<<<<<< HEAD -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+95797c6d9a18bfc6da212ef8f1ab31fca740c669")] -======= -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] ->>>>>>> 410541322fe10bd94eabc88d4c68315f856e4511 +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+08f039f79c4354fdb0c81441e2a211c05029eb3e")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.IService")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.IService")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfoInputs.cache b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfoInputs.cache index 7160a984..aa4f8759 100644 --- a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfoInputs.cache +++ b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfoInputs.cache @@ -1,5 +1 @@ -<<<<<<< HEAD -2d250522305d6e2e5025a59c967b0a68c64d3d1a170cbaaff284984ea0372026 -======= -51b8351ca3dc5fa8344fbf501d63c1eff37c8f9c ->>>>>>> 410541322fe10bd94eabc88d4c68315f856e4511 +9ae7f282c9d6d9135b6dcf4a9f310054b6e115fb9214558714daed08f2f8f18d diff --git a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.GeneratedMSBuildEditorConfig.editorconfig index 7ccb1e1e..ddd2b80b 100644 --- a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,6 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.IService -build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.IService\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.IService\ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs index 6dfd9e0b..e0d743c1 100644 --- a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs +++ b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs @@ -14,11 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Model")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -<<<<<<< HEAD -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+95797c6d9a18bfc6da212ef8f1ab31fca740c669")] -======= -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] ->>>>>>> 410541322fe10bd94eabc88d4c68315f856e4511 +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+08f039f79c4354fdb0c81441e2a211c05029eb3e")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Model")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Model")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfoInputs.cache b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfoInputs.cache index db10bf3c..5bf831d3 100644 --- a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfoInputs.cache +++ b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfoInputs.cache @@ -1,5 +1 @@ -<<<<<<< HEAD -8561683fdff2f8094ea69771ec03792a7434406a280d6b6087be70ccf45950b5 -======= -ef9752cf3f9e33d53832c154eeba975830dced91 ->>>>>>> 410541322fe10bd94eabc88d4c68315f856e4511 +beeccfd405f9933ceee30ac8b1790c984f300285ec69f019c89e8ea4ff50c97b diff --git a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.GeneratedMSBuildEditorConfig.editorconfig index 0b5bdcb9..4bea6c27 100644 --- a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,6 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Model -build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.Model\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Model\ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs index 217212a7..2eba9717 100644 --- a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs +++ b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs @@ -14,15 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.RealTimeService")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -<<<<<<< HEAD -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+95797c6d9a18bfc6da212ef8f1ab31fca740c669")] -======= -<<<<<<< HEAD -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] -======= -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+91808221759aca287573a9c1018fc2e65b1bfd59")] ->>>>>>> 95797c6d9a18bfc6da212ef8f1ab31fca740c669 ->>>>>>> 410541322fe10bd94eabc88d4c68315f856e4511 +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+08f039f79c4354fdb0c81441e2a211c05029eb3e")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.RealTimeService")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.RealTimeService")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache index cd3826a9..2ef81e1f 100644 --- a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache +++ b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache @@ -1,9 +1 @@ -<<<<<<< HEAD -ba4c9f410f5a53ca2418c45fb63499b8408c300e758240a71ce6f546c9f6e71a -======= -<<<<<<< HEAD -0868e6bde5b49a65a126b91d794e990427a11761 -======= -b90aaf21ce2e9da9e13b0fb64d65797eba9a93af543963c310c73e113c750708 ->>>>>>> 95797c6d9a18bfc6da212ef8f1ab31fca740c669 ->>>>>>> 410541322fe10bd94eabc88d4c68315f856e4511 +c0f6b19d433d08bad3492dc6a6ba63c6191efddb5b9b20d48fe13f4288ac8673 diff --git a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.GeneratedMSBuildEditorConfig.editorconfig index 6a8a8ca9..a5e40532 100644 --- a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,6 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.RealTimeService -build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.RealTimeService\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.RealTimeService\ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfo.cs b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfo.cs index 3417c9f9..23d178d4 100644 --- a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfo.cs +++ b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfo.cs @@ -14,11 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Repository")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -<<<<<<< HEAD -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+95797c6d9a18bfc6da212ef8f1ab31fca740c669")] -======= -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] ->>>>>>> 410541322fe10bd94eabc88d4c68315f856e4511 +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+08f039f79c4354fdb0c81441e2a211c05029eb3e")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Repository")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Repository")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfoInputs.cache b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfoInputs.cache index 43d7d38e..c5dad248 100644 --- a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfoInputs.cache +++ b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfoInputs.cache @@ -1,5 +1 @@ -<<<<<<< HEAD -829e21d51dcc0fcc2158d7a2d0886e1f2eaf68c2cd64a201aa7728ea368ab90a -======= -046606c52f7e20e88e6dd5ffc01e33664c4b9ff8 ->>>>>>> 410541322fe10bd94eabc88d4c68315f856e4511 +5c05fe765b469a2fe006672fde747aae73afcf50dd4e37617561877e57644fea diff --git a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.GeneratedMSBuildEditorConfig.editorconfig index 567ae76f..8f3ae2b8 100644 --- a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,6 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Repository -build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.Repository\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Repository\ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs index 6f34443a..4dcc3430 100644 --- a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs +++ b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs @@ -14,15 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Serilog.Es")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -<<<<<<< HEAD -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+95797c6d9a18bfc6da212ef8f1ab31fca740c669")] -======= -<<<<<<< HEAD -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] -======= -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+91808221759aca287573a9c1018fc2e65b1bfd59")] ->>>>>>> 95797c6d9a18bfc6da212ef8f1ab31fca740c669 ->>>>>>> 410541322fe10bd94eabc88d4c68315f856e4511 +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+08f039f79c4354fdb0c81441e2a211c05029eb3e")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Serilog.Es")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Serilog.Es")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfoInputs.cache b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfoInputs.cache index 9ddde2ba..028946c8 100644 --- a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfoInputs.cache +++ b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfoInputs.cache @@ -1,9 +1 @@ -<<<<<<< HEAD -c8f478eecd1ef8a52cf42637f8b161109c9603f8ad626a88a98b9837d0907947 -======= -<<<<<<< HEAD -dbec6c73777a8ebf7006f00f1928199755951ac1 -======= -7e4c0482a63e6bdc9d58ba83f484a41ef7633ab886d66aa8de108234c74c3e9b ->>>>>>> 95797c6d9a18bfc6da212ef8f1ab31fca740c669 ->>>>>>> 410541322fe10bd94eabc88d4c68315f856e4511 +22f95f2142187d0f7ef8d83a364e9cdc519bed1ed3aef683a6f28f512514c4e5 diff --git a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.GeneratedMSBuildEditorConfig.editorconfig index a8331c60..614f9a4b 100644 --- a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,6 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Serilog.Es -build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.Serilog.Es\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Serilog.Es\ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs index 1fbf9236..dda21d21 100644 --- a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs +++ b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs @@ -14,11 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Service")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -<<<<<<< HEAD -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+95797c6d9a18bfc6da212ef8f1ab31fca740c669")] -======= -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] ->>>>>>> 410541322fe10bd94eabc88d4c68315f856e4511 +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+08f039f79c4354fdb0c81441e2a211c05029eb3e")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Service")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Service")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache index 5c289b5e..a66f11e5 100644 --- a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache +++ b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache @@ -1,5 +1 @@ -<<<<<<< HEAD -931cb7f6ab57ef1e4fe5830b07b1e7f8967fd7528de4847745341f2c4fa682bf -======= -ff8a17c10bdbb7dcf5bd28c26639be5ea4bbf542 ->>>>>>> 410541322fe10bd94eabc88d4c68315f856e4511 +ba3d808e51bfe9172f4ab56a002d8abe8f10368e41dbec2e9421600e70156b85 diff --git a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.GeneratedMSBuildEditorConfig.editorconfig index ade53e61..7659a045 100644 --- a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,6 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Service -build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.Service\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Service\ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs index a83eca40..c0d54c95 100644 --- a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs +++ b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs @@ -14,15 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Tasks")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -<<<<<<< HEAD -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+95797c6d9a18bfc6da212ef8f1ab31fca740c669")] -======= -<<<<<<< HEAD -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] -======= -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+91808221759aca287573a9c1018fc2e65b1bfd59")] ->>>>>>> 95797c6d9a18bfc6da212ef8f1ab31fca740c669 ->>>>>>> 410541322fe10bd94eabc88d4c68315f856e4511 +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+08f039f79c4354fdb0c81441e2a211c05029eb3e")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Tasks")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Tasks")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache index 09c46f50..92318ec6 100644 --- a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache +++ b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache @@ -1,9 +1 @@ -<<<<<<< HEAD -daee51f4ae0b8018b8c418b16172fb8ecd139d668d52bb1ab537277927f58958 -======= -<<<<<<< HEAD -da4240456d30e56fa6c5e71babf5565adb3e1436 -======= -ed2444c9be6f03c06e36309150ba72a30e6eef0501c11fcb012bc3a49ae67b45 ->>>>>>> 95797c6d9a18bfc6da212ef8f1ab31fca740c669 ->>>>>>> 410541322fe10bd94eabc88d4c68315f856e4511 +fcced4c252e130567d4415557153ca96b343659fd89117b9500aad7636ec5a3e diff --git a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.GeneratedMSBuildEditorConfig.editorconfig index aa57dd8c..9a880b7c 100644 --- a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,6 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Tasks -build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.Tasks\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Tasks\ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/Aucma.Core.DataCollector/DataCollectorSetup.cs b/Aucma.Core.DataCollector/DataCollectorSetup.cs index f7f95a90..2f919465 100644 --- a/Aucma.Core.DataCollector/DataCollectorSetup.cs +++ b/Aucma.Core.DataCollector/DataCollectorSetup.cs @@ -1,6 +1,7 @@ using Admin.Core.Common; using Admin.Core.IService.IService_New; using Aucma.Core.DataCollector.Factory; +using log4net; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.DependencyInjection; using Org.BouncyCastle.Crypto.Tls; @@ -14,7 +15,9 @@ namespace Aucma.Core.DataCollector { public static class DataCollectorSetup { - public static IApplicationBuilder UseDataCollectorExtensions(this IApplicationBuilder app) + public static readonly log4net.ILog _logger = LogManager.GetLogger(typeof(DataCollectorSetup)); + + public static IApplicationBuilder UseDataCollectorExtensions(this IApplicationBuilder app) { if (app == null) throw new ArgumentNullException(nameof(app)); @@ -26,39 +29,51 @@ namespace Aucma.Core.DataCollector if (!string.IsNullOrEmpty(stationCode)) { - if(stationCode == "1002") //箱壳、内胆，包含预装线、集存库 + try { - Task.Run(() => + if (stationCode == "1002") //箱壳、内胆，包含预装线、集存库 { - DataCollectorFactory collector = new ShellStoreFactory(_deviceParamServices, _deviceAlarmInfoServices, _deviceElectricityServices); + Task.Run(() => + { + DataCollectorFactory collector = new ShellStoreFactory(_deviceParamServices, _deviceAlarmInfoServices, _deviceElectricityServices); - Parallel.Invoke(() => collector.CollectDeviceAlarmInfo(out var alarmInfos), () => collector.CollectDeviceElectricity(out var electricity)); - }); + Parallel.Invoke(() => collector.CollectDeviceAlarmInfo(out var alarmInfos), () => collector.CollectDeviceElectricity(out var electricity)); + }); - Task.Run(() => - { - DataCollectorFactory collector = new LinerStoreFactory(_deviceParamServices, _deviceAlarmInfoServices, _deviceElectricityServices); + Task.Run(() => + { + DataCollectorFactory collector = new LinerStoreFactory(_deviceParamServices, _deviceAlarmInfoServices, _deviceElectricityServices); - Parallel.Invoke(() => collector.CollectDeviceAlarmInfo(out var alarmInfos), () => collector.CollectDeviceElectricity(out var electricity)); - }); - }else if(stationCode == "1005")//泡前库、发泡线、发泡机、泡后库 - { - Task.Run(() => + Parallel.Invoke(() => collector.CollectDeviceAlarmInfo(out var alarmInfos), () => collector.CollectDeviceElectricity(out var electricity)); + }); + } + else if (stationCode == "1005")//泡前库、发泡线、发泡机、泡后库 { - DataCollectorFactory collector = new BoxFoamFactory(_deviceParamServices, _deviceAlarmInfoServices, _deviceElectricityServices); + Task.Run(() => + { + DataCollectorFactory collector = new BoxFoamFactory(_deviceParamServices, _deviceAlarmInfoServices, _deviceElectricityServices); - Parallel.Invoke(() => collector.CollectDeviceAlarmInfo(out var alarmInfos), () => collector.CollectDeviceElectricity(out var electricity)); - }); - }else if(stationCode == "1010")//成品分垛 - { - Task.Run(() => + Parallel.Invoke(() => collector.CollectDeviceAlarmInfo(out var alarmInfos), () => collector.CollectDeviceElectricity(out var electricity)); + }); + } + else if (stationCode == "1010")//成品分垛 { - DataCollectorFactory collector = new PalletizFactory(_deviceParamServices, _deviceAlarmInfoServices, _deviceElectricityServices); + Task.Run(() => + { + DataCollectorFactory collector = new PalletizFactory(_deviceParamServices, _deviceAlarmInfoServices, _deviceElectricityServices); - Parallel.Invoke(() => collector.CollectDeviceAlarmInfo(out var alarmInfos), () => collector.CollectDeviceElectricity(out var electricity)); - }); + Parallel.Invoke(() => collector.CollectDeviceAlarmInfo(out var alarmInfos), () => collector.CollectDeviceElectricity(out var electricity)); + }); + } + }catch(Exception ex) + { + _logger.Error($"UseDataCollectorExtensions逻辑执行异常:{ex.Message}"); } } + else + { + new InvalidOperationException($"设备数据采集逻辑初始化失败:未获取到工位编号"); + } return app; diff --git a/HwControlLib/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs b/HwControlLib/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs index f1700855..daa86c24 100644 --- a/HwControlLib/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs +++ b/HwControlLib/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs @@ -15,7 +15,7 @@ namespace XamlGeneratedNamespace { /// GeneratedInternalTypeHelper /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.9.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.3.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper { diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfo.cs b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfo.cs index 1fa20952..c6feafe5 100644 --- a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfo.cs +++ b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("HwControlLib")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+80855072cfd26687ca78afc936ada8b716b600bb")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+08f039f79c4354fdb0c81441e2a211c05029eb3e")] [assembly: System.Reflection.AssemblyProductAttribute("HwControlLib")] [assembly: System.Reflection.AssemblyTitleAttribute("HwControlLib")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfoInputs.cache b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfoInputs.cache index 21dfbdbd..d74d346d 100644 --- a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfoInputs.cache +++ b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfoInputs.cache @@ -1 +1 @@ -ab372d772e86440ff6b6c03e196c5e2ad507cc355b0676ff243000fed30a91e1 +1ed05d3a7db966fb4671d718249d9d84519ef6c2db9dded8bc345c3230d77c75 diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig index 5e32ba4e..ff214ef2 100644 --- a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig +++ b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,6 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = HwControlLib -build_property.ProjectDir = E:\c#\AUCMA\new\HwControlLib\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\HwControlLib\ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.assets.cache b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.assets.cache index 7a09d7d63753189f9c507989ccd35e7cc6e7fdd0..51e71961ca4bb7875ddebacffd8186c27e2916c4 100644 GIT binary patch literal 324 zcmWIWc6a1qU|`sGdAgrO8>i-UpIHtQ)-KHuOGwyVKb`lHg01>-=I~o>4vauWL;@C| zIt6E|n9$$p8Pq#09+PXa^EVH;Y zF-IY|q%_Oeg9-pO=Zkf_X)wlFDEwtTk&%Fxz|87!~!Ou zLV0Jan9$(E>NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\admin\.nuget\packages\;D:\install\VS\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages + C:\Users\Lenovo\.nuget\packages\;D:\开发环境\DevExpress\Components\Offline Packages;D:\开发工具\Visual Studio 2019\Shared\NuGetPackages;C:\Program Files\dotnet\sdk\NuGetFallbackFolder PackageReference - 6.8.1 + 6.9.1 - - + + + + \ No newline at end of file diff --git a/HwControlLib/obj/project.assets.json b/HwControlLib/obj/project.assets.json index 80881cd8..a3f1b835 100644 --- a/HwControlLib/obj/project.assets.json +++ b/HwControlLib/obj/project.assets.json @@ -8,23 +8,28 @@ "net6.0-windows7.0": [] }, "packageFolders": { - "C:\\Users\\admin\\.nuget\\packages\\": {}, - "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {} + "C:\\Users\\Lenovo\\.nuget\\packages\\": {}, + "D:\\开发环境\\DevExpress\\Components\\Offline Packages": {}, + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages": {}, + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj", "projectName": "HwControlLib", - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj", - "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", - "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\obj\\", + "projectPath": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj", + "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", + "outputPath": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\install\\VS\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + "D:\\开发环境\\DevExpress\\Components\\Offline Packages", + "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -32,8 +37,9 @@ "net6.0-windows" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {}, + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0-windows7.0": { @@ -45,6 +51,11 @@ "warnAsError": [ "NU1605" ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" } }, "frameworks": { @@ -69,7 +80,7 @@ "privateAssets": "none" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json" } } } diff --git a/HwControlLib/obj/project.nuget.cache b/HwControlLib/obj/project.nuget.cache index c8fba8ac..6939b358 100644 --- a/HwControlLib/obj/project.nuget.cache +++ b/HwControlLib/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "Lldp0WwKv+WofUzsqhZJ/oOT3RuTSOiglpZojOboMh6lba8xJ+wNaDv46uD9G2F52iYt2kUp+s3r14ZwXLdqWw==", + "dgSpecHash": "8VHCZjfxPgjrzPcG94ZcZRTYMLoR3BoZWYVsc5F8CcWA2w5qr9WzBXilpzCvLkq4aV7eWTwXrr0qnESvVVeeyQ==", "success": true, - "projectFilePath": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj", + "projectFilePath": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj", "expectedPackageFiles": [], "logs": [] } \ No newline at end of file From 8df6c854cecec7a6c02b1024caa8851e0e5c4343 Mon Sep 17 00:00:00 2001 From: "liulb@mesnac.com" Date: Tue, 26 Mar 2024 19:28:32 +0800 Subject: [PATCH 4/4] . --- .../Debug/net6.0/Admin.Core.Api.assets.cache | Bin 143057 -> 143306 bytes .../Admin.Core.FrameWork.AssemblyInfo.cs | 6 +----- ...in.Core.FrameWork.AssemblyInfoInputs.cache | 6 +----- ....GeneratedMSBuildEditorConfig.editorconfig | 4 +++- ...Admin.Core.RealTimeService.AssemblyInfo.cs | 6 +----- ...e.RealTimeService.AssemblyInfoInputs.cache | 6 +----- ....GeneratedMSBuildEditorConfig.editorconfig | 4 +++- 7 files changed, 10 insertions(+), 22 deletions(-) diff --git a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.assets.cache b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.assets.cache index 4dfe8b1d4ec8f5bb7b4d5e0079b4c6fbb28782fd..ec49d7d01265b78b8516ab927d9f08b15bd79443 100644 GIT binary patch delta 281 zcmcb3m*doZjtLq}7V{gmwrVk2&#Px-U|`tE_+tI;r~T8O@0t8`?TlyB+Mn#+rr=@~ z6Ht_&m6}`g?+n6YT8h;uzzYlAD>Q=bT@Zs^?gc8Izxs6;l9Fte01s zo?4=poS2-Es_<<3wwI0VPdhfeoWAbmq8U~So_S@7IhiR6K*a^AMJ1IAp_wVEc_o=? znW;qz$r*`7iOD6YMOF$ndI|xFB^e5;M&@OyMa7xF5p3=C(0_$&~g1LE`Bv*t0TPtf9X$xKYo%P%g;Om@ysN#zX9OG!-w8j->g ToC-8Hv!s$eJh3P*GcO$gMCNO4 delta 30 lcmX?gpX1_PjtLq}ne!U8wrVk2&tqi(g45eA=QE~H006r43giF) diff --git a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs index 5c985549..72db80ae 100644 --- a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs +++ b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs @@ -14,11 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.FrameWork")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -<<<<<<< HEAD -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] -======= -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+91808221759aca287573a9c1018fc2e65b1bfd59")] ->>>>>>> 95797c6d9a18bfc6da212ef8f1ab31fca740c669 +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+6c9deba793354fcee29055ee983f20320b0e4297")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.FrameWork")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.FrameWork")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache index cadffeb5..0858813f 100644 --- a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache +++ b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache @@ -1,5 +1 @@ -<<<<<<< HEAD -7d60a94dd38c10522cbfe4a021ccb6e9c5da0354 -======= -7a1813a9a5d1d19b18e25488399390e5b0d29d88f5978494e031c73a36870caf ->>>>>>> 95797c6d9a18bfc6da212ef8f1ab31fca740c669 +3f6f2c5c541bbfa5a69e8868dcff127c3e49b75abc7b903722f20b20f6c9cb84 diff --git a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.GeneratedMSBuildEditorConfig.editorconfig index a3871f56..73c91585 100644 --- a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.GeneratedMSBuildEditorConfig.editorconfig @@ -1,3 +1,5 @@ is_global = true build_property.RootNamespace = Admin.Core.FrameWork -build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.FrameWork\ +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.FrameWork\ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs index c14c1668..aa05e8b4 100644 --- a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs +++ b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs @@ -14,11 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.RealTimeService")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -<<<<<<< HEAD -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] -======= -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+91808221759aca287573a9c1018fc2e65b1bfd59")] ->>>>>>> 95797c6d9a18bfc6da212ef8f1ab31fca740c669 +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+6c9deba793354fcee29055ee983f20320b0e4297")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.RealTimeService")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.RealTimeService")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache index 4649b980..39725a89 100644 --- a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache +++ b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache @@ -1,5 +1 @@ -<<<<<<< HEAD -0868e6bde5b49a65a126b91d794e990427a11761 -======= -b90aaf21ce2e9da9e13b0fb64d65797eba9a93af543963c310c73e113c750708 ->>>>>>> 95797c6d9a18bfc6da212ef8f1ab31fca740c669 +fe29d5924a370deb7261b0720bc0cde0083c745e8da42eaa4cdd69d6cd9f67ad diff --git a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.GeneratedMSBuildEditorConfig.editorconfig index 6a8a8ca9..8f33dc40 100644 --- a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,6 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.RealTimeService -build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.RealTimeService\ +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.RealTimeService\ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop =