diff --git a/.vs/ASCKU Projects/DesignTimeBuild/.dtbcache.v2 b/.vs/ASCKU Projects/DesignTimeBuild/.dtbcache.v2 index 33fc403..685243f 100644 Binary files a/.vs/ASCKU Projects/DesignTimeBuild/.dtbcache.v2 and b/.vs/ASCKU Projects/DesignTimeBuild/.dtbcache.v2 differ diff --git a/.vs/ASCKU Projects/v16/.suo b/.vs/ASCKU Projects/v16/.suo index 5eafe22..050f3a8 100644 Binary files a/.vs/ASCKU Projects/v16/.suo and b/.vs/ASCKU Projects/v16/.suo differ diff --git a/DataClient/NETClient.cs b/DataClient/NETClient.cs index f55a4aa..ec94b78 100644 --- a/DataClient/NETClient.cs +++ b/DataClient/NETClient.cs @@ -543,7 +543,7 @@ namespace DataClient My_Close(needCloseConeection); } - public byte[] Full_Pasp_Download(string file) + public Pasport Full_Pasp_Download(string file) { if (string.IsNullOrEmpty(file)) throw new ArgumentException("Path to file can't be null or empty."); @@ -553,14 +553,22 @@ namespace DataClient try { if (!SendBytes(CreateCode((uint)Code.pasp_download, file))) throw new IOException("Can't send bytes to server."); } catch { My_Close(needCloseConeection); throw; } - byte[] res = null; + var pasp = new Pasport(); + var res = new List(); try { - res = ReceiveBytes(); + res.AddRange(ReceiveBytes(1)); + if (res.Count == 1 && res[0] == 0x01) + { + res.AddRange(ReceiveBytes(16)); + if(res.Count == 17 && res[16] == 0x01) + res.AddRange(ReceiveBytes(1512)); + } + pasp.PaspByte = res.ToArray(); } catch { My_Close(needCloseConeection); throw; } finally { My_Close(needCloseConeection); } - return res; + return pasp; } diff --git a/DataClient/Struct.cs b/DataClient/Struct.cs index c87e821..97e3492 100644 --- a/DataClient/Struct.cs +++ b/DataClient/Struct.cs @@ -42,10 +42,11 @@ namespace DataClient.Struct public class Pasport { //functions - private DateTime? ByteToDate(byte[] arr) + private DateTime? ByteToDate(byte[] arr) { return ByteToDate(arr, 0); } + private DateTime? ByteToDate(byte[] arr, int index) { - if (arr == null || arr.Length != 7) return null; - return new DateTime(arr[0] | arr[1] << 8, arr[2], arr[3], arr[4], arr[5], arr[6]); + if (arr == null || (index + 7) > arr.Length) return null; + return new DateTime(arr[index] | arr[index + 1] << 8, arr[index + 2], arr[index + 3], arr[index + 4], arr[index + 5], arr[index + 6]); } private byte[] DateToByte(DateTime? date) { @@ -61,6 +62,24 @@ namespace DataClient.Struct (byte)date.Value.Second }; } + + private string ByteToString(byte[] arr) { return ByteToString(arr, 0, arr.Length); } + private string ByteToString(byte[] arr, int index, int length) + { + if (arr == null || arr.Length == 0 || index < 0 || length < 0) + return ""; + Encoding.RegisterProvider(CodePagesEncodingProvider.Instance); + var enc = Encoding.GetEncoding(866); + var res = new List(); + for (var i = index; i < (index + length); i++) + { + if (i >= arr.Length) break; + if (arr[i] == 0x00) continue; + res.Add(arr[i]); + } + return enc.GetString(res.ToArray()); + } + private byte[] StringToByte(uint? size = null, string str = null) { Encoding.RegisterProvider(CodePagesEncodingProvider.Instance); @@ -157,112 +176,72 @@ namespace DataClient.Struct } set { - Encoding.RegisterProvider(CodePagesEncodingProvider.Instance); - var enc = Encoding.GetEncoding(866); var count = 0; - var tmpArr = Array.Empty(); if (value == null) return; if (value.Length < (count + 1) || value[count] != 0x01) return; count++; if (value.Length < (count + 1)) return; - numVDP = value[count]; - count++; + numVDP = value[count]; count++; if (value.Length < (count + 7)) return; - tmpArr = new byte[7]; - Array.Copy(value, count, tmpArr, 0, 7); - dStart = ByteToDate(tmpArr); - count += 7; + dStart = ByteToDate(value, count); count += 7; if (value.Length < (count + 7)) return; - tmpArr = new byte[7]; - Array.Copy(value, count, tmpArr, 0, 7); - dEnd = ByteToDate(tmpArr); - count += 7; + dEnd = ByteToDate(value, count); count += 7; if (value.Length < (count + 1) || value[count] != 0x01) { hasPasport = false; return; } - hasPasport = true; - count++; + hasPasport = true; count++; if (value.Length < (count + 4)) return; - tmpArr = new byte[4]; - Array.Copy(value, count, tmpArr, 0, 4); - kod_npl = BitConverter.ToInt32(tmpArr); - count += 4; + kod_npl = BitConverter.ToInt32(value, count); count += 4; if (value.Length < (count + 12)) return; - nplav = enc.GetString(value, count, 12); - count += 12; + nplav = ByteToString(value, count, 12); count += 12; if (value.Length < (count + 11)) return; - rm = enc.GetString(value, count, 11); - count += 11; + rm = ByteToString(value, count, 11); count += 11; if (value.Length < (count + 101)) return; - splav = enc.GetString(value, count, 101); - count += 101; + splav = ByteToString(value, count, 101); count += 101; if (value.Length < (count + 51)) return; - iS = enc.GetString(value, count, 51); - count += 51; + iS = ByteToString(value, count, 51); count += 51; if (value.Length < (count + 2)) return; - notd = BitConverter.ToUInt16(value, count); - count += 2; + notd = BitConverter.ToUInt16(value, count); count += 2; if (value.Length < (count + 2)) return; - vessl = BitConverter.ToUInt16(value, count); - count += 2; + vessl = BitConverter.ToUInt16(value, count); count += 2; if (value.Length < (count + 2)) return; - diam = BitConverter.ToUInt16(value, count); - count += 2; + diam = BitConverter.ToUInt16(value, count); count += 2; if (value.Length < (count + 2)) return; - prpl = BitConverter.ToUInt16(value, count); - count += 2; + prpl = BitConverter.ToUInt16(value, count); count += 2; if (value.Length < (count + 9)) return; - tin = enc.GetString(value, count, 9); - count += 9; + tin = ByteToString(value, count, 9); count += 9; if (value.Length < (count + 9)) return; - dzap = enc.GetString(value, count, 9); - count += 9; + dzap = ByteToString(value, count, 9); count += 9; if (value.Length < (count + 2)) return; - dlog = BitConverter.ToInt16(value, count); - count += 2; + dlog = BitConverter.ToInt16(value, count); count += 2; if (value.Length < (count + 2)) return; - last = BitConverter.ToInt16(value, count); - count += 2; + last = BitConverter.ToInt16(value, count); count += 2; if (value.Length < (count + 2)) return; - dlper = BitConverter.ToInt16(value, count); - count += 2; + dlper = BitConverter.ToInt16(value, count); count += 2; if (value.Length < (count + 51)) return; - nazn = enc.GetString(value, count, 51); - count += 51; + nazn = ByteToString(value, count, 51); count += 51; if (value.Length < (count + 2)) return; - kompl = BitConverter.ToUInt16(value, count); - count += 2; + kompl = BitConverter.ToUInt16(value, count); count += 2; if (value.Length < (count + 2)) return; - izl = BitConverter.ToUInt16(value, count); - count += 2; + izl = BitConverter.ToUInt16(value, count); count += 2; if (value.Length < (count + 4)) return; - robm = BitConverter.ToSingle(value, count); - count += 4; + robm = BitConverter.ToSingle(value, count); count += 4; if (value.Length < (count + 4)) return; - rizol = BitConverter.ToSingle(value, count); - count += 4; + rizol = BitConverter.ToSingle(value, count); count += 4; if (value.Length < (count + 2)) return; - dkr = BitConverter.ToUInt16(value, count); - count += 2; + dkr = BitConverter.ToUInt16(value, count); count += 2; if (value.Length < (count + 51)) return; - nkon = enc.GetString(value, count, 51); - count += 51; + nkon = ByteToString(value, count, 51); count += 51; if (value.Length < (count + 6)) return; - pos = enc.GetString(value, count, 6); - count += 6; + pos = ByteToString(value, count, 6); count += 6; if (value.Length < (count + 51)) return; - ukaz = enc.GetString(value, count, 51); - count += 51; + ukaz = ByteToString(value, count, 51); count += 51; if (value.Length < (count + 51)) return; - zakaz = enc.GetString(value, count, 51); - count += 51; + zakaz = ByteToString(value, count, 51); count += 51; if (value.Length < (count + 51)) return; - kat = enc.GetString(value, count, 51); - count += 51; + kat = ByteToString(value, count, 51); count += 51; if (value.Length < (count + 3)) return; - pril = enc.GetString(value, count, 3); - count += 3; + pril = ByteToString(value, count, 3); count += 3; if (value.Length < (count + 1023)) return; - rezerved = enc.GetString(value, count, 1023); - count += 1023; + rezerved = ByteToString(value, count, 1023); count += 1023; } } } diff --git a/DataClient/bin/Debug/net5.0/DataClient.dll b/DataClient/bin/Debug/net5.0/DataClient.dll index b0c7ae1..e1be471 100644 Binary files a/DataClient/bin/Debug/net5.0/DataClient.dll and b/DataClient/bin/Debug/net5.0/DataClient.dll differ diff --git a/DataClient/bin/Debug/net5.0/DataClient.pdb b/DataClient/bin/Debug/net5.0/DataClient.pdb index 6289b02..39a18ae 100644 Binary files a/DataClient/bin/Debug/net5.0/DataClient.pdb and b/DataClient/bin/Debug/net5.0/DataClient.pdb differ diff --git a/DataClient/bin/Debug/net5.0/ref/DataClient.dll b/DataClient/bin/Debug/net5.0/ref/DataClient.dll index 8b1ddd0..d99606d 100644 Binary files a/DataClient/bin/Debug/net5.0/ref/DataClient.dll and b/DataClient/bin/Debug/net5.0/ref/DataClient.dll differ diff --git a/DataClient/bin/Release/net5.0/Config/config.json b/DataClient/bin/Release/net5.0/Config/config.json new file mode 100644 index 0000000..f71d35f --- /dev/null +++ b/DataClient/bin/Release/net5.0/Config/config.json @@ -0,0 +1,16 @@ +{ + "servers": [ + { + "name": "STP 1", + "ip": "10.10.45.151", + "port": 1070, + "dir": "Y:\\data" + }, + { + "name": "STP 2", + "ip": "10.10.45.152", + "port": 1070, + "dir": "Z:\\data" + } + ] +} diff --git a/DataClient/bin/Release/net5.0/DataClient.deps.json b/DataClient/bin/Release/net5.0/DataClient.deps.json new file mode 100644 index 0000000..9ef3325 --- /dev/null +++ b/DataClient/bin/Release/net5.0/DataClient.deps.json @@ -0,0 +1,199 @@ +{ + "runtimeTarget": { + "name": ".NETCoreApp,Version=v5.0", + "signature": "" + }, + "compilationOptions": {}, + "targets": { + ".NETCoreApp,Version=v5.0": { + "DataClient/0.0.3": { + "dependencies": { + "NLog": "4.7.10", + "NLog.Extensions.Logging": "1.7.2", + "Newtonsoft.Json": "13.0.1" + }, + "runtime": { + "DataClient.dll": {} + } + }, + "Microsoft.Extensions.Configuration.Abstractions/5.0.0": { + "dependencies": { + "Microsoft.Extensions.Primitives": "5.0.0" + }, + "runtime": { + "lib/netstandard2.0/Microsoft.Extensions.Configuration.Abstractions.dll": { + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" + } + } + }, + "Microsoft.Extensions.DependencyInjection/5.0.0": { + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "5.0.0" + }, + "runtime": { + "lib/net5.0/Microsoft.Extensions.DependencyInjection.dll": { + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" + } + } + }, + "Microsoft.Extensions.DependencyInjection.Abstractions/5.0.0": { + "runtime": { + "lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll": { + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" + } + } + }, + "Microsoft.Extensions.Logging/5.0.0": { + "dependencies": { + "Microsoft.Extensions.DependencyInjection": "5.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "5.0.0", + "Microsoft.Extensions.Logging.Abstractions": "5.0.0", + "Microsoft.Extensions.Options": "5.0.0" + }, + "runtime": { + "lib/netstandard2.1/Microsoft.Extensions.Logging.dll": { + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" + } + } + }, + "Microsoft.Extensions.Logging.Abstractions/5.0.0": { + "runtime": { + "lib/netstandard2.0/Microsoft.Extensions.Logging.Abstractions.dll": { + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" + } + } + }, + "Microsoft.Extensions.Options/5.0.0": { + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "5.0.0", + "Microsoft.Extensions.Primitives": "5.0.0" + }, + "runtime": { + "lib/net5.0/Microsoft.Extensions.Options.dll": { + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" + } + } + }, + "Microsoft.Extensions.Primitives/5.0.0": { + "runtime": { + "lib/netcoreapp3.0/Microsoft.Extensions.Primitives.dll": { + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" + } + } + }, + "Newtonsoft.Json/13.0.1": { + "runtime": { + "lib/netstandard2.0/Newtonsoft.Json.dll": { + "assemblyVersion": "13.0.0.0", + "fileVersion": "13.0.1.25517" + } + } + }, + "NLog/4.7.10": { + "runtime": { + "lib/netstandard2.0/NLog.dll": { + "assemblyVersion": "4.0.0.0", + "fileVersion": "4.7.10.13013" + } + } + }, + "NLog.Extensions.Logging/1.7.2": { + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "5.0.0", + "Microsoft.Extensions.Logging": "5.0.0", + "NLog": "4.7.10" + }, + "runtime": { + "lib/net5.0/NLog.Extensions.Logging.dll": { + "assemblyVersion": "1.0.0.0", + "fileVersion": "1.7.2.1548" + } + } + } + } + }, + "libraries": { + "DataClient/0.0.3": { + "type": "project", + "serviceable": false, + "sha512": "" + }, + "Microsoft.Extensions.Configuration.Abstractions/5.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-ETjSBHMp3OAZ4HxGQYpwyGsD8Sw5FegQXphi0rpoGMT74S4+I2mm7XJEswwn59XAaKOzC15oDSOWEE8SzDCd6Q==", + "path": "microsoft.extensions.configuration.abstractions/5.0.0", + "hashPath": "microsoft.extensions.configuration.abstractions.5.0.0.nupkg.sha512" + }, + "Microsoft.Extensions.DependencyInjection/5.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-Rc2kb/p3Ze6cP6rhFC3PJRdWGbLvSHZc0ev7YlyeU6FmHciDMLrhoVoTUEzKPhN5ZjFgKF1Cf5fOz8mCMIkvpA==", + "path": "microsoft.extensions.dependencyinjection/5.0.0", + "hashPath": "microsoft.extensions.dependencyinjection.5.0.0.nupkg.sha512" + }, + "Microsoft.Extensions.DependencyInjection.Abstractions/5.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-ORj7Zh81gC69TyvmcUm9tSzytcy8AVousi+IVRAI8nLieQjOFryRusSFh7+aLk16FN9pQNqJAiMd7BTKINK0kA==", + "path": "microsoft.extensions.dependencyinjection.abstractions/5.0.0", + "hashPath": "microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg.sha512" + }, + "Microsoft.Extensions.Logging/5.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-MgOwK6tPzB6YNH21wssJcw/2MKwee8b2gI7SllYfn6rvTpIrVvVS5HAjSU2vqSku1fwqRvWP0MdIi14qjd93Aw==", + "path": "microsoft.extensions.logging/5.0.0", + "hashPath": "microsoft.extensions.logging.5.0.0.nupkg.sha512" + }, + "Microsoft.Extensions.Logging.Abstractions/5.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-NxP6ahFcBnnSfwNBi2KH2Oz8Xl5Sm2krjId/jRR3I7teFphwiUoUeZPwTNA21EX+5PtjqmyAvKaOeBXcJjcH/w==", + "path": "microsoft.extensions.logging.abstractions/5.0.0", + "hashPath": "microsoft.extensions.logging.abstractions.5.0.0.nupkg.sha512" + }, + "Microsoft.Extensions.Options/5.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-CBvR92TCJ5uBIdd9/HzDSrxYak+0W/3+yxrNg8Qm6Bmrkh5L+nu6m3WeazQehcZ5q1/6dDA7J5YdQjim0165zg==", + "path": "microsoft.extensions.options/5.0.0", + "hashPath": "microsoft.extensions.options.5.0.0.nupkg.sha512" + }, + "Microsoft.Extensions.Primitives/5.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-cI/VWn9G1fghXrNDagX9nYaaB/nokkZn0HYAawGaELQrl8InSezfe9OnfPZLcJq3esXxygh3hkq2c3qoV3SDyQ==", + "path": "microsoft.extensions.primitives/5.0.0", + "hashPath": "microsoft.extensions.primitives.5.0.0.nupkg.sha512" + }, + "Newtonsoft.Json/13.0.1": { + "type": "package", + "serviceable": true, + "sha512": "sha512-ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==", + "path": "newtonsoft.json/13.0.1", + "hashPath": "newtonsoft.json.13.0.1.nupkg.sha512" + }, + "NLog/4.7.10": { + "type": "package", + "serviceable": true, + "sha512": "sha512-rcegW7kYOCjl7wX0SzsqpPBqnJ51JKi1WkYb6QBVX0Wc5IgH19Pv4t/co+T0s06OS0Ne44xgkY/mHg0PdrmJow==", + "path": "nlog/4.7.10", + "hashPath": "nlog.4.7.10.nupkg.sha512" + }, + "NLog.Extensions.Logging/1.7.2": { + "type": "package", + "serviceable": true, + "sha512": "sha512-0y1QziAUCdePQc4itPOQF3xDcs0iE9NHlIK0hE0eA0+Ef6E9dnJDPveNu7w2ckYaDfJIFHpOoLK8sZmNEyiBCw==", + "path": "nlog.extensions.logging/1.7.2", + "hashPath": "nlog.extensions.logging.1.7.2.nupkg.sha512" + } + } +} \ No newline at end of file diff --git a/DataClient/bin/Release/net5.0/DataClient.dll b/DataClient/bin/Release/net5.0/DataClient.dll new file mode 100644 index 0000000..2bab1ff Binary files /dev/null and b/DataClient/bin/Release/net5.0/DataClient.dll differ diff --git a/DataClient/bin/Release/net5.0/DataClient.pdb b/DataClient/bin/Release/net5.0/DataClient.pdb new file mode 100644 index 0000000..a6bc20a Binary files /dev/null and b/DataClient/bin/Release/net5.0/DataClient.pdb differ diff --git a/DataClient/bin/Release/net5.0/ref/DataClient.dll b/DataClient/bin/Release/net5.0/ref/DataClient.dll new file mode 100644 index 0000000..2f6291e Binary files /dev/null and b/DataClient/bin/Release/net5.0/ref/DataClient.dll differ diff --git a/DataClient/obj/Debug/net5.0/DataClient.csprojAssemblyReference.cache b/DataClient/obj/Debug/net5.0/DataClient.csprojAssemblyReference.cache index da53881..2f6d7ac 100644 Binary files a/DataClient/obj/Debug/net5.0/DataClient.csprojAssemblyReference.cache and b/DataClient/obj/Debug/net5.0/DataClient.csprojAssemblyReference.cache differ diff --git a/DataClient/obj/Debug/net5.0/DataClient.dll b/DataClient/obj/Debug/net5.0/DataClient.dll index b0c7ae1..e1be471 100644 Binary files a/DataClient/obj/Debug/net5.0/DataClient.dll and b/DataClient/obj/Debug/net5.0/DataClient.dll differ diff --git a/DataClient/obj/Debug/net5.0/DataClient.pdb b/DataClient/obj/Debug/net5.0/DataClient.pdb index 6289b02..39a18ae 100644 Binary files a/DataClient/obj/Debug/net5.0/DataClient.pdb and b/DataClient/obj/Debug/net5.0/DataClient.pdb differ diff --git a/DataClient/obj/Debug/net5.0/ref/DataClient.dll b/DataClient/obj/Debug/net5.0/ref/DataClient.dll index 8b1ddd0..d99606d 100644 Binary files a/DataClient/obj/Debug/net5.0/ref/DataClient.dll and b/DataClient/obj/Debug/net5.0/ref/DataClient.dll differ diff --git a/DataClient/obj/Release/net5.0/.NETCoreApp,Version=v5.0.AssemblyAttributes.cs b/DataClient/obj/Release/net5.0/.NETCoreApp,Version=v5.0.AssemblyAttributes.cs new file mode 100644 index 0000000..2f7e5ec --- /dev/null +++ b/DataClient/obj/Release/net5.0/.NETCoreApp,Version=v5.0.AssemblyAttributes.cs @@ -0,0 +1,4 @@ +// +using System; +using System.Reflection; +[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v5.0", FrameworkDisplayName = "")] diff --git a/DataClient/obj/Release/net5.0/DataClient.AssemblyInfo.cs b/DataClient/obj/Release/net5.0/DataClient.AssemblyInfo.cs new file mode 100644 index 0000000..2c7596d --- /dev/null +++ b/DataClient/obj/Release/net5.0/DataClient.AssemblyInfo.cs @@ -0,0 +1,23 @@ +//------------------------------------------------------------------------------ +// +// Этот код создан программой. +// Исполняемая версия:4.0.30319.42000 +// +// Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае +// повторной генерации кода. +// +//------------------------------------------------------------------------------ + +using System; +using System.Reflection; + +[assembly: System.Reflection.AssemblyCompanyAttribute("DataClient")] +[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("0.0.3.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("0.0.3")] +[assembly: System.Reflection.AssemblyProductAttribute("DataClient")] +[assembly: System.Reflection.AssemblyTitleAttribute("DataClient")] +[assembly: System.Reflection.AssemblyVersionAttribute("0.0.3.0")] + +// Создано классом WriteCodeFragment MSBuild. + diff --git a/DataClient/obj/Release/net5.0/DataClient.AssemblyInfoInputs.cache b/DataClient/obj/Release/net5.0/DataClient.AssemblyInfoInputs.cache new file mode 100644 index 0000000..4d1b511 --- /dev/null +++ b/DataClient/obj/Release/net5.0/DataClient.AssemblyInfoInputs.cache @@ -0,0 +1 @@ +e480fc7f37c19bb3afbdfca97bffb5429904cde2 diff --git a/DataClient/obj/Release/net5.0/DataClient.GeneratedMSBuildEditorConfig.editorconfig b/DataClient/obj/Release/net5.0/DataClient.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 0000000..d7e2983 --- /dev/null +++ b/DataClient/obj/Release/net5.0/DataClient.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,8 @@ +is_global = true +build_property.TargetFramework = net5.0 +build_property.TargetPlatformMinVersion = +build_property.UsingMicrosoftNETSdkWeb = +build_property.ProjectTypeGuids = +build_property.PublishSingleFile = +build_property.IncludeAllContentForSelfExtract = +build_property._SupportedPlatformList = Android,iOS,Linux,macOS,Windows diff --git a/DataClient/obj/Release/net5.0/DataClient.assets.cache b/DataClient/obj/Release/net5.0/DataClient.assets.cache new file mode 100644 index 0000000..ce3aa84 Binary files /dev/null and b/DataClient/obj/Release/net5.0/DataClient.assets.cache differ diff --git a/DataClient/obj/Release/net5.0/DataClient.csproj.CoreCompileInputs.cache b/DataClient/obj/Release/net5.0/DataClient.csproj.CoreCompileInputs.cache new file mode 100644 index 0000000..dde3f7d --- /dev/null +++ b/DataClient/obj/Release/net5.0/DataClient.csproj.CoreCompileInputs.cache @@ -0,0 +1 @@ +a328cb2222d42dc01388bbdc69d054e8d72e5f87 diff --git a/DataClient/obj/Release/net5.0/DataClient.csproj.FileListAbsolute.txt b/DataClient/obj/Release/net5.0/DataClient.csproj.FileListAbsolute.txt new file mode 100644 index 0000000..4ec9653 --- /dev/null +++ b/DataClient/obj/Release/net5.0/DataClient.csproj.FileListAbsolute.txt @@ -0,0 +1,13 @@ +D:\GIT\ASCKU_PC\DataClient\bin\Release\net5.0\Config\config.json +D:\GIT\ASCKU_PC\DataClient\bin\Release\net5.0\DataClient.deps.json +D:\GIT\ASCKU_PC\DataClient\bin\Release\net5.0\DataClient.dll +D:\GIT\ASCKU_PC\DataClient\bin\Release\net5.0\ref\DataClient.dll +D:\GIT\ASCKU_PC\DataClient\bin\Release\net5.0\DataClient.pdb +D:\GIT\ASCKU_PC\DataClient\obj\Release\net5.0\DataClient.csprojAssemblyReference.cache +D:\GIT\ASCKU_PC\DataClient\obj\Release\net5.0\DataClient.GeneratedMSBuildEditorConfig.editorconfig +D:\GIT\ASCKU_PC\DataClient\obj\Release\net5.0\DataClient.AssemblyInfoInputs.cache +D:\GIT\ASCKU_PC\DataClient\obj\Release\net5.0\DataClient.AssemblyInfo.cs +D:\GIT\ASCKU_PC\DataClient\obj\Release\net5.0\DataClient.csproj.CoreCompileInputs.cache +D:\GIT\ASCKU_PC\DataClient\obj\Release\net5.0\DataClient.dll +D:\GIT\ASCKU_PC\DataClient\obj\Release\net5.0\ref\DataClient.dll +D:\GIT\ASCKU_PC\DataClient\obj\Release\net5.0\DataClient.pdb diff --git a/DataClient/obj/Release/net5.0/DataClient.csprojAssemblyReference.cache b/DataClient/obj/Release/net5.0/DataClient.csprojAssemblyReference.cache new file mode 100644 index 0000000..c5f1206 Binary files /dev/null and b/DataClient/obj/Release/net5.0/DataClient.csprojAssemblyReference.cache differ diff --git a/DataClient/obj/Release/net5.0/DataClient.dll b/DataClient/obj/Release/net5.0/DataClient.dll new file mode 100644 index 0000000..2bab1ff Binary files /dev/null and b/DataClient/obj/Release/net5.0/DataClient.dll differ diff --git a/DataClient/obj/Release/net5.0/DataClient.pdb b/DataClient/obj/Release/net5.0/DataClient.pdb new file mode 100644 index 0000000..a6bc20a Binary files /dev/null and b/DataClient/obj/Release/net5.0/DataClient.pdb differ diff --git a/DataClient/obj/Release/net5.0/ref/DataClient.dll b/DataClient/obj/Release/net5.0/ref/DataClient.dll new file mode 100644 index 0000000..2f6291e Binary files /dev/null and b/DataClient/obj/Release/net5.0/ref/DataClient.dll differ diff --git a/DataClients/obj/Debug/netstandard2.0/DataClients.csprojAssemblyReference.cache b/DataClients/obj/Debug/netstandard2.0/DataClients.csprojAssemblyReference.cache index 9c1a5b8..0f34a16 100644 Binary files a/DataClients/obj/Debug/netstandard2.0/DataClients.csprojAssemblyReference.cache and b/DataClients/obj/Debug/netstandard2.0/DataClients.csprojAssemblyReference.cache differ diff --git a/DataClients/obj/Release/netstandard2.0/DataClients.csprojAssemblyReference.cache b/DataClients/obj/Release/netstandard2.0/DataClients.csprojAssemblyReference.cache index 2e7d9b2..6560d32 100644 Binary files a/DataClients/obj/Release/netstandard2.0/DataClients.csprojAssemblyReference.cache and b/DataClients/obj/Release/netstandard2.0/DataClients.csprojAssemblyReference.cache differ diff --git a/Korp90TimePasport/obj/Debug/netcoreapp3.1/Korp90TimePasport.csprojAssemblyReference.cache b/Korp90TimePasport/obj/Debug/netcoreapp3.1/Korp90TimePasport.csprojAssemblyReference.cache index 70bdab4..69630dc 100644 Binary files a/Korp90TimePasport/obj/Debug/netcoreapp3.1/Korp90TimePasport.csprojAssemblyReference.cache and b/Korp90TimePasport/obj/Debug/netcoreapp3.1/Korp90TimePasport.csprojAssemblyReference.cache differ diff --git a/Korp90TimePasport/obj/Release/netcoreapp3.1/Korp90TimePasport.csprojAssemblyReference.cache b/Korp90TimePasport/obj/Release/netcoreapp3.1/Korp90TimePasport.csprojAssemblyReference.cache index 0983179..c519954 100644 Binary files a/Korp90TimePasport/obj/Release/netcoreapp3.1/Korp90TimePasport.csprojAssemblyReference.cache and b/Korp90TimePasport/obj/Release/netcoreapp3.1/Korp90TimePasport.csprojAssemblyReference.cache differ diff --git a/Mailing/obj/Debug/netcoreapp3.1/Mailing.csprojAssemblyReference.cache b/Mailing/obj/Debug/netcoreapp3.1/Mailing.csprojAssemblyReference.cache index c6f2195..e4eb5cf 100644 Binary files a/Mailing/obj/Debug/netcoreapp3.1/Mailing.csprojAssemblyReference.cache and b/Mailing/obj/Debug/netcoreapp3.1/Mailing.csprojAssemblyReference.cache differ diff --git a/Mailing/obj/Release/netcoreapp3.1/Mailing.csprojAssemblyReference.cache b/Mailing/obj/Release/netcoreapp3.1/Mailing.csprojAssemblyReference.cache index b45a362..f604084 100644 Binary files a/Mailing/obj/Release/netcoreapp3.1/Mailing.csprojAssemblyReference.cache and b/Mailing/obj/Release/netcoreapp3.1/Mailing.csprojAssemblyReference.cache differ diff --git a/PrintPDF/MigraDoc.DocumentObjectModel/obj/Release/netstandard2.0/MigraDoc.DocumentObjectModel.csprojAssemblyReference.cache b/PrintPDF/MigraDoc.DocumentObjectModel/obj/Release/netstandard2.0/MigraDoc.DocumentObjectModel.csprojAssemblyReference.cache index e540eb2..e4a24ce 100644 Binary files a/PrintPDF/MigraDoc.DocumentObjectModel/obj/Release/netstandard2.0/MigraDoc.DocumentObjectModel.csprojAssemblyReference.cache and b/PrintPDF/MigraDoc.DocumentObjectModel/obj/Release/netstandard2.0/MigraDoc.DocumentObjectModel.csprojAssemblyReference.cache differ diff --git a/PrintPDF/MigraDoc.Rendering/obj/Release/netstandard2.0/MigraDoc.Rendering.csprojAssemblyReference.cache b/PrintPDF/MigraDoc.Rendering/obj/Release/netstandard2.0/MigraDoc.Rendering.csprojAssemblyReference.cache index dddb750..06b7fb3 100644 Binary files a/PrintPDF/MigraDoc.Rendering/obj/Release/netstandard2.0/MigraDoc.Rendering.csprojAssemblyReference.cache and b/PrintPDF/MigraDoc.Rendering/obj/Release/netstandard2.0/MigraDoc.Rendering.csprojAssemblyReference.cache differ diff --git a/PrintPDF/PdfSharp.Charting/obj/Debug/netstandard2.0/PdfSharp.Charting.csprojAssemblyReference.cache b/PrintPDF/PdfSharp.Charting/obj/Debug/netstandard2.0/PdfSharp.Charting.csprojAssemblyReference.cache index 175918d..2b95639 100644 Binary files a/PrintPDF/PdfSharp.Charting/obj/Debug/netstandard2.0/PdfSharp.Charting.csprojAssemblyReference.cache and b/PrintPDF/PdfSharp.Charting/obj/Debug/netstandard2.0/PdfSharp.Charting.csprojAssemblyReference.cache differ diff --git a/PrintPDF/PdfSharp.Charting/obj/Release/netstandard2.0/PdfSharp.Charting.csprojAssemblyReference.cache b/PrintPDF/PdfSharp.Charting/obj/Release/netstandard2.0/PdfSharp.Charting.csprojAssemblyReference.cache index 2fd0c79..9f186f4 100644 Binary files a/PrintPDF/PdfSharp.Charting/obj/Release/netstandard2.0/PdfSharp.Charting.csprojAssemblyReference.cache and b/PrintPDF/PdfSharp.Charting/obj/Release/netstandard2.0/PdfSharp.Charting.csprojAssemblyReference.cache differ diff --git a/PrintPDF/PdfSharp/obj/Release/netstandard2.0/PdfSharp.csprojAssemblyReference.cache b/PrintPDF/PdfSharp/obj/Release/netstandard2.0/PdfSharp.csprojAssemblyReference.cache index 28055a3..e34f63c 100644 Binary files a/PrintPDF/PdfSharp/obj/Release/netstandard2.0/PdfSharp.csprojAssemblyReference.cache and b/PrintPDF/PdfSharp/obj/Release/netstandard2.0/PdfSharp.csprojAssemblyReference.cache differ diff --git a/Release/Test2/Config/config.json b/Release/Test2/Config/config.json index 0d02ca9..f71d35f 100644 --- a/Release/Test2/Config/config.json +++ b/Release/Test2/Config/config.json @@ -2,13 +2,15 @@ "servers": [ { "name": "STP 1", - "address": "10.10.45.151:1070", - "archive": "Y:\\data" + "ip": "10.10.45.151", + "port": 1070, + "dir": "Y:\\data" }, { "name": "STP 2", - "address": "10.10.45.152:1070", - "archive": "Z:\\data" + "ip": "10.10.45.152", + "port": 1070, + "dir": "Z:\\data" } ] } diff --git a/Release/Test2/DataClient.dll b/Release/Test2/DataClient.dll new file mode 100644 index 0000000..2bab1ff Binary files /dev/null and b/Release/Test2/DataClient.dll differ diff --git a/Release/Test2/DataClient.pdb b/Release/Test2/DataClient.pdb new file mode 100644 index 0000000..a6bc20a Binary files /dev/null and b/Release/Test2/DataClient.pdb differ diff --git a/Release/Test2/Microsoft.Extensions.Configuration.Abstractions.dll b/Release/Test2/Microsoft.Extensions.Configuration.Abstractions.dll new file mode 100644 index 0000000..dd5ebe2 Binary files /dev/null and b/Release/Test2/Microsoft.Extensions.Configuration.Abstractions.dll differ diff --git a/Release/Test2/Microsoft.Extensions.DependencyInjection.Abstractions.dll b/Release/Test2/Microsoft.Extensions.DependencyInjection.Abstractions.dll new file mode 100644 index 0000000..84aaf39 Binary files /dev/null and b/Release/Test2/Microsoft.Extensions.DependencyInjection.Abstractions.dll differ diff --git a/Release/Test2/Microsoft.Extensions.DependencyInjection.dll b/Release/Test2/Microsoft.Extensions.DependencyInjection.dll new file mode 100644 index 0000000..1034ee6 Binary files /dev/null and b/Release/Test2/Microsoft.Extensions.DependencyInjection.dll differ diff --git a/Release/Test2/Microsoft.Extensions.Logging.Abstractions.dll b/Release/Test2/Microsoft.Extensions.Logging.Abstractions.dll new file mode 100644 index 0000000..2c87f79 Binary files /dev/null and b/Release/Test2/Microsoft.Extensions.Logging.Abstractions.dll differ diff --git a/Release/Test2/Microsoft.Extensions.Logging.dll b/Release/Test2/Microsoft.Extensions.Logging.dll new file mode 100644 index 0000000..6df35e1 Binary files /dev/null and b/Release/Test2/Microsoft.Extensions.Logging.dll differ diff --git a/Release/Test2/Microsoft.Extensions.Options.dll b/Release/Test2/Microsoft.Extensions.Options.dll new file mode 100644 index 0000000..8a2a8c8 Binary files /dev/null and b/Release/Test2/Microsoft.Extensions.Options.dll differ diff --git a/Release/Test2/Microsoft.Extensions.Primitives.dll b/Release/Test2/Microsoft.Extensions.Primitives.dll new file mode 100644 index 0000000..884f9dc Binary files /dev/null and b/Release/Test2/Microsoft.Extensions.Primitives.dll differ diff --git a/Release/Test2/NLog.Extensions.Logging.dll b/Release/Test2/NLog.Extensions.Logging.dll new file mode 100644 index 0000000..e9c06a8 Binary files /dev/null and b/Release/Test2/NLog.Extensions.Logging.dll differ diff --git a/Release/Test2/NLog.dll b/Release/Test2/NLog.dll new file mode 100644 index 0000000..36689f2 Binary files /dev/null and b/Release/Test2/NLog.dll differ diff --git a/Release/Test2/Newtonsoft.Json.dll b/Release/Test2/Newtonsoft.Json.dll new file mode 100644 index 0000000..1ffeabe Binary files /dev/null and b/Release/Test2/Newtonsoft.Json.dll differ diff --git a/Release/Test2/STPClient.dll b/Release/Test2/STPClient.dll deleted file mode 100644 index e70265e..0000000 Binary files a/Release/Test2/STPClient.dll and /dev/null differ diff --git a/Release/Test2/STPClient.pdb b/Release/Test2/STPClient.pdb deleted file mode 100644 index ec402f8..0000000 Binary files a/Release/Test2/STPClient.pdb and /dev/null differ diff --git a/Release/Test2/Test2.deps.json b/Release/Test2/Test2.deps.json index f152570..3152e79 100644 --- a/Release/Test2/Test2.deps.json +++ b/Release/Test2/Test2.deps.json @@ -8,15 +8,123 @@ ".NETCoreApp,Version=v5.0": { "Test2/1.0.0": { "dependencies": { - "STPClient": "1.0.0" + "DataClient": "0.0.3", + "NLog": "4.7.10", + "NLog.Extensions.Logging": "1.7.2" }, "runtime": { "Test2.dll": {} } }, - "STPClient/1.0.0": { + "Microsoft.Extensions.Configuration.Abstractions/5.0.0": { + "dependencies": { + "Microsoft.Extensions.Primitives": "5.0.0" + }, "runtime": { - "STPClient.dll": {} + "lib/netstandard2.0/Microsoft.Extensions.Configuration.Abstractions.dll": { + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" + } + } + }, + "Microsoft.Extensions.DependencyInjection/5.0.0": { + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "5.0.0" + }, + "runtime": { + "lib/net5.0/Microsoft.Extensions.DependencyInjection.dll": { + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" + } + } + }, + "Microsoft.Extensions.DependencyInjection.Abstractions/5.0.0": { + "runtime": { + "lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll": { + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" + } + } + }, + "Microsoft.Extensions.Logging/5.0.0": { + "dependencies": { + "Microsoft.Extensions.DependencyInjection": "5.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "5.0.0", + "Microsoft.Extensions.Logging.Abstractions": "5.0.0", + "Microsoft.Extensions.Options": "5.0.0" + }, + "runtime": { + "lib/netstandard2.1/Microsoft.Extensions.Logging.dll": { + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" + } + } + }, + "Microsoft.Extensions.Logging.Abstractions/5.0.0": { + "runtime": { + "lib/netstandard2.0/Microsoft.Extensions.Logging.Abstractions.dll": { + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" + } + } + }, + "Microsoft.Extensions.Options/5.0.0": { + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "5.0.0", + "Microsoft.Extensions.Primitives": "5.0.0" + }, + "runtime": { + "lib/net5.0/Microsoft.Extensions.Options.dll": { + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" + } + } + }, + "Microsoft.Extensions.Primitives/5.0.0": { + "runtime": { + "lib/netcoreapp3.0/Microsoft.Extensions.Primitives.dll": { + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" + } + } + }, + "Newtonsoft.Json/13.0.1": { + "runtime": { + "lib/netstandard2.0/Newtonsoft.Json.dll": { + "assemblyVersion": "13.0.0.0", + "fileVersion": "13.0.1.25517" + } + } + }, + "NLog/4.7.10": { + "runtime": { + "lib/netstandard2.0/NLog.dll": { + "assemblyVersion": "4.0.0.0", + "fileVersion": "4.7.10.13013" + } + } + }, + "NLog.Extensions.Logging/1.7.2": { + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "5.0.0", + "Microsoft.Extensions.Logging": "5.0.0", + "NLog": "4.7.10" + }, + "runtime": { + "lib/net5.0/NLog.Extensions.Logging.dll": { + "assemblyVersion": "1.0.0.0", + "fileVersion": "1.7.2.1548" + } + } + }, + "DataClient/0.0.3": { + "dependencies": { + "NLog": "4.7.10", + "NLog.Extensions.Logging": "1.7.2", + "Newtonsoft.Json": "13.0.1" + }, + "runtime": { + "DataClient.dll": {} } } } @@ -27,7 +135,77 @@ "serviceable": false, "sha512": "" }, - "STPClient/1.0.0": { + "Microsoft.Extensions.Configuration.Abstractions/5.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-ETjSBHMp3OAZ4HxGQYpwyGsD8Sw5FegQXphi0rpoGMT74S4+I2mm7XJEswwn59XAaKOzC15oDSOWEE8SzDCd6Q==", + "path": "microsoft.extensions.configuration.abstractions/5.0.0", + "hashPath": "microsoft.extensions.configuration.abstractions.5.0.0.nupkg.sha512" + }, + "Microsoft.Extensions.DependencyInjection/5.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-Rc2kb/p3Ze6cP6rhFC3PJRdWGbLvSHZc0ev7YlyeU6FmHciDMLrhoVoTUEzKPhN5ZjFgKF1Cf5fOz8mCMIkvpA==", + "path": "microsoft.extensions.dependencyinjection/5.0.0", + "hashPath": "microsoft.extensions.dependencyinjection.5.0.0.nupkg.sha512" + }, + "Microsoft.Extensions.DependencyInjection.Abstractions/5.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-ORj7Zh81gC69TyvmcUm9tSzytcy8AVousi+IVRAI8nLieQjOFryRusSFh7+aLk16FN9pQNqJAiMd7BTKINK0kA==", + "path": "microsoft.extensions.dependencyinjection.abstractions/5.0.0", + "hashPath": "microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg.sha512" + }, + "Microsoft.Extensions.Logging/5.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-MgOwK6tPzB6YNH21wssJcw/2MKwee8b2gI7SllYfn6rvTpIrVvVS5HAjSU2vqSku1fwqRvWP0MdIi14qjd93Aw==", + "path": "microsoft.extensions.logging/5.0.0", + "hashPath": "microsoft.extensions.logging.5.0.0.nupkg.sha512" + }, + "Microsoft.Extensions.Logging.Abstractions/5.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-NxP6ahFcBnnSfwNBi2KH2Oz8Xl5Sm2krjId/jRR3I7teFphwiUoUeZPwTNA21EX+5PtjqmyAvKaOeBXcJjcH/w==", + "path": "microsoft.extensions.logging.abstractions/5.0.0", + "hashPath": "microsoft.extensions.logging.abstractions.5.0.0.nupkg.sha512" + }, + "Microsoft.Extensions.Options/5.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-CBvR92TCJ5uBIdd9/HzDSrxYak+0W/3+yxrNg8Qm6Bmrkh5L+nu6m3WeazQehcZ5q1/6dDA7J5YdQjim0165zg==", + "path": "microsoft.extensions.options/5.0.0", + "hashPath": "microsoft.extensions.options.5.0.0.nupkg.sha512" + }, + "Microsoft.Extensions.Primitives/5.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-cI/VWn9G1fghXrNDagX9nYaaB/nokkZn0HYAawGaELQrl8InSezfe9OnfPZLcJq3esXxygh3hkq2c3qoV3SDyQ==", + "path": "microsoft.extensions.primitives/5.0.0", + "hashPath": "microsoft.extensions.primitives.5.0.0.nupkg.sha512" + }, + "Newtonsoft.Json/13.0.1": { + "type": "package", + "serviceable": true, + "sha512": "sha512-ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==", + "path": "newtonsoft.json/13.0.1", + "hashPath": "newtonsoft.json.13.0.1.nupkg.sha512" + }, + "NLog/4.7.10": { + "type": "package", + "serviceable": true, + "sha512": "sha512-rcegW7kYOCjl7wX0SzsqpPBqnJ51JKi1WkYb6QBVX0Wc5IgH19Pv4t/co+T0s06OS0Ne44xgkY/mHg0PdrmJow==", + "path": "nlog/4.7.10", + "hashPath": "nlog.4.7.10.nupkg.sha512" + }, + "NLog.Extensions.Logging/1.7.2": { + "type": "package", + "serviceable": true, + "sha512": "sha512-0y1QziAUCdePQc4itPOQF3xDcs0iE9NHlIK0hE0eA0+Ef6E9dnJDPveNu7w2ckYaDfJIFHpOoLK8sZmNEyiBCw==", + "path": "nlog.extensions.logging/1.7.2", + "hashPath": "nlog.extensions.logging.1.7.2.nupkg.sha512" + }, + "DataClient/0.0.3": { "type": "project", "serviceable": false, "sha512": "" diff --git a/Release/Test2/Test2.dll b/Release/Test2/Test2.dll index 6aa5485..92c6844 100644 Binary files a/Release/Test2/Test2.dll and b/Release/Test2/Test2.dll differ diff --git a/Release/Test2/Test2.pdb b/Release/Test2/Test2.pdb index 65c2cb6..dae416b 100644 Binary files a/Release/Test2/Test2.pdb and b/Release/Test2/Test2.pdb differ diff --git a/SupportClasses/obj/Debug/netstandard2.0/SupportClasses.csprojAssemblyReference.cache b/SupportClasses/obj/Debug/netstandard2.0/SupportClasses.csprojAssemblyReference.cache index 374a408..0cb149e 100644 Binary files a/SupportClasses/obj/Debug/netstandard2.0/SupportClasses.csprojAssemblyReference.cache and b/SupportClasses/obj/Debug/netstandard2.0/SupportClasses.csprojAssemblyReference.cache differ diff --git a/SupportClasses/obj/Release/netstandard2.0/SupportClasses.csprojAssemblyReference.cache b/SupportClasses/obj/Release/netstandard2.0/SupportClasses.csprojAssemblyReference.cache index 8be0ac4..0bd4425 100644 Binary files a/SupportClasses/obj/Release/netstandard2.0/SupportClasses.csprojAssemblyReference.cache and b/SupportClasses/obj/Release/netstandard2.0/SupportClasses.csprojAssemblyReference.cache differ diff --git a/Test2/Program.cs b/Test2/Program.cs index 5cfd851..607e4bc 100644 --- a/Test2/Program.cs +++ b/Test2/Program.cs @@ -9,6 +9,7 @@ using System.Collections.Generic; using System.Text; using System.IO; using System.Threading.Tasks; +using DataClient.Struct; namespace Test2 { @@ -60,35 +61,56 @@ namespace Test2 var t = new NETClient("10.10.45.151", 1070); t.RetryCount = 10; t.RetryInterval = 0.1; - var d_start = DateTime.Now; - var d_end = new DateTime(2021, 01, 01); - var count = 0; - Directory.CreateDirectory(Directory.GetCurrentDirectory() + "/test"); - for (var d = d_start; d >= d_end; d = d.AddDays(-1)) + var work_dir = "D:/pasports"; + Directory.CreateDirectory(work_dir); + var dir_year = t.Full_Dir_Browse(); + Console.WriteLine("Read main dir."); + foreach (var a in dir_year) { - var pasplist = t.Full_Dir_Browse(d.ToString("yyyy'/'MM'/'dd")); - if (pasplist != null) - foreach(var p in pasplist) + if (a == "current") continue; + Console.WriteLine(" Read dir " + a + "."); + var dir_month = t.Full_Dir_Browse(a); + foreach(var b in dir_month) + { + Console.WriteLine(" Read dir " + b + "."); + var dir_day = t.Full_Dir_Browse(b); + foreach(var c in dir_day) { - var pasp = t.Full_Pasp_Download(p); - - using (var file = new FileStream(Directory.GetCurrentDirectory() + "/test/pasp" + count.ToString() + ".txt", FileMode.Create, FileAccess.Write)) + Console.WriteLine(" Read dir " + c + "."); + var pasports = t.Full_Dir_Browse(c); + foreach(var d in pasports) { - file.Write(pasp, 0, pasp.Length); + var count = 0; + Pasport pasp; + do + { + Console.WriteLine(" Read " + count + " pasp: " + d); + pasp = t.Full_Pasp_Download(d); + count = (pasp.HasData && pasp.hasPasport) ? 3 : count + 1; + } while (count < 3); + Directory.CreateDirectory(work_dir + "/" + c); + var res = pasp.PaspByte; + var name = (pasp.hasPasport && !string.IsNullOrEmpty(pasp.nplav)) ? pasp.nplav : (pasp.numVDP.HasValue) ? pasp.numVDP.Value.ToString("D2") : "Jane_Doe"; + Console.Write(" Write pasp " + name + ": byte; "); + using (var file = new FileStream(work_dir + "/" + c + "/" + name, FileMode.Create, FileAccess.Write)) + { + file.Write(res, 0, res.Length); + } + Console.WriteLine("read;"); + using (var file = new StreamWriter(work_dir + "/" + c + "/" + name + "_read.txt")) + { + file.WriteLine(pasp.HasData); file.WriteLine(pasp.numVDP); file.WriteLine(pasp.dStart); file.WriteLine(pasp.dEnd); + file.WriteLine(pasp.hasPasport); file.WriteLine(pasp.kod_npl); file.WriteLine(pasp.nplav); file.WriteLine(pasp.rm); + file.WriteLine(pasp.splav); file.WriteLine(pasp.iS); file.WriteLine(pasp.notd); file.WriteLine(pasp.vessl); + file.WriteLine(pasp.diam); file.WriteLine(pasp.prpl); file.WriteLine(pasp.tin); file.WriteLine(pasp.dzap); + file.WriteLine(pasp.dlog); file.WriteLine(pasp.last); file.WriteLine(pasp.dlper); file.WriteLine(pasp.nazn); + file.WriteLine(pasp.kompl); file.WriteLine(pasp.izl); file.WriteLine(pasp.robm); file.WriteLine(pasp.rizol); + file.WriteLine(pasp.dkr); file.WriteLine(pasp.nkon); file.WriteLine(pasp.pos); file.WriteLine(pasp.ukaz); + file.WriteLine(pasp.zakaz); file.WriteLine(pasp.kat); file.WriteLine(pasp.pril); file.WriteLine(pasp.rezerved); + } } - count++; - /* - for(var i = 0; i < pasp.Length; i++) - { - Console.Write(" " + pasp[i].ToString("X2")); - if ((i + 1) % 16 == 0) Console.WriteLine(); - } - Console.WriteLine(); - Console.Write("Press button..."); - Console.ReadKey(); - Console.WriteLine(); - */ } + } } } diff --git a/Test2/Properties/PublishProfiles/FolderProfile.pubxml.user b/Test2/Properties/PublishProfiles/FolderProfile.pubxml.user index e4920d3..1cae2c4 100644 --- a/Test2/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/Test2/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -4,6 +4,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121. --> - True|2021-05-27T05:25:07.0935906Z;False|2021-05-27T10:24:29.8656359+05:00;True|2021-05-27T10:23:03.9710447+05:00; + True|2021-06-05T18:21:31.7001275Z;True|2021-05-27T10:25:07.0935906+05:00;False|2021-05-27T10:24:29.8656359+05:00;True|2021-05-27T10:23:03.9710447+05:00; \ No newline at end of file diff --git a/Test2/bin/Debug/net5.0/DataClient.dll b/Test2/bin/Debug/net5.0/DataClient.dll index b0c7ae1..e1be471 100644 Binary files a/Test2/bin/Debug/net5.0/DataClient.dll and b/Test2/bin/Debug/net5.0/DataClient.dll differ diff --git a/Test2/bin/Debug/net5.0/DataClient.pdb b/Test2/bin/Debug/net5.0/DataClient.pdb index 6289b02..39a18ae 100644 Binary files a/Test2/bin/Debug/net5.0/DataClient.pdb and b/Test2/bin/Debug/net5.0/DataClient.pdb differ diff --git a/Test2/bin/Debug/net5.0/Test2.dll b/Test2/bin/Debug/net5.0/Test2.dll index 05bd5ea..251763d 100644 Binary files a/Test2/bin/Debug/net5.0/Test2.dll and b/Test2/bin/Debug/net5.0/Test2.dll differ diff --git a/Test2/bin/Debug/net5.0/Test2.pdb b/Test2/bin/Debug/net5.0/Test2.pdb index 707ad97..7ee2500 100644 Binary files a/Test2/bin/Debug/net5.0/Test2.pdb and b/Test2/bin/Debug/net5.0/Test2.pdb differ diff --git a/Test2/bin/Debug/net5.0/test/pasp0.txt b/Test2/bin/Debug/net5.0/test/pasp0.txt deleted file mode 100644 index ef3f754..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp0.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp1.txt b/Test2/bin/Debug/net5.0/test/pasp1.txt deleted file mode 100644 index fc4ac56..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp1.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp10.txt b/Test2/bin/Debug/net5.0/test/pasp10.txt deleted file mode 100644 index b51f56e..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp10.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp100.txt b/Test2/bin/Debug/net5.0/test/pasp100.txt deleted file mode 100644 index 072fc57..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp100.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp101.txt b/Test2/bin/Debug/net5.0/test/pasp101.txt deleted file mode 100644 index 5ef5cdf..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp101.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp102.txt b/Test2/bin/Debug/net5.0/test/pasp102.txt deleted file mode 100644 index 0f4d8f4..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp102.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp103.txt b/Test2/bin/Debug/net5.0/test/pasp103.txt deleted file mode 100644 index 0f268f8..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp103.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp104.txt b/Test2/bin/Debug/net5.0/test/pasp104.txt deleted file mode 100644 index e4b6bba..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp104.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp105.txt b/Test2/bin/Debug/net5.0/test/pasp105.txt deleted file mode 100644 index 3d3fc6d..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp105.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp106.txt b/Test2/bin/Debug/net5.0/test/pasp106.txt deleted file mode 100644 index aca26e0..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp106.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp107.txt b/Test2/bin/Debug/net5.0/test/pasp107.txt deleted file mode 100644 index 8db35d4..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp107.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp108.txt b/Test2/bin/Debug/net5.0/test/pasp108.txt deleted file mode 100644 index a45d7ea..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp108.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp109.txt b/Test2/bin/Debug/net5.0/test/pasp109.txt deleted file mode 100644 index 47a0dc4..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp109.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp11.txt b/Test2/bin/Debug/net5.0/test/pasp11.txt deleted file mode 100644 index 78d0010..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp11.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp110.txt b/Test2/bin/Debug/net5.0/test/pasp110.txt deleted file mode 100644 index b98b779..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp110.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp111.txt b/Test2/bin/Debug/net5.0/test/pasp111.txt deleted file mode 100644 index 453d805..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp111.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp112.txt b/Test2/bin/Debug/net5.0/test/pasp112.txt deleted file mode 100644 index 25d746e..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp112.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp113.txt b/Test2/bin/Debug/net5.0/test/pasp113.txt deleted file mode 100644 index 39fb29a..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp113.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp12.txt b/Test2/bin/Debug/net5.0/test/pasp12.txt deleted file mode 100644 index 5c96a74..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp12.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp13.txt b/Test2/bin/Debug/net5.0/test/pasp13.txt deleted file mode 100644 index 1fdd9c0..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp13.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp14.txt b/Test2/bin/Debug/net5.0/test/pasp14.txt deleted file mode 100644 index dd45411..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp14.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp15.txt b/Test2/bin/Debug/net5.0/test/pasp15.txt deleted file mode 100644 index 6579492..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp15.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp16.txt b/Test2/bin/Debug/net5.0/test/pasp16.txt deleted file mode 100644 index 4a33b79..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp16.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp17.txt b/Test2/bin/Debug/net5.0/test/pasp17.txt deleted file mode 100644 index 477f146..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp17.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp18.txt b/Test2/bin/Debug/net5.0/test/pasp18.txt deleted file mode 100644 index 038d032..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp18.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp19.txt b/Test2/bin/Debug/net5.0/test/pasp19.txt deleted file mode 100644 index e640850..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp19.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp2.txt b/Test2/bin/Debug/net5.0/test/pasp2.txt deleted file mode 100644 index 8a88343..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp2.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp20.txt b/Test2/bin/Debug/net5.0/test/pasp20.txt deleted file mode 100644 index 943267f..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp20.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp21.txt b/Test2/bin/Debug/net5.0/test/pasp21.txt deleted file mode 100644 index 3754a93..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp21.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp22.txt b/Test2/bin/Debug/net5.0/test/pasp22.txt deleted file mode 100644 index fcd5f56..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp22.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp23.txt b/Test2/bin/Debug/net5.0/test/pasp23.txt deleted file mode 100644 index 41f5e16..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp23.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp24.txt b/Test2/bin/Debug/net5.0/test/pasp24.txt deleted file mode 100644 index d3ccaa4..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp24.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp25.txt b/Test2/bin/Debug/net5.0/test/pasp25.txt deleted file mode 100644 index 883809b..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp25.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp26.txt b/Test2/bin/Debug/net5.0/test/pasp26.txt deleted file mode 100644 index b7cdb1f..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp26.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp27.txt b/Test2/bin/Debug/net5.0/test/pasp27.txt deleted file mode 100644 index 2cfba32..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp27.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp28.txt b/Test2/bin/Debug/net5.0/test/pasp28.txt deleted file mode 100644 index 378d145..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp28.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp29.txt b/Test2/bin/Debug/net5.0/test/pasp29.txt deleted file mode 100644 index 5b39d2b..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp29.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp3.txt b/Test2/bin/Debug/net5.0/test/pasp3.txt deleted file mode 100644 index de92a9b..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp3.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp30.txt b/Test2/bin/Debug/net5.0/test/pasp30.txt deleted file mode 100644 index 2e0b953..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp30.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp31.txt b/Test2/bin/Debug/net5.0/test/pasp31.txt deleted file mode 100644 index 9057873..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp31.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp32.txt b/Test2/bin/Debug/net5.0/test/pasp32.txt deleted file mode 100644 index 350029e..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp32.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp33.txt b/Test2/bin/Debug/net5.0/test/pasp33.txt deleted file mode 100644 index bf1cd4a..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp33.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp34.txt b/Test2/bin/Debug/net5.0/test/pasp34.txt deleted file mode 100644 index 008820d..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp34.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp35.txt b/Test2/bin/Debug/net5.0/test/pasp35.txt deleted file mode 100644 index 1855b08..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp35.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp36.txt b/Test2/bin/Debug/net5.0/test/pasp36.txt deleted file mode 100644 index 90be184..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp36.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp37.txt b/Test2/bin/Debug/net5.0/test/pasp37.txt deleted file mode 100644 index 6619e7e..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp37.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp38.txt b/Test2/bin/Debug/net5.0/test/pasp38.txt deleted file mode 100644 index f39b625..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp38.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp39.txt b/Test2/bin/Debug/net5.0/test/pasp39.txt deleted file mode 100644 index 8d381d5..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp39.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp4.txt b/Test2/bin/Debug/net5.0/test/pasp4.txt deleted file mode 100644 index 21185a4..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp4.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp40.txt b/Test2/bin/Debug/net5.0/test/pasp40.txt deleted file mode 100644 index c92c506..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp40.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp41.txt b/Test2/bin/Debug/net5.0/test/pasp41.txt deleted file mode 100644 index e063ba8..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp41.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp42.txt b/Test2/bin/Debug/net5.0/test/pasp42.txt deleted file mode 100644 index de80b2c..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp42.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp43.txt b/Test2/bin/Debug/net5.0/test/pasp43.txt deleted file mode 100644 index a166881..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp43.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp44.txt b/Test2/bin/Debug/net5.0/test/pasp44.txt deleted file mode 100644 index 4b0356b..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp44.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp45.txt b/Test2/bin/Debug/net5.0/test/pasp45.txt deleted file mode 100644 index cc5a57e..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp45.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp46.txt b/Test2/bin/Debug/net5.0/test/pasp46.txt deleted file mode 100644 index f46a892..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp46.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp47.txt b/Test2/bin/Debug/net5.0/test/pasp47.txt deleted file mode 100644 index 3623023..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp47.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp48.txt b/Test2/bin/Debug/net5.0/test/pasp48.txt deleted file mode 100644 index 4fa7564..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp48.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp49.txt b/Test2/bin/Debug/net5.0/test/pasp49.txt deleted file mode 100644 index 3663c0a..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp49.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp5.txt b/Test2/bin/Debug/net5.0/test/pasp5.txt deleted file mode 100644 index 43aa70a..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp5.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp50.txt b/Test2/bin/Debug/net5.0/test/pasp50.txt deleted file mode 100644 index e74193d..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp50.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp51.txt b/Test2/bin/Debug/net5.0/test/pasp51.txt deleted file mode 100644 index 4a113b5..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp51.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp52.txt b/Test2/bin/Debug/net5.0/test/pasp52.txt deleted file mode 100644 index 29c7a0d..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp52.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp53.txt b/Test2/bin/Debug/net5.0/test/pasp53.txt deleted file mode 100644 index eac618c..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp53.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp54.txt b/Test2/bin/Debug/net5.0/test/pasp54.txt deleted file mode 100644 index 842bb09..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp54.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp55.txt b/Test2/bin/Debug/net5.0/test/pasp55.txt deleted file mode 100644 index 90a76da..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp55.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp56.txt b/Test2/bin/Debug/net5.0/test/pasp56.txt deleted file mode 100644 index aec7865..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp56.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp57.txt b/Test2/bin/Debug/net5.0/test/pasp57.txt deleted file mode 100644 index 1570f3a..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp57.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp58.txt b/Test2/bin/Debug/net5.0/test/pasp58.txt deleted file mode 100644 index d6a7e39..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp58.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp59.txt b/Test2/bin/Debug/net5.0/test/pasp59.txt deleted file mode 100644 index 4bc0184..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp59.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp6.txt b/Test2/bin/Debug/net5.0/test/pasp6.txt deleted file mode 100644 index ccbfcc1..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp6.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp60.txt b/Test2/bin/Debug/net5.0/test/pasp60.txt deleted file mode 100644 index e15829c..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp60.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp61.txt b/Test2/bin/Debug/net5.0/test/pasp61.txt deleted file mode 100644 index f2e0b6a..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp61.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp62.txt b/Test2/bin/Debug/net5.0/test/pasp62.txt deleted file mode 100644 index 6d71d7a..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp62.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp63.txt b/Test2/bin/Debug/net5.0/test/pasp63.txt deleted file mode 100644 index 6cb9953..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp63.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp64.txt b/Test2/bin/Debug/net5.0/test/pasp64.txt deleted file mode 100644 index 2c9083b..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp64.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp65.txt b/Test2/bin/Debug/net5.0/test/pasp65.txt deleted file mode 100644 index 3f1b2a6..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp65.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp66.txt b/Test2/bin/Debug/net5.0/test/pasp66.txt deleted file mode 100644 index a4bcf28..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp66.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp67.txt b/Test2/bin/Debug/net5.0/test/pasp67.txt deleted file mode 100644 index 1f9352d..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp67.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp68.txt b/Test2/bin/Debug/net5.0/test/pasp68.txt deleted file mode 100644 index 271e7b7..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp68.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp69.txt b/Test2/bin/Debug/net5.0/test/pasp69.txt deleted file mode 100644 index 44c6c74..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp69.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp7.txt b/Test2/bin/Debug/net5.0/test/pasp7.txt deleted file mode 100644 index 8114d26..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp7.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp70.txt b/Test2/bin/Debug/net5.0/test/pasp70.txt deleted file mode 100644 index 2befb6f..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp70.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp71.txt b/Test2/bin/Debug/net5.0/test/pasp71.txt deleted file mode 100644 index ee79777..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp71.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp72.txt b/Test2/bin/Debug/net5.0/test/pasp72.txt deleted file mode 100644 index 9018013..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp72.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp73.txt b/Test2/bin/Debug/net5.0/test/pasp73.txt deleted file mode 100644 index 00fa742..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp73.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp74.txt b/Test2/bin/Debug/net5.0/test/pasp74.txt deleted file mode 100644 index 0390e8e..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp74.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp75.txt b/Test2/bin/Debug/net5.0/test/pasp75.txt deleted file mode 100644 index e96961a..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp75.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp76.txt b/Test2/bin/Debug/net5.0/test/pasp76.txt deleted file mode 100644 index 8cc091f..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp76.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp77.txt b/Test2/bin/Debug/net5.0/test/pasp77.txt deleted file mode 100644 index b704609..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp77.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp78.txt b/Test2/bin/Debug/net5.0/test/pasp78.txt deleted file mode 100644 index 521825f..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp78.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp79.txt b/Test2/bin/Debug/net5.0/test/pasp79.txt deleted file mode 100644 index 7fbcf11..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp79.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp8.txt b/Test2/bin/Debug/net5.0/test/pasp8.txt deleted file mode 100644 index 3157d53..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp8.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp80.txt b/Test2/bin/Debug/net5.0/test/pasp80.txt deleted file mode 100644 index 9f4934a..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp80.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp81.txt b/Test2/bin/Debug/net5.0/test/pasp81.txt deleted file mode 100644 index 9eb1630..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp81.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp82.txt b/Test2/bin/Debug/net5.0/test/pasp82.txt deleted file mode 100644 index c584ef9..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp82.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp83.txt b/Test2/bin/Debug/net5.0/test/pasp83.txt deleted file mode 100644 index 590c275..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp83.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp84.txt b/Test2/bin/Debug/net5.0/test/pasp84.txt deleted file mode 100644 index ae352bf..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp84.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp85.txt b/Test2/bin/Debug/net5.0/test/pasp85.txt deleted file mode 100644 index 427baac..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp85.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp86.txt b/Test2/bin/Debug/net5.0/test/pasp86.txt deleted file mode 100644 index 9295e2f..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp86.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp87.txt b/Test2/bin/Debug/net5.0/test/pasp87.txt deleted file mode 100644 index 22e4955..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp87.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp88.txt b/Test2/bin/Debug/net5.0/test/pasp88.txt deleted file mode 100644 index 587d7b6..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp88.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp89.txt b/Test2/bin/Debug/net5.0/test/pasp89.txt deleted file mode 100644 index d359a70..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp89.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp9.txt b/Test2/bin/Debug/net5.0/test/pasp9.txt deleted file mode 100644 index c25014c..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp9.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp90.txt b/Test2/bin/Debug/net5.0/test/pasp90.txt deleted file mode 100644 index c2f98b5..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp90.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp91.txt b/Test2/bin/Debug/net5.0/test/pasp91.txt deleted file mode 100644 index 3216c59..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp91.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp92.txt b/Test2/bin/Debug/net5.0/test/pasp92.txt deleted file mode 100644 index 7b9c552..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp92.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp93.txt b/Test2/bin/Debug/net5.0/test/pasp93.txt deleted file mode 100644 index 3154d7b..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp93.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp94.txt b/Test2/bin/Debug/net5.0/test/pasp94.txt deleted file mode 100644 index c595575..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp94.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp95.txt b/Test2/bin/Debug/net5.0/test/pasp95.txt deleted file mode 100644 index b240227..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp95.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp96.txt b/Test2/bin/Debug/net5.0/test/pasp96.txt deleted file mode 100644 index 16795b6..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp96.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp97.txt b/Test2/bin/Debug/net5.0/test/pasp97.txt deleted file mode 100644 index 89fb1ab..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp97.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp98.txt b/Test2/bin/Debug/net5.0/test/pasp98.txt deleted file mode 100644 index c9f647d..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp98.txt and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/test/pasp99.txt b/Test2/bin/Debug/net5.0/test/pasp99.txt deleted file mode 100644 index 1de67a9..0000000 Binary files a/Test2/bin/Debug/net5.0/test/pasp99.txt and /dev/null differ diff --git a/Test2/bin/Release/net5.0/Config/config.json b/Test2/bin/Release/net5.0/Config/config.json index 0d02ca9..f71d35f 100644 --- a/Test2/bin/Release/net5.0/Config/config.json +++ b/Test2/bin/Release/net5.0/Config/config.json @@ -2,13 +2,15 @@ "servers": [ { "name": "STP 1", - "address": "10.10.45.151:1070", - "archive": "Y:\\data" + "ip": "10.10.45.151", + "port": 1070, + "dir": "Y:\\data" }, { "name": "STP 2", - "address": "10.10.45.152:1070", - "archive": "Z:\\data" + "ip": "10.10.45.152", + "port": 1070, + "dir": "Z:\\data" } ] } diff --git a/Test2/bin/Release/net5.0/DataClient.dll b/Test2/bin/Release/net5.0/DataClient.dll new file mode 100644 index 0000000..2bab1ff Binary files /dev/null and b/Test2/bin/Release/net5.0/DataClient.dll differ diff --git a/Test2/bin/Release/net5.0/DataClient.pdb b/Test2/bin/Release/net5.0/DataClient.pdb new file mode 100644 index 0000000..a6bc20a Binary files /dev/null and b/Test2/bin/Release/net5.0/DataClient.pdb differ diff --git a/Test2/bin/Release/net5.0/Microsoft.Extensions.Configuration.Abstractions.dll b/Test2/bin/Release/net5.0/Microsoft.Extensions.Configuration.Abstractions.dll new file mode 100644 index 0000000..dd5ebe2 Binary files /dev/null and b/Test2/bin/Release/net5.0/Microsoft.Extensions.Configuration.Abstractions.dll differ diff --git a/Test2/bin/Release/net5.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll b/Test2/bin/Release/net5.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll new file mode 100644 index 0000000..84aaf39 Binary files /dev/null and b/Test2/bin/Release/net5.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll differ diff --git a/Test2/bin/Release/net5.0/Microsoft.Extensions.DependencyInjection.dll b/Test2/bin/Release/net5.0/Microsoft.Extensions.DependencyInjection.dll new file mode 100644 index 0000000..1034ee6 Binary files /dev/null and b/Test2/bin/Release/net5.0/Microsoft.Extensions.DependencyInjection.dll differ diff --git a/Test2/bin/Release/net5.0/Microsoft.Extensions.Logging.Abstractions.dll b/Test2/bin/Release/net5.0/Microsoft.Extensions.Logging.Abstractions.dll new file mode 100644 index 0000000..2c87f79 Binary files /dev/null and b/Test2/bin/Release/net5.0/Microsoft.Extensions.Logging.Abstractions.dll differ diff --git a/Test2/bin/Release/net5.0/Microsoft.Extensions.Logging.dll b/Test2/bin/Release/net5.0/Microsoft.Extensions.Logging.dll new file mode 100644 index 0000000..6df35e1 Binary files /dev/null and b/Test2/bin/Release/net5.0/Microsoft.Extensions.Logging.dll differ diff --git a/Test2/bin/Release/net5.0/Microsoft.Extensions.Options.dll b/Test2/bin/Release/net5.0/Microsoft.Extensions.Options.dll new file mode 100644 index 0000000..8a2a8c8 Binary files /dev/null and b/Test2/bin/Release/net5.0/Microsoft.Extensions.Options.dll differ diff --git a/Test2/bin/Release/net5.0/Microsoft.Extensions.Primitives.dll b/Test2/bin/Release/net5.0/Microsoft.Extensions.Primitives.dll new file mode 100644 index 0000000..884f9dc Binary files /dev/null and b/Test2/bin/Release/net5.0/Microsoft.Extensions.Primitives.dll differ diff --git a/Test2/bin/Release/net5.0/NLog.Extensions.Logging.dll b/Test2/bin/Release/net5.0/NLog.Extensions.Logging.dll new file mode 100644 index 0000000..e9c06a8 Binary files /dev/null and b/Test2/bin/Release/net5.0/NLog.Extensions.Logging.dll differ diff --git a/Test2/bin/Release/net5.0/NLog.dll b/Test2/bin/Release/net5.0/NLog.dll new file mode 100644 index 0000000..36689f2 Binary files /dev/null and b/Test2/bin/Release/net5.0/NLog.dll differ diff --git a/Test2/bin/Release/net5.0/Newtonsoft.Json.dll b/Test2/bin/Release/net5.0/Newtonsoft.Json.dll new file mode 100644 index 0000000..1ffeabe Binary files /dev/null and b/Test2/bin/Release/net5.0/Newtonsoft.Json.dll differ diff --git a/Test2/bin/Release/net5.0/STPClient.dll b/Test2/bin/Release/net5.0/STPClient.dll deleted file mode 100644 index e70265e..0000000 Binary files a/Test2/bin/Release/net5.0/STPClient.dll and /dev/null differ diff --git a/Test2/bin/Release/net5.0/STPClient.pdb b/Test2/bin/Release/net5.0/STPClient.pdb deleted file mode 100644 index ec402f8..0000000 Binary files a/Test2/bin/Release/net5.0/STPClient.pdb and /dev/null differ diff --git a/Test2/bin/Release/net5.0/Test2.deps.json b/Test2/bin/Release/net5.0/Test2.deps.json index f152570..3152e79 100644 --- a/Test2/bin/Release/net5.0/Test2.deps.json +++ b/Test2/bin/Release/net5.0/Test2.deps.json @@ -8,15 +8,123 @@ ".NETCoreApp,Version=v5.0": { "Test2/1.0.0": { "dependencies": { - "STPClient": "1.0.0" + "DataClient": "0.0.3", + "NLog": "4.7.10", + "NLog.Extensions.Logging": "1.7.2" }, "runtime": { "Test2.dll": {} } }, - "STPClient/1.0.0": { + "Microsoft.Extensions.Configuration.Abstractions/5.0.0": { + "dependencies": { + "Microsoft.Extensions.Primitives": "5.0.0" + }, "runtime": { - "STPClient.dll": {} + "lib/netstandard2.0/Microsoft.Extensions.Configuration.Abstractions.dll": { + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" + } + } + }, + "Microsoft.Extensions.DependencyInjection/5.0.0": { + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "5.0.0" + }, + "runtime": { + "lib/net5.0/Microsoft.Extensions.DependencyInjection.dll": { + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" + } + } + }, + "Microsoft.Extensions.DependencyInjection.Abstractions/5.0.0": { + "runtime": { + "lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll": { + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" + } + } + }, + "Microsoft.Extensions.Logging/5.0.0": { + "dependencies": { + "Microsoft.Extensions.DependencyInjection": "5.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "5.0.0", + "Microsoft.Extensions.Logging.Abstractions": "5.0.0", + "Microsoft.Extensions.Options": "5.0.0" + }, + "runtime": { + "lib/netstandard2.1/Microsoft.Extensions.Logging.dll": { + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" + } + } + }, + "Microsoft.Extensions.Logging.Abstractions/5.0.0": { + "runtime": { + "lib/netstandard2.0/Microsoft.Extensions.Logging.Abstractions.dll": { + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" + } + } + }, + "Microsoft.Extensions.Options/5.0.0": { + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "5.0.0", + "Microsoft.Extensions.Primitives": "5.0.0" + }, + "runtime": { + "lib/net5.0/Microsoft.Extensions.Options.dll": { + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" + } + } + }, + "Microsoft.Extensions.Primitives/5.0.0": { + "runtime": { + "lib/netcoreapp3.0/Microsoft.Extensions.Primitives.dll": { + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" + } + } + }, + "Newtonsoft.Json/13.0.1": { + "runtime": { + "lib/netstandard2.0/Newtonsoft.Json.dll": { + "assemblyVersion": "13.0.0.0", + "fileVersion": "13.0.1.25517" + } + } + }, + "NLog/4.7.10": { + "runtime": { + "lib/netstandard2.0/NLog.dll": { + "assemblyVersion": "4.0.0.0", + "fileVersion": "4.7.10.13013" + } + } + }, + "NLog.Extensions.Logging/1.7.2": { + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "5.0.0", + "Microsoft.Extensions.Logging": "5.0.0", + "NLog": "4.7.10" + }, + "runtime": { + "lib/net5.0/NLog.Extensions.Logging.dll": { + "assemblyVersion": "1.0.0.0", + "fileVersion": "1.7.2.1548" + } + } + }, + "DataClient/0.0.3": { + "dependencies": { + "NLog": "4.7.10", + "NLog.Extensions.Logging": "1.7.2", + "Newtonsoft.Json": "13.0.1" + }, + "runtime": { + "DataClient.dll": {} } } } @@ -27,7 +135,77 @@ "serviceable": false, "sha512": "" }, - "STPClient/1.0.0": { + "Microsoft.Extensions.Configuration.Abstractions/5.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-ETjSBHMp3OAZ4HxGQYpwyGsD8Sw5FegQXphi0rpoGMT74S4+I2mm7XJEswwn59XAaKOzC15oDSOWEE8SzDCd6Q==", + "path": "microsoft.extensions.configuration.abstractions/5.0.0", + "hashPath": "microsoft.extensions.configuration.abstractions.5.0.0.nupkg.sha512" + }, + "Microsoft.Extensions.DependencyInjection/5.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-Rc2kb/p3Ze6cP6rhFC3PJRdWGbLvSHZc0ev7YlyeU6FmHciDMLrhoVoTUEzKPhN5ZjFgKF1Cf5fOz8mCMIkvpA==", + "path": "microsoft.extensions.dependencyinjection/5.0.0", + "hashPath": "microsoft.extensions.dependencyinjection.5.0.0.nupkg.sha512" + }, + "Microsoft.Extensions.DependencyInjection.Abstractions/5.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-ORj7Zh81gC69TyvmcUm9tSzytcy8AVousi+IVRAI8nLieQjOFryRusSFh7+aLk16FN9pQNqJAiMd7BTKINK0kA==", + "path": "microsoft.extensions.dependencyinjection.abstractions/5.0.0", + "hashPath": "microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg.sha512" + }, + "Microsoft.Extensions.Logging/5.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-MgOwK6tPzB6YNH21wssJcw/2MKwee8b2gI7SllYfn6rvTpIrVvVS5HAjSU2vqSku1fwqRvWP0MdIi14qjd93Aw==", + "path": "microsoft.extensions.logging/5.0.0", + "hashPath": "microsoft.extensions.logging.5.0.0.nupkg.sha512" + }, + "Microsoft.Extensions.Logging.Abstractions/5.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-NxP6ahFcBnnSfwNBi2KH2Oz8Xl5Sm2krjId/jRR3I7teFphwiUoUeZPwTNA21EX+5PtjqmyAvKaOeBXcJjcH/w==", + "path": "microsoft.extensions.logging.abstractions/5.0.0", + "hashPath": "microsoft.extensions.logging.abstractions.5.0.0.nupkg.sha512" + }, + "Microsoft.Extensions.Options/5.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-CBvR92TCJ5uBIdd9/HzDSrxYak+0W/3+yxrNg8Qm6Bmrkh5L+nu6m3WeazQehcZ5q1/6dDA7J5YdQjim0165zg==", + "path": "microsoft.extensions.options/5.0.0", + "hashPath": "microsoft.extensions.options.5.0.0.nupkg.sha512" + }, + "Microsoft.Extensions.Primitives/5.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-cI/VWn9G1fghXrNDagX9nYaaB/nokkZn0HYAawGaELQrl8InSezfe9OnfPZLcJq3esXxygh3hkq2c3qoV3SDyQ==", + "path": "microsoft.extensions.primitives/5.0.0", + "hashPath": "microsoft.extensions.primitives.5.0.0.nupkg.sha512" + }, + "Newtonsoft.Json/13.0.1": { + "type": "package", + "serviceable": true, + "sha512": "sha512-ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==", + "path": "newtonsoft.json/13.0.1", + "hashPath": "newtonsoft.json.13.0.1.nupkg.sha512" + }, + "NLog/4.7.10": { + "type": "package", + "serviceable": true, + "sha512": "sha512-rcegW7kYOCjl7wX0SzsqpPBqnJ51JKi1WkYb6QBVX0Wc5IgH19Pv4t/co+T0s06OS0Ne44xgkY/mHg0PdrmJow==", + "path": "nlog/4.7.10", + "hashPath": "nlog.4.7.10.nupkg.sha512" + }, + "NLog.Extensions.Logging/1.7.2": { + "type": "package", + "serviceable": true, + "sha512": "sha512-0y1QziAUCdePQc4itPOQF3xDcs0iE9NHlIK0hE0eA0+Ef6E9dnJDPveNu7w2ckYaDfJIFHpOoLK8sZmNEyiBCw==", + "path": "nlog.extensions.logging/1.7.2", + "hashPath": "nlog.extensions.logging.1.7.2.nupkg.sha512" + }, + "DataClient/0.0.3": { "type": "project", "serviceable": false, "sha512": "" diff --git a/Test2/bin/Release/net5.0/Test2.dll b/Test2/bin/Release/net5.0/Test2.dll index 6aa5485..92c6844 100644 Binary files a/Test2/bin/Release/net5.0/Test2.dll and b/Test2/bin/Release/net5.0/Test2.dll differ diff --git a/Test2/bin/Release/net5.0/Test2.pdb b/Test2/bin/Release/net5.0/Test2.pdb index 65c2cb6..dae416b 100644 Binary files a/Test2/bin/Release/net5.0/Test2.pdb and b/Test2/bin/Release/net5.0/Test2.pdb differ diff --git a/Test2/bin/Release/net5.0/ref/Test2.dll b/Test2/bin/Release/net5.0/ref/Test2.dll index b2dbc0f..dd192b9 100644 Binary files a/Test2/bin/Release/net5.0/ref/Test2.dll and b/Test2/bin/Release/net5.0/ref/Test2.dll differ diff --git a/Test2/obj/Debug/net5.0/Test2.csprojAssemblyReference.cache b/Test2/obj/Debug/net5.0/Test2.csprojAssemblyReference.cache index 1f9ed8f..a2d38ce 100644 Binary files a/Test2/obj/Debug/net5.0/Test2.csprojAssemblyReference.cache and b/Test2/obj/Debug/net5.0/Test2.csprojAssemblyReference.cache differ diff --git a/Test2/obj/Debug/net5.0/Test2.dll b/Test2/obj/Debug/net5.0/Test2.dll index 05bd5ea..251763d 100644 Binary files a/Test2/obj/Debug/net5.0/Test2.dll and b/Test2/obj/Debug/net5.0/Test2.dll differ diff --git a/Test2/obj/Debug/net5.0/Test2.pdb b/Test2/obj/Debug/net5.0/Test2.pdb index 707ad97..7ee2500 100644 Binary files a/Test2/obj/Debug/net5.0/Test2.pdb and b/Test2/obj/Debug/net5.0/Test2.pdb differ diff --git a/Test2/obj/Release/net5.0/PublishOutputs.b8d0070736.txt b/Test2/obj/Release/net5.0/PublishOutputs.b8d0070736.txt index e9afe49..6edc9a7 100644 --- a/Test2/obj/Release/net5.0/PublishOutputs.b8d0070736.txt +++ b/Test2/obj/Release/net5.0/PublishOutputs.b8d0070736.txt @@ -4,5 +4,15 @@ D:\GIT\ASCKU_PC\Release\Test2\Test2.dll D:\GIT\ASCKU_PC\Release\Test2\Test2.deps.json D:\GIT\ASCKU_PC\Release\Test2\Test2.runtimeconfig.json D:\GIT\ASCKU_PC\Release\Test2\Test2.pdb -D:\GIT\ASCKU_PC\Release\Test2\STPClient.dll -D:\GIT\ASCKU_PC\Release\Test2\STPClient.pdb +D:\GIT\ASCKU_PC\Release\Test2\Microsoft.Extensions.Configuration.Abstractions.dll +D:\GIT\ASCKU_PC\Release\Test2\Microsoft.Extensions.DependencyInjection.dll +D:\GIT\ASCKU_PC\Release\Test2\Microsoft.Extensions.DependencyInjection.Abstractions.dll +D:\GIT\ASCKU_PC\Release\Test2\Microsoft.Extensions.Logging.dll +D:\GIT\ASCKU_PC\Release\Test2\Microsoft.Extensions.Logging.Abstractions.dll +D:\GIT\ASCKU_PC\Release\Test2\Microsoft.Extensions.Options.dll +D:\GIT\ASCKU_PC\Release\Test2\Microsoft.Extensions.Primitives.dll +D:\GIT\ASCKU_PC\Release\Test2\Newtonsoft.Json.dll +D:\GIT\ASCKU_PC\Release\Test2\NLog.dll +D:\GIT\ASCKU_PC\Release\Test2\NLog.Extensions.Logging.dll +D:\GIT\ASCKU_PC\Release\Test2\DataClient.dll +D:\GIT\ASCKU_PC\Release\Test2\DataClient.pdb diff --git a/Test2/obj/Release/net5.0/Test2.assets.cache b/Test2/obj/Release/net5.0/Test2.assets.cache index 59a9da3..55a5fe3 100644 Binary files a/Test2/obj/Release/net5.0/Test2.assets.cache and b/Test2/obj/Release/net5.0/Test2.assets.cache differ diff --git a/Test2/obj/Release/net5.0/Test2.csproj.CoreCompileInputs.cache b/Test2/obj/Release/net5.0/Test2.csproj.CoreCompileInputs.cache index 792ac9e..ca2df30 100644 --- a/Test2/obj/Release/net5.0/Test2.csproj.CoreCompileInputs.cache +++ b/Test2/obj/Release/net5.0/Test2.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -426ffc149d7c8dd6b27318c70b63d6daf2417797 +0ceaad13732ca3aa8c52b948a1969568774845ec diff --git a/Test2/obj/Release/net5.0/Test2.csproj.FileListAbsolute.txt b/Test2/obj/Release/net5.0/Test2.csproj.FileListAbsolute.txt index 37eb88c..d2578d5 100644 --- a/Test2/obj/Release/net5.0/Test2.csproj.FileListAbsolute.txt +++ b/Test2/obj/Release/net5.0/Test2.csproj.FileListAbsolute.txt @@ -16,5 +16,15 @@ D:\GIT\ASCKU_PC\Test2\obj\Release\net5.0\ref\Test2.dll D:\GIT\ASCKU_PC\Test2\obj\Release\net5.0\Test2.pdb D:\GIT\ASCKU_PC\Test2\obj\Release\net5.0\Test2.genruntimeconfig.cache D:\GIT\ASCKU_PC\Test2\bin\Release\net5.0\Config\config.json -D:\GIT\ASCKU_PC\Test2\bin\Release\net5.0\STPClient.dll -D:\GIT\ASCKU_PC\Test2\bin\Release\net5.0\STPClient.pdb +D:\GIT\ASCKU_PC\Test2\bin\Release\net5.0\Microsoft.Extensions.Configuration.Abstractions.dll +D:\GIT\ASCKU_PC\Test2\bin\Release\net5.0\Microsoft.Extensions.DependencyInjection.dll +D:\GIT\ASCKU_PC\Test2\bin\Release\net5.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll +D:\GIT\ASCKU_PC\Test2\bin\Release\net5.0\Microsoft.Extensions.Logging.dll +D:\GIT\ASCKU_PC\Test2\bin\Release\net5.0\Microsoft.Extensions.Logging.Abstractions.dll +D:\GIT\ASCKU_PC\Test2\bin\Release\net5.0\Microsoft.Extensions.Options.dll +D:\GIT\ASCKU_PC\Test2\bin\Release\net5.0\Microsoft.Extensions.Primitives.dll +D:\GIT\ASCKU_PC\Test2\bin\Release\net5.0\Newtonsoft.Json.dll +D:\GIT\ASCKU_PC\Test2\bin\Release\net5.0\NLog.dll +D:\GIT\ASCKU_PC\Test2\bin\Release\net5.0\NLog.Extensions.Logging.dll +D:\GIT\ASCKU_PC\Test2\bin\Release\net5.0\DataClient.dll +D:\GIT\ASCKU_PC\Test2\bin\Release\net5.0\DataClient.pdb diff --git a/Test2/obj/Release/net5.0/Test2.csprojAssemblyReference.cache b/Test2/obj/Release/net5.0/Test2.csprojAssemblyReference.cache index 10f79ce..ec8a7bf 100644 Binary files a/Test2/obj/Release/net5.0/Test2.csprojAssemblyReference.cache and b/Test2/obj/Release/net5.0/Test2.csprojAssemblyReference.cache differ diff --git a/Test2/obj/Release/net5.0/Test2.dll b/Test2/obj/Release/net5.0/Test2.dll index 6aa5485..92c6844 100644 Binary files a/Test2/obj/Release/net5.0/Test2.dll and b/Test2/obj/Release/net5.0/Test2.dll differ diff --git a/Test2/obj/Release/net5.0/Test2.pdb b/Test2/obj/Release/net5.0/Test2.pdb index 65c2cb6..dae416b 100644 Binary files a/Test2/obj/Release/net5.0/Test2.pdb and b/Test2/obj/Release/net5.0/Test2.pdb differ diff --git a/Test2/obj/Release/net5.0/ref/Test2.dll b/Test2/obj/Release/net5.0/ref/Test2.dll index b2dbc0f..dd192b9 100644 Binary files a/Test2/obj/Release/net5.0/ref/Test2.dll and b/Test2/obj/Release/net5.0/ref/Test2.dll differ diff --git a/Tests/obj/Debug/netcoreapp3.1/Tests.csprojAssemblyReference.cache b/Tests/obj/Debug/netcoreapp3.1/Tests.csprojAssemblyReference.cache index 7ba6372..b0667f0 100644 Binary files a/Tests/obj/Debug/netcoreapp3.1/Tests.csprojAssemblyReference.cache and b/Tests/obj/Debug/netcoreapp3.1/Tests.csprojAssemblyReference.cache differ diff --git a/Tests/obj/Release/netcoreapp3.1/Tests.csprojAssemblyReference.cache b/Tests/obj/Release/netcoreapp3.1/Tests.csprojAssemblyReference.cache index d8643d2..17930a4 100644 Binary files a/Tests/obj/Release/netcoreapp3.1/Tests.csprojAssemblyReference.cache and b/Tests/obj/Release/netcoreapp3.1/Tests.csprojAssemblyReference.cache differ