diff --git a/.gitignore b/.gitignore index 3a2267ef..65f89a8c 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,29 @@ # 此 .gitignore 文件已由 Microsoft(R) Visual Studio 自动创建。 ################################################################################ -/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal_MarkupCompile.i.lref -/.vs/Admin.Core/FileContentIndex/6f56b2d7-5312-4f2c-a564-5353de3db65d.vsidx +#/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal_MarkupCompile.i.lref +#/.vs/Admin.Core/FileContentIndex/6f56b2d7-5312-4f2c-a564-5353de3db65d.vsidx + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ \ No newline at end of file diff --git a/.vs/Admin.Core/DesignTimeBuild/.dtbcache.v2 b/.vs/Admin.Core/DesignTimeBuild/.dtbcache.v2 index d27c3746..ce7ac0b7 100644 Binary files a/.vs/Admin.Core/DesignTimeBuild/.dtbcache.v2 and b/.vs/Admin.Core/DesignTimeBuild/.dtbcache.v2 differ diff --git a/.vs/Admin.Core/FileContentIndex/14bfed4a-a132-48ca-946a-8be70c032cbc.vsidx b/.vs/Admin.Core/FileContentIndex/14bfed4a-a132-48ca-946a-8be70c032cbc.vsidx new file mode 100644 index 00000000..0e8450e0 Binary files /dev/null and b/.vs/Admin.Core/FileContentIndex/14bfed4a-a132-48ca-946a-8be70c032cbc.vsidx differ diff --git a/.vs/Admin.Core/FileContentIndex/323e8068-0b21-4778-a958-c2a7ae20e688.vsidx b/.vs/Admin.Core/FileContentIndex/323e8068-0b21-4778-a958-c2a7ae20e688.vsidx new file mode 100644 index 00000000..973cafa4 Binary files /dev/null and b/.vs/Admin.Core/FileContentIndex/323e8068-0b21-4778-a958-c2a7ae20e688.vsidx differ diff --git a/.vs/Admin.Core/FileContentIndex/a2e5f08a-e023-4d83-92e1-5b35d49ad667.vsidx b/.vs/Admin.Core/FileContentIndex/a2e5f08a-e023-4d83-92e1-5b35d49ad667.vsidx new file mode 100644 index 00000000..b6f1d432 Binary files /dev/null and b/.vs/Admin.Core/FileContentIndex/a2e5f08a-e023-4d83-92e1-5b35d49ad667.vsidx differ diff --git a/.vs/Admin.Core/FileContentIndex/c4432abd-10ee-4fc6-b02e-0743f0421815.vsidx b/.vs/Admin.Core/FileContentIndex/c4432abd-10ee-4fc6-b02e-0743f0421815.vsidx deleted file mode 100644 index 76c56f08..00000000 Binary files a/.vs/Admin.Core/FileContentIndex/c4432abd-10ee-4fc6-b02e-0743f0421815.vsidx and /dev/null differ diff --git a/.vs/Admin.Core/FileContentIndex/ee1914f6-b355-4662-abf8-44f3f9b7b81b.vsidx b/.vs/Admin.Core/FileContentIndex/ee1914f6-b355-4662-abf8-44f3f9b7b81b.vsidx new file mode 100644 index 00000000..6efeb413 Binary files /dev/null and b/.vs/Admin.Core/FileContentIndex/ee1914f6-b355-4662-abf8-44f3f9b7b81b.vsidx differ diff --git a/.vs/Admin.Core/v17/.futdcache.v2 b/.vs/Admin.Core/v17/.futdcache.v2 index 85c24550..4b9c6f12 100644 Binary files a/.vs/Admin.Core/v17/.futdcache.v2 and b/.vs/Admin.Core/v17/.futdcache.v2 differ diff --git a/.vs/Admin.Core/v17/.suo b/.vs/Admin.Core/v17/.suo index 5e25999c..cfeed8ab 100644 Binary files a/.vs/Admin.Core/v17/.suo and b/.vs/Admin.Core/v17/.suo differ diff --git a/.vs/Admin.Core/v17/HierarchyCache.v1.txt b/.vs/Admin.Core/v17/HierarchyCache.v1.txt new file mode 100644 index 00000000..54b8c25d Binary files /dev/null and b/.vs/Admin.Core/v17/HierarchyCache.v1.txt differ diff --git a/.vs/ProjectEvaluation/admin.core.metadata.v7.bin b/.vs/ProjectEvaluation/admin.core.metadata.v7.bin index 661e63dd..69140b7c 100644 Binary files a/.vs/ProjectEvaluation/admin.core.metadata.v7.bin and b/.vs/ProjectEvaluation/admin.core.metadata.v7.bin differ diff --git a/.vs/ProjectEvaluation/admin.core.projects.v7.bin b/.vs/ProjectEvaluation/admin.core.projects.v7.bin index 6fff95d3..4b19d94f 100644 Binary files a/.vs/ProjectEvaluation/admin.core.projects.v7.bin and b/.vs/ProjectEvaluation/admin.core.projects.v7.bin differ diff --git a/.vs/SCADA/FileContentIndex/21529c8a-073c-4366-ab7b-e11e45bec18b.vsidx b/.vs/SCADA/FileContentIndex/21529c8a-073c-4366-ab7b-e11e45bec18b.vsidx new file mode 100644 index 00000000..cd28ddba Binary files /dev/null and b/.vs/SCADA/FileContentIndex/21529c8a-073c-4366-ab7b-e11e45bec18b.vsidx differ diff --git a/.vs/SCADA/FileContentIndex/801b56bc-874a-4573-8ffd-74c148a4b8e4.vsidx b/.vs/SCADA/FileContentIndex/8f31ba0e-71cb-4b04-a40f-438ecf9d157d.vsidx similarity index 81% rename from .vs/SCADA/FileContentIndex/801b56bc-874a-4573-8ffd-74c148a4b8e4.vsidx rename to .vs/SCADA/FileContentIndex/8f31ba0e-71cb-4b04-a40f-438ecf9d157d.vsidx index 08b03d7d..2c8683d7 100644 Binary files a/.vs/SCADA/FileContentIndex/801b56bc-874a-4573-8ffd-74c148a4b8e4.vsidx and b/.vs/SCADA/FileContentIndex/8f31ba0e-71cb-4b04-a40f-438ecf9d157d.vsidx differ diff --git a/.vs/SCADA/FileContentIndex/8fcb89da-90df-469c-8b93-4f3600c3ddd6.vsidx b/.vs/SCADA/FileContentIndex/8fcb89da-90df-469c-8b93-4f3600c3ddd6.vsidx deleted file mode 100644 index 729da7ed..00000000 Binary files a/.vs/SCADA/FileContentIndex/8fcb89da-90df-469c-8b93-4f3600c3ddd6.vsidx and /dev/null differ diff --git a/.vs/SCADA/FileContentIndex/ae878e25-afc0-4b59-8088-36f42d8485e6.vsidx b/.vs/SCADA/FileContentIndex/a021d8ef-4c29-4c8f-b8da-4690f958d72b.vsidx similarity index 77% rename from .vs/SCADA/FileContentIndex/ae878e25-afc0-4b59-8088-36f42d8485e6.vsidx rename to .vs/SCADA/FileContentIndex/a021d8ef-4c29-4c8f-b8da-4690f958d72b.vsidx index d8a8d2dc..0d5ed5bc 100644 Binary files a/.vs/SCADA/FileContentIndex/ae878e25-afc0-4b59-8088-36f42d8485e6.vsidx and b/.vs/SCADA/FileContentIndex/a021d8ef-4c29-4c8f-b8da-4690f958d72b.vsidx differ diff --git a/.vs/SCADA/v17/.wsuo b/.vs/SCADA/v17/.wsuo index 7eee451d..34a7c8b4 100644 Binary files a/.vs/SCADA/v17/.wsuo and b/.vs/SCADA/v17/.wsuo differ diff --git a/.vs/SCADA/v17/workspaceFileList.bin b/.vs/SCADA/v17/workspaceFileList.bin index eb8d2d79..6bbd7d21 100644 Binary files a/.vs/SCADA/v17/workspaceFileList.bin and b/.vs/SCADA/v17/workspaceFileList.bin differ diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json index de3a1c7a..7f1fd8d8 100644 --- a/.vs/VSWorkspaceState.json +++ b/.vs/VSWorkspaceState.json @@ -1,8 +1,10 @@ { "ExpandedNodes": [ "", + "\\Aucma.Core.Scanner", + "\\Aucma.Core.Scanner\\Scanner", "\\dll" ], - "SelectedNode": "\\Admin.Core.sln", + "SelectedNode": "\\Aucma.Core.Scanner\\Scanner\\ScannerService.cs", "PreviewInSolutionExplorer": false } \ No newline at end of file diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite index 38e7826a..4eb267c3 100644 Binary files a/.vs/slnx.sqlite and b/.vs/slnx.sqlite differ diff --git a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.csproj.AssemblyReference.cache b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.csproj.AssemblyReference.cache index d772bd61..fc426ee8 100644 Binary files a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.csproj.AssemblyReference.cache and b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.csproj.AssemblyReference.cache differ diff --git a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.csproj.AssemblyReference.cache b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.csproj.AssemblyReference.cache index d772bd61..fc426ee8 100644 Binary files a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.csproj.AssemblyReference.cache and b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.csproj.AssemblyReference.cache differ diff --git a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.csproj.AssemblyReference.cache b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.csproj.AssemblyReference.cache index 8c416dc8..1dde9d40 100644 Binary files a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.csproj.AssemblyReference.cache and b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.csproj.AssemblyReference.cache differ diff --git a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.csproj.AssemblyReference.cache b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.csproj.AssemblyReference.cache index a7b5f751..379caa38 100644 Binary files a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.csproj.AssemblyReference.cache and b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.csproj.AssemblyReference.cache differ diff --git a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.csproj.AssemblyReference.cache b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.csproj.AssemblyReference.cache index de7ffa61..c31d47f8 100644 Binary files a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.csproj.AssemblyReference.cache and b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.csproj.AssemblyReference.cache differ diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.csproj.AssemblyReference.cache b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.csproj.AssemblyReference.cache index 3a663980..90f783ba 100644 Binary files a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.csproj.AssemblyReference.cache and b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.csproj.AssemblyReference.cache differ diff --git a/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal.csproj.AssemblyReference.cache b/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal.csproj.AssemblyReference.cache index f220c3f5..951405bc 100644 Binary files a/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal.csproj.AssemblyReference.cache and b/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal.csproj.AssemblyReference.cache differ