From b86734fdffbf4635c6e9d7ae9f1c40e0b6cf9583 Mon Sep 17 00:00:00 2001 From: wenjy Date: Mon, 15 Jan 2024 17:30:55 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E6=B7=BB=E5=8A=A0=E8=80=81?= =?UTF-8?q?=E7=BA=BF=E5=8F=91=E6=B3=A1=E4=B8=8A=E4=BD=8D=E6=9C=BA=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../obj/Admin.Core.Api.csproj.nuget.g.props | 10 ++-- ....GeneratedMSBuildEditorConfig.editorconfig | 4 +- Admin.Core.Api/obj/project.assets.json | 43 ++++++++++-------- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../Aucma.Core.OldBoxFoam.csproj | 2 + Aucma.Core.OldBoxFoam/a0trc-1a37y.ico | Bin 0 -> 165662 bytes .../GeneratedInternalTypeHelper.g.i.cs | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../net6.0-windows/HwControlLib.assets.cache | Bin 152 -> 265 bytes .../HwControlLib_MarkupCompile.i.cache | 4 +- .../obj/HwControlLib.csproj.nuget.dgspec.json | 25 ++++++---- .../obj/HwControlLib.csproj.nuget.g.props | 8 ++-- HwControlLib/obj/project.assets.json | 25 ++++++---- HwControlLib/obj/project.nuget.cache | 4 +- 22 files changed, 85 insertions(+), 62 deletions(-) create mode 100644 Aucma.Core.OldBoxFoam/a0trc-1a37y.ico 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 a5a55588..15920027 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,18 +5,20 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\admin\.nuget\packages\ + C:\Users\Lenovo\.nuget\packages\;D:\开发工具\Visual Studio 2019\Shared\NuGetPackages;C:\Program Files\dotnet\sdk\NuGetFallbackFolder PackageReference - 6.7.0 + 6.5.0 - + + + - C:\Users\admin\.nuget\packages\microsoft.extensions.apidescription.server\3.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.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.GeneratedMSBuildEditorConfig.editorconfig index 601c80d9..d1d06cea 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,9 +9,9 @@ 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.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/project.assets.json b/Admin.Core.Api/obj/project.assets.json index 0b70ebdd..abdbbbf7 100644 --- a/Admin.Core.Api/obj/project.assets.json +++ b/Admin.Core.Api/obj/project.assets.json @@ -7067,12 +7067,11 @@ ] }, "System.Collections.NonGeneric/4.3.0": { - "sha512": "prtjIEMhGUnQq6RnPEYLpFt8AtLbp9yq2zxOSrY7KJJZrw25Fi97IzBqY7iqssbM61Ek5b8f3MG/sG1N2sN5KA==", + "sha512": "LE/oChpRvkSi3U25u0KnJcI44JeDZ1QJCyN4qFDx2uusEypdqR24w7lKYw21eYe5esuCBuc862wRmpF63Yy1KQ==", "type": "package", "path": "system.collections.nongeneric/4.3.0", "files": [ ".nupkg.metadata", - ".signature.p7s", "ThirdPartyNotices.txt", "dotnet_library_license.txt", "lib/MonoAndroid10/_._", @@ -9805,12 +9804,11 @@ ] }, "System.Runtime.Serialization.Primitives/4.3.0": { - "sha512": "Wz+0KOukJGAlXjtKr+5Xpuxf8+c8739RI1C+A2BoQZT+wMCCoMDDdO8/4IRHfaVINqL78GO8dW8G2lW/e45Mcw==", + "sha512": "2Z5t70a2SwMsfQDp9KOclaZNyQhfIga2gppq9lIUDM1A4ohTshn4JqT7ir8bvIhXgorWKYDAr6rPzEbi/nTGKg==", "type": "package", "path": "system.runtime.serialization.primitives/4.3.0", "files": [ ".nupkg.metadata", - ".signature.p7s", "ThirdPartyNotices.txt", "dotnet_library_license.txt", "lib/MonoAndroid10/_._", @@ -11277,40 +11275,47 @@ ] }, "packageFolders": { - "C:\\Users\\admin\\.nuget\\packages\\": {} + "C:\\Users\\Lenovo\\.nuget\\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\\Admin.Core.Api\\Admin.Core.Api.csproj", + "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", "projectName": "Admin.Core.Api", - "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\\", + "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:\\开发工具\\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\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "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.Extensions\\Admin.Core.Extensions.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.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.Service\\Admin.Core.Service.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.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\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { + "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj" } } } @@ -11353,7 +11358,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } } 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 2ffa7b25..1fdeb046 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,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Extensions -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Extensions\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Extensions\ 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 34f11e1e..5decb385 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,3 @@ is_global = true build_property.RootNamespace = Admin.Core.FrameWork -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.FrameWork\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.FrameWork\ 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 2b7e2280..968ed779 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,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.IRepository -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.IRepository\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.IRepository\ 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 ba998751..1e7c9f10 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,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.IService -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.IService\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.IService\ 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 f17e3fdc..173f98e4 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,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Model -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Model\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Model\ 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 ce84cb9f..abc27d01 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,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.RealTimeService -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.RealTimeService\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.RealTimeService\ 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 41538400..67886d71 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,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Repository -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Repository\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Repository\ 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 19486c3e..9c6bffa2 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,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Service -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Service\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Service\ 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 d114eba8..48679c0e 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,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Tasks -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Tasks\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Tasks\ diff --git a/Aucma.Core.OldBoxFoam/Aucma.Core.OldBoxFoam.csproj b/Aucma.Core.OldBoxFoam/Aucma.Core.OldBoxFoam.csproj index aaaaf6b5..9b091ebd 100644 --- a/Aucma.Core.OldBoxFoam/Aucma.Core.OldBoxFoam.csproj +++ b/Aucma.Core.OldBoxFoam/Aucma.Core.OldBoxFoam.csproj @@ -6,6 +6,7 @@ enable true true + a0trc-1a37y.ico @@ -33,6 +34,7 @@ + PreserveNewest true diff --git a/Aucma.Core.OldBoxFoam/a0trc-1a37y.ico b/Aucma.Core.OldBoxFoam/a0trc-1a37y.ico new file mode 100644 index 0000000000000000000000000000000000000000..c26f24a7067591dca22662797dcee6d466b0664f GIT binary patch literal 165662 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 literal 0 HcmV?d00001 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 36288f46..57f88858 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.12.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.4.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.GeneratedMSBuildEditorConfig.editorconfig b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig index a4db58d9..54fddce2 100644 --- a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig +++ b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = HwControlLib -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\HwControlLib\ +build_property.ProjectDir = E:\桌面\AUCMA_SCADA\HwControlLib\ diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.assets.cache b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.assets.cache index a056af0d3f9dc463157ec9d2f3a3a69d49f71e33..decde3af09d0c22125e131bf62df934b15aa51db 100644 GIT binary patch literal 265 zcmWIWc6a1qU|?8kDfadCLeXf^57!-a7k0l+zAeJyz9g1&wdn2p^RFHF#mWd&L?mDa zs#9>biU}=FEh>)jNzKbI%a75^D@{)=i77}-&Q45EEsg=1W$t1X^K?(c)BcH1w=aF# zx;-W=v$!-dMpwIl$l8KhSqXhA?xetJ=2u7X=; j4$#Du{E|GN4aF(h5Y=vpIXOu{9d7wKDXB#uJ@^0sWw1zb literal 152 zcmWIWc6a1qU|?Xq@9Jg9SCTDi6U!hcgGHs#b-%!P^sj>5aOaZDP7BB)8 n$~#-dgche36~`o|NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\admin\.nuget\packages\ + C:\Users\Lenovo\.nuget\packages\;D:\开发工具\Visual Studio 2019\Shared\NuGetPackages;C:\Program Files\dotnet\sdk\NuGetFallbackFolder PackageReference - 6.7.0 + 6.5.0 - + + + \ No newline at end of file diff --git a/HwControlLib/obj/project.assets.json b/HwControlLib/obj/project.assets.json index 57c51ab1..1558f2be 100644 --- a/HwControlLib/obj/project.assets.json +++ b/HwControlLib/obj/project.assets.json @@ -8,27 +8,34 @@ "net6.0-windows7.0": [] }, "packageFolders": { - "C:\\Users\\admin\\.nuget\\packages\\": {} + "C:\\Users\\Lenovo\\.nuget\\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:\\开发工具\\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\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ "net6.0-windows" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "https://api.nuget.org/v3/index.json": {} + "https://api.nuget.org/v3/index.json": {}, + "https://nuget.cnblogs.com/v3/index.json": {} }, "frameworks": { "net6.0-windows7.0": { @@ -64,7 +71,7 @@ "privateAssets": "none" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" } } } diff --git a/HwControlLib/obj/project.nuget.cache b/HwControlLib/obj/project.nuget.cache index 7ca2e0be..248dc48c 100644 --- a/HwControlLib/obj/project.nuget.cache +++ b/HwControlLib/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "vdyWe2SVons+Y6get5R5Z1bsudk/C2JG+/yY8r3PrvTCQlFwmP/yYc/iedeQUqhixJt2UKO0GhNSvd1iLTRIlw==", + "dgSpecHash": "ybnvfUshvvKIc46usGVB7kox/SCKkseLBijIGbMXdvJYCOdNE/0WN/DZO6u3XNrg5fccw9Qd0IkJ00WdmrPlEg==", "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