From 1c696f3e12ddcb136e772f9d83eb906760766b96 Mon Sep 17 00:00:00 2001 From: huanghongfeng <huanghongfeng@hnkhzn.com> Date: 星期二, 03 十二月 2024 21:37:58 +0800 Subject: [PATCH] 1 --- 代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/project.assets.json | 97 ++++++++++++++++++++++++++++-------------------- 1 files changed, 56 insertions(+), 41 deletions(-) diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/project.assets.json" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/project.assets.json" index 1faa2ff..0770808 100644 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/project.assets.json" +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/project.assets.json" @@ -873,11 +873,10 @@ "lib/netstandard2.0/Oscar.Data.SqlClient.dll": {} } }, - "Quartz/3.11.0": { + "Quartz/3.13.1": { "type": "package", "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "2.1.1", - "System.Configuration.ConfigurationManager": "6.0.1" + "Microsoft.Extensions.Logging.Abstractions": "2.1.1" }, "compile": { "lib/net6.0/Quartz.dll": { @@ -1638,7 +1637,7 @@ "lib/netstandard1.0/System.ComponentModel.Primitives.dll": {} } }, - "System.Configuration.ConfigurationManager/6.0.1": { + "System.Configuration.ConfigurationManager/6.0.0": { "type": "package", "dependencies": { "System.Security.Cryptography.ProtectedData": "6.0.0", @@ -3266,7 +3265,7 @@ "lib/netstandard1.3/System.Xml.XPath.XDocument.dll": {} } }, - "WIDESEAWCS_Communicator/2.0.0": { + "WIDESEAWCS_Communicator/2.2.1": { "type": "package", "dependencies": { "HslCommunication": "11.6.4" @@ -3278,7 +3277,7 @@ "lib/net6.0/WIDESEAWCS_Communicator.dll": {} } }, - "WIDESEAWCS_Core/1.0.4": { + "WIDESEAWCS_Core/1.0.7": { "type": "package", "dependencies": { "AutoMapper": "13.0.1", @@ -3309,12 +3308,12 @@ "lib/net6.0/WIDESEAWCS_Core.dll": {} } }, - "WIDESEAWCS_QuartzJob/2.0.3": { + "WIDESEAWCS_QuartzJob/2.1.2": { "type": "package", "dependencies": { - "Quartz": "3.11.0", - "WIDESEAWCS_Communicator": "2.0.0", - "WIDESEAWCS_Core": "1.0.4" + "Quartz": "3.13.1", + "WIDESEAWCS_Communicator": "2.2.1", + "WIDESEAWCS_Core": "1.0.6" }, "compile": { "lib/net6.0/WIDESEAWCS_QuartzJob.dll": {} @@ -3327,6 +3326,7 @@ "type": "project", "framework": ".NETCoreApp,Version=v6.0", "dependencies": { + "WIDESEAWCS_Core": "1.0.7", "WIDESEAWCS_IBasicInfoRepository": "1.0.0" }, "compile": { @@ -3340,8 +3340,9 @@ "type": "project", "framework": ".NETCoreApp,Version=v6.0", "dependencies": { + "WIDESEAWCS_Core": "1.0.7", "WIDESEAWCS_IBasicInfoService": "1.0.0", - "WIDESEAWCS_QuartzJob": "2.0.3" + "WIDESEAWCS_QuartzJob": "2.1.2" }, "compile": { "bin/placeholder/WIDESEAWCS_BasicInfoService.dll": {} @@ -3354,7 +3355,8 @@ "type": "project", "framework": ".NETCoreApp,Version=v6.0", "dependencies": { - "Newtonsoft.Json": "13.0.3" + "Newtonsoft.Json": "13.0.3", + "WIDESEAWCS_Core": "1.0.7" }, "compile": { "bin/placeholder/WIDESEAWCS_Common.dll": {} @@ -3367,6 +3369,7 @@ "type": "project", "framework": ".NETCoreApp,Version=v6.0", "dependencies": { + "WIDESEAWCS_Core": "1.0.7", "WIDESEAWCS_Model": "1.0.0" }, "compile": { @@ -3380,6 +3383,7 @@ "type": "project", "framework": ".NETCoreApp,Version=v6.0", "dependencies": { + "WIDESEAWCS_Core": "1.0.7", "WIDESEAWCS_DTO": "1.0.0" }, "compile": { @@ -3393,7 +3397,8 @@ "type": "project", "framework": ".NETCoreApp,Version=v6.0", "dependencies": { - "WIDESEAWCS_BasicInfoRepository": "1.0.0" + "WIDESEAWCS_BasicInfoRepository": "1.0.0", + "WIDESEAWCS_Core": "1.0.7" }, "compile": { "bin/placeholder/WIDESEAWCS_IBasicInfoService.dll": {} @@ -3406,6 +3411,7 @@ "type": "project", "framework": ".NETCoreApp,Version=v6.0", "dependencies": { + "WIDESEAWCS_Core": "1.0.7", "WIDESEAWCS_DTO": "1.0.0" }, "compile": { @@ -3419,6 +3425,7 @@ "type": "project", "framework": ".NETCoreApp,Version=v6.0", "dependencies": { + "WIDESEAWCS_Core": "1.0.7", "WIDESEAWCS_TaskInfoRepository": "1.0.0" }, "compile": { @@ -3434,7 +3441,7 @@ "dependencies": { "System.Text.RegularExpressions": "4.3.1", "WIDESEAWCS_Common": "1.0.0", - "WIDESEAWCS_Core": "1.0.4" + "WIDESEAWCS_Core": "1.0.7" }, "compile": { "bin/placeholder/WIDESEAWCS_Model.dll": {} @@ -3447,6 +3454,7 @@ "type": "project", "framework": ".NETCoreApp,Version=v6.0", "dependencies": { + "WIDESEAWCS_Core": "1.0.7", "WIDESEAWCS_ITaskInfoRepository": "1.0.0", "WIDESEAWCS_Model": "1.0.0" }, @@ -4852,10 +4860,10 @@ "oscar.data.sqlclient.nuspec" ] }, - "Quartz/3.11.0": { - "sha512": "dx8K/3C7P+o+tNI7LosOwoCWjT8aM/AojO+3IPlp4ArvgVcqf36pYu3Rqorcxc4kfklfHcFRrS9hQAIgp6TkGg==", + "Quartz/3.13.1": { + "sha512": "0S4/gYb/FRQfek65OPAmszbdEmtc4Fq/jSeA5XFnvMIjYL9Zr8g9jWoKneEFzAFJGlESjFULtaUFzValHvqu4A==", "type": "package", - "path": "quartz/3.11.0", + "path": "quartz/3.13.1", "files": [ ".nupkg.metadata", ".signature.p7s", @@ -4868,7 +4876,7 @@ "lib/netstandard2.0/Quartz.dll", "lib/netstandard2.0/Quartz.xml", "quartz-logo-small.png", - "quartz.3.11.0.nupkg.sha512", + "quartz.3.13.1.nupkg.sha512", "quartz.nuspec", "quick-start.md" ] @@ -6063,10 +6071,10 @@ "system.componentmodel.primitives.nuspec" ] }, - "System.Configuration.ConfigurationManager/6.0.1": { - "sha512": "jXw9MlUu/kRfEU0WyTptAVueupqIeE3/rl0EZDMlf8pcvJnitQ8HeVEp69rZdaStXwTV72boi/Bhw8lOeO+U2w==", + "System.Configuration.ConfigurationManager/6.0.0": { + "sha512": "7T+m0kDSlIPTHIkPMIu6m6tV6qsMqJpvQWW2jIc2qi7sn40qxFo0q+7mEQAhMPXZHMKnWrnv47ntGlM/ejvw3g==", "type": "package", - "path": "system.configuration.configurationmanager/6.0.1", + "path": "system.configuration.configurationmanager/6.0.0", "files": [ ".nupkg.metadata", ".signature.p7s", @@ -6083,7 +6091,7 @@ "lib/netstandard2.0/System.Configuration.ConfigurationManager.xml", "runtimes/win/lib/net461/System.Configuration.ConfigurationManager.dll", "runtimes/win/lib/net461/System.Configuration.ConfigurationManager.xml", - "system.configuration.configurationmanager.6.0.1.nupkg.sha512", + "system.configuration.configurationmanager.6.0.0.nupkg.sha512", "system.configuration.configurationmanager.nuspec", "useSharedDesignerContext.txt" ] @@ -9955,36 +9963,36 @@ "system.xml.xpath.xdocument.nuspec" ] }, - "WIDESEAWCS_Communicator/2.0.0": { - "sha512": "QAOuV1Lf2Is3m9LInU2FzrKW6aEsSXPU1lyPh/1I/aeybGZdo8Kn1yZRz/7XOmUyhz3xraIMo+HOCiPWNvmMmA==", + "WIDESEAWCS_Communicator/2.2.1": { + "sha512": "tnBgSsd877vqRMaNxBmhIWgTQcxmv/TNXLAZeNquLQ2AZiZKbSGVN3eUn5ZN/yf+TxUOoSrf+0ZKNjxLGHDTyg==", "type": "package", - "path": "wideseawcs_communicator/2.0.0", + "path": "wideseawcs_communicator/2.2.1", "files": [ ".nupkg.metadata", "lib/net6.0/WIDESEAWCS_Communicator.dll", - "wideseawcs_communicator.2.0.0.nupkg.sha512", + "wideseawcs_communicator.2.2.1.nupkg.sha512", "wideseawcs_communicator.nuspec" ] }, - "WIDESEAWCS_Core/1.0.4": { - "sha512": "Dqirw1ltzlX+KdgZYZpeHmZDAGu7N11MFOaKTFy60VwPxSk0ust8PEhjlHspKFkllxwIrktXo2mY93eYld1ANQ==", + "WIDESEAWCS_Core/1.0.7": { + "sha512": "HT/w9xN4ebGLiHAwoWP/Nbi1HtlRH8dJT2ZWbSOgpTYUB8FW7qWyWDDGhRR4qvWISWQq3BkKPYALqSLr6w+nWA==", "type": "package", - "path": "wideseawcs_core/1.0.4", + "path": "wideseawcs_core/1.0.7", "files": [ ".nupkg.metadata", "lib/net6.0/WIDESEAWCS_Core.dll", - "wideseawcs_core.1.0.4.nupkg.sha512", + "wideseawcs_core.1.0.7.nupkg.sha512", "wideseawcs_core.nuspec" ] }, - "WIDESEAWCS_QuartzJob/2.0.3": { - "sha512": "dzE84APxBT7kKqOzeNbOY3kWx72/f2hXH8HeL/XocLlcysbrXLPmL3R8XABdpAIpl3M/55x8nG0QfbFzn/obpg==", + "WIDESEAWCS_QuartzJob/2.1.2": { + "sha512": "4MzaRsKMe7YGgTdDr2SkAL6Me8ZZhBs7upH4JCsU3nklGbWnciguaXBBY8to+3STY0Sm0XvFmiOOCzVXPfL1Yw==", "type": "package", - "path": "wideseawcs_quartzjob/2.0.3", + "path": "wideseawcs_quartzjob/2.1.2", "files": [ ".nupkg.metadata", "lib/net6.0/WIDESEAWCS_QuartzJob.dll", - "wideseawcs_quartzjob.2.0.3.nupkg.sha512", + "wideseawcs_quartzjob.2.1.2.nupkg.sha512", "wideseawcs_quartzjob.nuspec" ] }, @@ -10042,6 +10050,7 @@ "projectFileDependencyGroups": { "net6.0": [ "WIDESEAWCS_BasicInfoService >= 1.0.0", + "WIDESEAWCS_Core >= 1.0.7", "WIDESEAWCS_ITaskInfoService >= 1.0.0" ] }, @@ -10052,11 +10061,11 @@ "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "F:\\澶栧嚭椤圭洰\\灏栧北\\10-29\\浠g爜绠$悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TaskInfoService\\WIDESEAWCS_TaskInfoService.csproj", + "projectUniqueName": "F:\\澶栧嚭椤圭洰\\灏栧北\\11-1\\浠g爜绠$悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TaskInfoService\\WIDESEAWCS_TaskInfoService.csproj", "projectName": "WIDESEAWCS_TaskInfoService", - "projectPath": "F:\\澶栧嚭椤圭洰\\灏栧北\\10-29\\浠g爜绠$悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TaskInfoService\\WIDESEAWCS_TaskInfoService.csproj", + "projectPath": "F:\\澶栧嚭椤圭洰\\灏栧北\\11-1\\浠g爜绠$悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TaskInfoService\\WIDESEAWCS_TaskInfoService.csproj", "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "F:\\澶栧嚭椤圭洰\\灏栧北\\10-29\\浠g爜绠$悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TaskInfoService\\obj\\", + "outputPath": "F:\\澶栧嚭椤圭洰\\灏栧北\\11-1\\浠g爜绠$悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TaskInfoService\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" @@ -10077,11 +10086,11 @@ "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "F:\\澶栧嚭椤圭洰\\灏栧北\\10-29\\浠g爜绠$悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_BasicInfoService\\WIDESEAWCS_BasicInfoService.csproj": { - "projectPath": "F:\\澶栧嚭椤圭洰\\灏栧北\\10-29\\浠g爜绠$悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_BasicInfoService\\WIDESEAWCS_BasicInfoService.csproj" + "F:\\澶栧嚭椤圭洰\\灏栧北\\11-1\\浠g爜绠$悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_BasicInfoService\\WIDESEAWCS_BasicInfoService.csproj": { + "projectPath": "F:\\澶栧嚭椤圭洰\\灏栧北\\11-1\\浠g爜绠$悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_BasicInfoService\\WIDESEAWCS_BasicInfoService.csproj" }, - "F:\\澶栧嚭椤圭洰\\灏栧北\\10-29\\浠g爜绠$悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_ITaskInfoService\\WIDESEAWCS_ITaskInfoService.csproj": { - "projectPath": "F:\\澶栧嚭椤圭洰\\灏栧北\\10-29\\浠g爜绠$悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_ITaskInfoService\\WIDESEAWCS_ITaskInfoService.csproj" + "F:\\澶栧嚭椤圭洰\\灏栧北\\11-1\\浠g爜绠$悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_ITaskInfoService\\WIDESEAWCS_ITaskInfoService.csproj": { + "projectPath": "F:\\澶栧嚭椤圭洰\\灏栧北\\11-1\\浠g爜绠$悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_ITaskInfoService\\WIDESEAWCS_ITaskInfoService.csproj" } } } @@ -10095,6 +10104,12 @@ "frameworks": { "net6.0": { "targetAlias": "net6.0", + "dependencies": { + "WIDESEAWCS_Core": { + "target": "Package", + "version": "[1.0.7, )" + } + }, "imports": [ "net461", "net462", -- Gitblit v1.9.3