diff --git a/.vs/ASCKU Projects/v16/.suo b/.vs/ASCKU Projects/v16/.suo
index 218c7f3..b44b956 100644
Binary files a/.vs/ASCKU Projects/v16/.suo and b/.vs/ASCKU Projects/v16/.suo differ
diff --git a/ApiServer/obj/Debug/net5.0/ApiServer.csproj.AssemblyReference.cache b/ApiServer/obj/Debug/net5.0/ApiServer.csproj.AssemblyReference.cache
index ff07f33..681496a 100644
Binary files a/ApiServer/obj/Debug/net5.0/ApiServer.csproj.AssemblyReference.cache and b/ApiServer/obj/Debug/net5.0/ApiServer.csproj.AssemblyReference.cache differ
diff --git a/ApiServer/obj/Release/net5.0/ApiServer.csproj.AssemblyReference.cache b/ApiServer/obj/Release/net5.0/ApiServer.csproj.AssemblyReference.cache
index 46cf44d..7ad08cb 100644
Binary files a/ApiServer/obj/Release/net5.0/ApiServer.csproj.AssemblyReference.cache and b/ApiServer/obj/Release/net5.0/ApiServer.csproj.AssemblyReference.cache differ
diff --git a/ClientCollector/ClientCollector.csproj b/ClientCollector/ClientCollector.csproj
index 857540d..48aab4c 100644
--- a/ClientCollector/ClientCollector.csproj
+++ b/ClientCollector/ClientCollector.csproj
@@ -8,6 +8,7 @@
+
diff --git a/ClientCollector/Program.cs b/ClientCollector/Program.cs
index 1744d8c..645b8f3 100644
--- a/ClientCollector/Program.cs
+++ b/ClientCollector/Program.cs
@@ -15,6 +15,8 @@ using System.Text;
using System.IO;
using System.Collections.Generic;
using System.Diagnostics;
+using ICSharpCode.SharpZipLib.GZip;
+using ICSharpCode.SharpZipLib.Tar;
namespace ClientCollector
{
@@ -27,19 +29,35 @@ namespace ClientCollector
LogConf();
log.Info("Start Client Collector.");
Task taskPasp = null;
+ var workPasp = false;
Task taskData = null;
+ var workData = false;
+
+ foreach(var arg in args)
+ {
+ if(int.TryParse(arg, out int flag))
+ switch (flag)
+ {
+ case 1:
+ workPasp = true;
+ break;
+ case 2:
+ workData = true;
+ break;
+ }
+ }
while (true)
{
if (taskPasp == null || taskPasp.IsCompleted)
{
- log.Info("Start Pasport Task.");
- taskPasp = WorkPasport();
+ log.Info(workPasp ? "Start Pasport Task." : "Skip Pasport Task.");
+ taskPasp = workPasp ? WorkPasport() : Task.Delay(int.MaxValue);
}
if (taskData == null || taskData.IsCompleted)
{
- log.Info("Start Data Task.");
- taskData = WorkData();
+ log.Info(workData ? "Start Data Task." : "Skip Data Task.");
+ taskData = workData ? WorkData() : Task.Delay(int.MaxValue);
}
log.Info("Wait tasks.");
Task.WaitAny(new Task[] { taskPasp, taskData });
@@ -160,7 +178,6 @@ namespace ClientCollector
var currDate = GetCurrData(nameCurrDate);
if (!currDate.HasValue)
currDate = new DateTime(2001, 02, 01);
- var flagcycle = false;
while (currDate.Value < DateTime.Now.AddDays(-1))
{
try
@@ -200,25 +217,67 @@ namespace ClientCollector
}
else
{
- var listVDP = new List();
- for (var i = 0; i < 50; i++) listVDP.Add(i.ToString("D2"));
- for (var i = 90; i < 95; i++) listVDP.Add(i.ToString("D2"));
+ var listVDP = new List();
+ for (var i = 0; i < 50; i++) listVDP.Add(i);
+ for (var i = 90; i < 95; i++) listVDP.Add(i);
foreach (var vdp in listVDP)
{
+ var pathTmp = Path.Combine(Directory.GetCurrentDirectory(), "tmpData");
+ if (Directory.Exists(pathTmp)) Directory.Delete(pathTmp, true);
+ Directory.CreateDirectory(pathTmp);
for (var numFile = 0; numFile < 16; numFile++)
{
- var pathTmp = Path.Combine(Directory.GetCurrentDirectory(), "tmpData");
- if (!Directory.Exists(pathTmp)) Directory.CreateDirectory(pathTmp);
- var nc = new NETClient(IpSTP, PortSTP);
- while (!nc.Connected())
- if(nc.ReConnect())
+ await Task.Delay(2000);
+ var name = currDate.Value.ToString("yyyyMMdd") + "." + vdp.ToString("D2") + numFile.ToString("X1");
+ try
+ {
+ var nc = new NETClient(IpSTP, PortSTP);
+ while (!nc.Connected())
+ if (!nc.ReConnect())
+ {
+ log.Warn("Can't connect to STP.");
+ await Task.Delay(5000);
+ }
+ log.Info("Try download " + name);
+ var array = nc.Full_Download_NH(currDate.Value, vdp, numFile);
+ nc.Close();
+ if (array == null || array.Length == 0)
{
- log.Warn("Can't connect to STP.");
-
+ log.Info("File " + name + " not exist.");
+ continue;
}
-
+ File.WriteAllBytes(Path.Combine(pathTmp, name), array);
+ }
+ catch (Exception e)
+ {
+ log.Warn(e.Message);
+ log.Warn("Can't download " + name);
+ }
+ }
+ {
+ var files = Directory.GetFiles(pathTmp);
+ if (files.Length > 0)
+ {
+ var targzFile = vdp.ToString("D2") + ".tar.gz";
+ using (var outStream = File.Create(Path.Combine(pathTmp, targzFile)))
+ using (var gzoStream = new GZipOutputStream(outStream))
+ using (var tarArchive = TarArchive.CreateOutputTarArchive(gzoStream))
+ foreach (var file in files)
+ {
+ tarArchive.RootPath = Path.GetDirectoryName(file);
+ var tarEntry = TarEntry.CreateEntryFromFile(file);
+ tarEntry.Name = Path.GetFileName(file);
+ tarArchive.WriteEntry(tarEntry, true);
+ }
+ var fileStruct = File.ReadAllBytes(Path.Combine(pathTmp, targzFile));
+ while (!SendData(currDate.Value, Path.GetFileName(targzFile), fileStruct))
+ {
+ log.Warn("Can't send data to API.");
+ await Task.Delay(10000);
+ }
+ }
+ Directory.Delete(pathTmp, true);
}
-
}
}
log.Info("End day: " + subDir);
diff --git a/ClientCollector/Properties/PublishProfiles/FolderProfile.pubxml.user b/ClientCollector/Properties/PublishProfiles/FolderProfile.pubxml.user
index 23b4b7a..e033a03 100644
--- a/ClientCollector/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/ClientCollector/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,6 +4,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
-->
- True|2021-08-03T04:16:13.2186336Z;True|2021-08-03T09:08:23.8217457+05:00;True|2021-08-03T06:22:57.0758714+05:00;True|2021-08-03T06:18:08.6594656+05:00;True|2021-08-02T22:58:49.1867297+05:00;True|2021-08-02T22:56:02.6749724+05:00;True|2021-08-02T22:50:24.0842490+05:00;True|2021-08-02T22:46:50.7307549+05:00;True|2021-08-02T22:46:32.2783734+05:00;True|2021-08-02T22:37:45.7957317+05:00;True|2021-08-02T22:34:37.2905589+05:00;True|2021-08-02T22:31:30.3451541+05:00;True|2021-08-02T12:26:02.5496847+05:00;True|2021-08-01T23:12:48.3492831+05:00;True|2021-08-01T22:53:02.2382201+05:00;True|2021-08-01T22:48:16.9658882+05:00;True|2021-08-01T22:40:58.1479436+05:00;True|2021-08-01T22:28:58.9840017+05:00;True|2021-08-01T20:16:20.5210616+05:00;True|2021-08-01T19:27:43.9900600+05:00;True|2021-08-01T19:18:48.8000969+05:00;True|2021-08-01T19:15:19.9257002+05:00;True|2021-08-01T19:08:17.1315589+05:00;True|2021-07-31T20:35:08.9408458+05:00;True|2021-07-31T20:20:29.0886405+05:00;
+ True|2021-08-03T12:34:00.5000813Z;True|2021-08-03T16:17:51.6290703+05:00;True|2021-08-03T16:09:52.5362744+05:00;True|2021-08-03T16:06:46.4824852+05:00;True|2021-08-03T15:36:41.6609527+05:00;True|2021-08-03T15:35:25.5203278+05:00;True|2021-08-03T15:31:12.5276170+05:00;True|2021-08-03T09:16:13.2186336+05:00;True|2021-08-03T09:08:23.8217457+05:00;True|2021-08-03T06:22:57.0758714+05:00;True|2021-08-03T06:18:08.6594656+05:00;True|2021-08-02T22:58:49.1867297+05:00;True|2021-08-02T22:56:02.6749724+05:00;True|2021-08-02T22:50:24.0842490+05:00;True|2021-08-02T22:46:50.7307549+05:00;True|2021-08-02T22:46:32.2783734+05:00;True|2021-08-02T22:37:45.7957317+05:00;True|2021-08-02T22:34:37.2905589+05:00;True|2021-08-02T22:31:30.3451541+05:00;True|2021-08-02T12:26:02.5496847+05:00;True|2021-08-01T23:12:48.3492831+05:00;True|2021-08-01T22:53:02.2382201+05:00;True|2021-08-01T22:48:16.9658882+05:00;True|2021-08-01T22:40:58.1479436+05:00;True|2021-08-01T22:28:58.9840017+05:00;True|2021-08-01T20:16:20.5210616+05:00;True|2021-08-01T19:27:43.9900600+05:00;True|2021-08-01T19:18:48.8000969+05:00;True|2021-08-01T19:15:19.9257002+05:00;True|2021-08-01T19:08:17.1315589+05:00;True|2021-07-31T20:35:08.9408458+05:00;True|2021-07-31T20:20:29.0886405+05:00;
\ No newline at end of file
diff --git a/ClientCollector/bin/Release/ClientCollector.deps.json b/ClientCollector/bin/Release/ClientCollector.deps.json
index 0e92927..6e90178 100644
--- a/ClientCollector/bin/Release/ClientCollector.deps.json
+++ b/ClientCollector/bin/Release/ClientCollector.deps.json
@@ -10,7 +10,8 @@
"dependencies": {
"DataClient": "0.0.3",
"NLog": "4.7.10",
- "Newtonsoft.Json": "13.0.1"
+ "Newtonsoft.Json": "13.0.1",
+ "SharpZipLib": "1.3.2"
},
"runtime": {
"ClientCollector.dll": {}
@@ -117,6 +118,14 @@
}
}
},
+ "SharpZipLib/1.3.2": {
+ "runtime": {
+ "lib/netstandard2.1/ICSharpCode.SharpZipLib.dll": {
+ "assemblyVersion": "1.3.2.10",
+ "fileVersion": "1.3.2.10"
+ }
+ }
+ },
"DataClient/0.0.3": {
"dependencies": {
"NLog": "4.7.10",
@@ -205,6 +214,13 @@
"path": "nlog.extensions.logging/1.7.2",
"hashPath": "nlog.extensions.logging.1.7.2.nupkg.sha512"
},
+ "SharpZipLib/1.3.2": {
+ "type": "package",
+ "serviceable": true,
+ "sha512": "sha512-WSdeDReL8eugMCw5BH/tFAZpgR+YsYMwm6kIvqg3J8LbfRjbbebmEzn63AbEveqyMOljBO68g6tCCv165wMkSg==",
+ "path": "sharpziplib/1.3.2",
+ "hashPath": "sharpziplib.1.3.2.nupkg.sha512"
+ },
"DataClient/0.0.3": {
"type": "project",
"serviceable": false,
diff --git a/ClientCollector/bin/Release/ClientCollector.dll b/ClientCollector/bin/Release/ClientCollector.dll
index cc2116e..81c7a77 100644
Binary files a/ClientCollector/bin/Release/ClientCollector.dll and b/ClientCollector/bin/Release/ClientCollector.dll differ
diff --git a/ClientCollector/bin/Release/ClientCollector.pdb b/ClientCollector/bin/Release/ClientCollector.pdb
index d5b7995..e5b95f7 100644
Binary files a/ClientCollector/bin/Release/ClientCollector.pdb and b/ClientCollector/bin/Release/ClientCollector.pdb differ
diff --git a/ClientCollector/bin/Release/ICSharpCode.SharpZipLib.dll b/ClientCollector/bin/Release/ICSharpCode.SharpZipLib.dll
new file mode 100644
index 0000000..f811490
Binary files /dev/null and b/ClientCollector/bin/Release/ICSharpCode.SharpZipLib.dll differ
diff --git a/ClientCollector/bin/Release/net5.0/ClientCollector.deps.json b/ClientCollector/bin/Release/net5.0/ClientCollector.deps.json
index 0e92927..6e90178 100644
--- a/ClientCollector/bin/Release/net5.0/ClientCollector.deps.json
+++ b/ClientCollector/bin/Release/net5.0/ClientCollector.deps.json
@@ -10,7 +10,8 @@
"dependencies": {
"DataClient": "0.0.3",
"NLog": "4.7.10",
- "Newtonsoft.Json": "13.0.1"
+ "Newtonsoft.Json": "13.0.1",
+ "SharpZipLib": "1.3.2"
},
"runtime": {
"ClientCollector.dll": {}
@@ -117,6 +118,14 @@
}
}
},
+ "SharpZipLib/1.3.2": {
+ "runtime": {
+ "lib/netstandard2.1/ICSharpCode.SharpZipLib.dll": {
+ "assemblyVersion": "1.3.2.10",
+ "fileVersion": "1.3.2.10"
+ }
+ }
+ },
"DataClient/0.0.3": {
"dependencies": {
"NLog": "4.7.10",
@@ -205,6 +214,13 @@
"path": "nlog.extensions.logging/1.7.2",
"hashPath": "nlog.extensions.logging.1.7.2.nupkg.sha512"
},
+ "SharpZipLib/1.3.2": {
+ "type": "package",
+ "serviceable": true,
+ "sha512": "sha512-WSdeDReL8eugMCw5BH/tFAZpgR+YsYMwm6kIvqg3J8LbfRjbbebmEzn63AbEveqyMOljBO68g6tCCv165wMkSg==",
+ "path": "sharpziplib/1.3.2",
+ "hashPath": "sharpziplib.1.3.2.nupkg.sha512"
+ },
"DataClient/0.0.3": {
"type": "project",
"serviceable": false,
diff --git a/ClientCollector/bin/Release/net5.0/ClientCollector.dll b/ClientCollector/bin/Release/net5.0/ClientCollector.dll
index cc2116e..81c7a77 100644
Binary files a/ClientCollector/bin/Release/net5.0/ClientCollector.dll and b/ClientCollector/bin/Release/net5.0/ClientCollector.dll differ
diff --git a/ClientCollector/bin/Release/net5.0/ClientCollector.pdb b/ClientCollector/bin/Release/net5.0/ClientCollector.pdb
index d5b7995..e5b95f7 100644
Binary files a/ClientCollector/bin/Release/net5.0/ClientCollector.pdb and b/ClientCollector/bin/Release/net5.0/ClientCollector.pdb differ
diff --git a/ClientCollector/bin/Release/net5.0/ICSharpCode.SharpZipLib.dll b/ClientCollector/bin/Release/net5.0/ICSharpCode.SharpZipLib.dll
new file mode 100644
index 0000000..f811490
Binary files /dev/null and b/ClientCollector/bin/Release/net5.0/ICSharpCode.SharpZipLib.dll differ
diff --git a/ClientCollector/bin/Release/net5.0/ref/ClientCollector.dll b/ClientCollector/bin/Release/net5.0/ref/ClientCollector.dll
index 9225478..6550de3 100644
Binary files a/ClientCollector/bin/Release/net5.0/ref/ClientCollector.dll and b/ClientCollector/bin/Release/net5.0/ref/ClientCollector.dll differ
diff --git a/ClientCollector/obj/ClientCollector.csproj.nuget.dgspec.json b/ClientCollector/obj/ClientCollector.csproj.nuget.dgspec.json
index c07389c..6d39c2d 100644
--- a/ClientCollector/obj/ClientCollector.csproj.nuget.dgspec.json
+++ b/ClientCollector/obj/ClientCollector.csproj.nuget.dgspec.json
@@ -58,6 +58,10 @@
"Newtonsoft.Json": {
"target": "Package",
"version": "[13.0.1, )"
+ },
+ "SharpZipLib": {
+ "target": "Package",
+ "version": "[1.3.2, )"
}
},
"imports": [
diff --git a/ClientCollector/obj/Debug/net5.0/ClientCollector.assets.cache b/ClientCollector/obj/Debug/net5.0/ClientCollector.assets.cache
index de8a6a4..6cc1d63 100644
Binary files a/ClientCollector/obj/Debug/net5.0/ClientCollector.assets.cache and b/ClientCollector/obj/Debug/net5.0/ClientCollector.assets.cache differ
diff --git a/ClientCollector/obj/Debug/net5.0/ClientCollector.csproj.AssemblyReference.cache b/ClientCollector/obj/Debug/net5.0/ClientCollector.csproj.AssemblyReference.cache
index 43e5cff..3f6f6cb 100644
Binary files a/ClientCollector/obj/Debug/net5.0/ClientCollector.csproj.AssemblyReference.cache and b/ClientCollector/obj/Debug/net5.0/ClientCollector.csproj.AssemblyReference.cache differ
diff --git a/ClientCollector/obj/Release/net5.0/ClientCollector.assets.cache b/ClientCollector/obj/Release/net5.0/ClientCollector.assets.cache
index 347fca8..efe9a2a 100644
Binary files a/ClientCollector/obj/Release/net5.0/ClientCollector.assets.cache and b/ClientCollector/obj/Release/net5.0/ClientCollector.assets.cache differ
diff --git a/ClientCollector/obj/Release/net5.0/ClientCollector.csproj.CoreCompileInputs.cache b/ClientCollector/obj/Release/net5.0/ClientCollector.csproj.CoreCompileInputs.cache
index 28051d6..3d27c44 100644
--- a/ClientCollector/obj/Release/net5.0/ClientCollector.csproj.CoreCompileInputs.cache
+++ b/ClientCollector/obj/Release/net5.0/ClientCollector.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f5ac1b027043c0866452d0818c2e30c594726673
+b8ef049e49398d7019ddc75458087be327b62a97
diff --git a/ClientCollector/obj/Release/net5.0/ClientCollector.csproj.FileListAbsolute.txt b/ClientCollector/obj/Release/net5.0/ClientCollector.csproj.FileListAbsolute.txt
index 687bb22..b7e3a4c 100644
--- a/ClientCollector/obj/Release/net5.0/ClientCollector.csproj.FileListAbsolute.txt
+++ b/ClientCollector/obj/Release/net5.0/ClientCollector.csproj.FileListAbsolute.txt
@@ -60,3 +60,4 @@ F:\GIT\ASCKU_PC\ClientCollector\obj\Release\net5.0\ClientCollector.dll
F:\GIT\ASCKU_PC\ClientCollector\obj\Release\net5.0\ref\ClientCollector.dll
F:\GIT\ASCKU_PC\ClientCollector\obj\Release\net5.0\ClientCollector.pdb
F:\GIT\ASCKU_PC\ClientCollector\obj\Release\net5.0\ClientCollector.genruntimeconfig.cache
+D:\GIT\ASCKU_PC\ClientCollector\bin\Release\net5.0\ICSharpCode.SharpZipLib.dll
diff --git a/ClientCollector/obj/Release/net5.0/ClientCollector.dll b/ClientCollector/obj/Release/net5.0/ClientCollector.dll
index cc2116e..81c7a77 100644
Binary files a/ClientCollector/obj/Release/net5.0/ClientCollector.dll and b/ClientCollector/obj/Release/net5.0/ClientCollector.dll differ
diff --git a/ClientCollector/obj/Release/net5.0/ClientCollector.pdb b/ClientCollector/obj/Release/net5.0/ClientCollector.pdb
index d5b7995..e5b95f7 100644
Binary files a/ClientCollector/obj/Release/net5.0/ClientCollector.pdb and b/ClientCollector/obj/Release/net5.0/ClientCollector.pdb differ
diff --git a/ClientCollector/obj/Release/net5.0/PublishOutputs.0a3c4e7ac1.txt b/ClientCollector/obj/Release/net5.0/PublishOutputs.0a3c4e7ac1.txt
index 776b78b..1aa1f14 100644
--- a/ClientCollector/obj/Release/net5.0/PublishOutputs.0a3c4e7ac1.txt
+++ b/ClientCollector/obj/Release/net5.0/PublishOutputs.0a3c4e7ac1.txt
@@ -15,5 +15,6 @@ D:\GIT\ASCKU_PC\ClientCollector\bin\Release\Microsoft.Extensions.Primitives.dll
D:\GIT\ASCKU_PC\ClientCollector\bin\Release\Newtonsoft.Json.dll
D:\GIT\ASCKU_PC\ClientCollector\bin\Release\NLog.dll
D:\GIT\ASCKU_PC\ClientCollector\bin\Release\NLog.Extensions.Logging.dll
+D:\GIT\ASCKU_PC\ClientCollector\bin\Release\ICSharpCode.SharpZipLib.dll
D:\GIT\ASCKU_PC\ClientCollector\bin\Release\DataClient.dll
D:\GIT\ASCKU_PC\ClientCollector\bin\Release\DataClient.pdb
diff --git a/ClientCollector/obj/Release/net5.0/ref/ClientCollector.dll b/ClientCollector/obj/Release/net5.0/ref/ClientCollector.dll
index 9225478..6550de3 100644
Binary files a/ClientCollector/obj/Release/net5.0/ref/ClientCollector.dll and b/ClientCollector/obj/Release/net5.0/ref/ClientCollector.dll differ
diff --git a/ClientCollector/obj/project.assets.json b/ClientCollector/obj/project.assets.json
index 35a9a2b..23741d4 100644
--- a/ClientCollector/obj/project.assets.json
+++ b/ClientCollector/obj/project.assets.json
@@ -113,6 +113,15 @@
"lib/net5.0/NLog.Extensions.Logging.dll": {}
}
},
+ "SharpZipLib/1.3.2": {
+ "type": "package",
+ "compile": {
+ "lib/netstandard2.1/ICSharpCode.SharpZipLib.dll": {}
+ },
+ "runtime": {
+ "lib/netstandard2.1/ICSharpCode.SharpZipLib.dll": {}
+ }
+ },
"DataClient/0.0.3": {
"type": "project",
"framework": ".NETCoreApp,Version=v5.0",
@@ -367,6 +376,27 @@
"nlog.extensions.logging.nuspec"
]
},
+ "SharpZipLib/1.3.2": {
+ "sha512": "WSdeDReL8eugMCw5BH/tFAZpgR+YsYMwm6kIvqg3J8LbfRjbbebmEzn63AbEveqyMOljBO68g6tCCv165wMkSg==",
+ "type": "package",
+ "path": "sharpziplib/1.3.2",
+ "files": [
+ ".nupkg.metadata",
+ ".signature.p7s",
+ "images/sharpziplib-nuget-256x256.png",
+ "lib/net45/ICSharpCode.SharpZipLib.dll",
+ "lib/net45/ICSharpCode.SharpZipLib.pdb",
+ "lib/net45/ICSharpCode.SharpZipLib.xml",
+ "lib/netstandard2.0/ICSharpCode.SharpZipLib.dll",
+ "lib/netstandard2.0/ICSharpCode.SharpZipLib.pdb",
+ "lib/netstandard2.0/ICSharpCode.SharpZipLib.xml",
+ "lib/netstandard2.1/ICSharpCode.SharpZipLib.dll",
+ "lib/netstandard2.1/ICSharpCode.SharpZipLib.pdb",
+ "lib/netstandard2.1/ICSharpCode.SharpZipLib.xml",
+ "sharpziplib.1.3.2.nupkg.sha512",
+ "sharpziplib.nuspec"
+ ]
+ },
"DataClient/0.0.3": {
"type": "project",
"path": "../DataClient/DataClient.csproj",
@@ -377,7 +407,8 @@
"net5.0": [
"DataClient >= 0.0.3",
"NLog >= 4.7.10",
- "Newtonsoft.Json >= 13.0.1"
+ "Newtonsoft.Json >= 13.0.1",
+ "SharpZipLib >= 1.3.2"
]
},
"packageFolders": {
@@ -440,6 +471,10 @@
"Newtonsoft.Json": {
"target": "Package",
"version": "[13.0.1, )"
+ },
+ "SharpZipLib": {
+ "target": "Package",
+ "version": "[1.3.2, )"
}
},
"imports": [
diff --git a/ClientCollector/obj/project.nuget.cache b/ClientCollector/obj/project.nuget.cache
index fbd02f0..b725eee 100644
--- a/ClientCollector/obj/project.nuget.cache
+++ b/ClientCollector/obj/project.nuget.cache
@@ -1,6 +1,6 @@
{
"version": 2,
- "dgSpecHash": "4epxhxxqM5SAn5/9F6/bGIHXw5/ScXkV3Fnpxx1s5LXd8HLEicu36cn+HzGRnZuZrclSVkG7GSGYyc/b7S5lXA==",
+ "dgSpecHash": "4l57LQEQv639e2VbxIp9WkcTInbDK0EZx777bBv5wjTKDBusTXiAgsFdOFRmSsl+EQmDdrGC6PetLc3CUFikGg==",
"success": true,
"projectFilePath": "D:\\GIT\\ASCKU_PC\\ClientCollector\\ClientCollector.csproj",
"expectedPackageFiles": [
@@ -13,7 +13,8 @@
"C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.primitives\\5.0.0\\microsoft.extensions.primitives.5.0.0.nupkg.sha512",
"C:\\Users\\google\\.nuget\\packages\\newtonsoft.json\\13.0.1\\newtonsoft.json.13.0.1.nupkg.sha512",
"C:\\Users\\google\\.nuget\\packages\\nlog\\4.7.10\\nlog.4.7.10.nupkg.sha512",
- "C:\\Users\\google\\.nuget\\packages\\nlog.extensions.logging\\1.7.2\\nlog.extensions.logging.1.7.2.nupkg.sha512"
+ "C:\\Users\\google\\.nuget\\packages\\nlog.extensions.logging\\1.7.2\\nlog.extensions.logging.1.7.2.nupkg.sha512",
+ "C:\\Users\\google\\.nuget\\packages\\sharpziplib\\1.3.2\\sharpziplib.1.3.2.nupkg.sha512"
],
"logs": []
}
\ No newline at end of file
diff --git a/DataClient/obj/Debug/net5.0/DataClient.csproj.AssemblyReference.cache b/DataClient/obj/Debug/net5.0/DataClient.csproj.AssemblyReference.cache
index f6d27af..562b213 100644
Binary files a/DataClient/obj/Debug/net5.0/DataClient.csproj.AssemblyReference.cache and b/DataClient/obj/Debug/net5.0/DataClient.csproj.AssemblyReference.cache differ
diff --git a/DataClient/obj/Release/net5.0/DataClient.csproj.AssemblyReference.cache b/DataClient/obj/Release/net5.0/DataClient.csproj.AssemblyReference.cache
index f5e894a..f6d27af 100644
Binary files a/DataClient/obj/Release/net5.0/DataClient.csproj.AssemblyReference.cache and b/DataClient/obj/Release/net5.0/DataClient.csproj.AssemblyReference.cache differ
diff --git a/DataClients/obj/Release/netstandard2.0/DataClients.csproj.AssemblyReference.cache b/DataClients/obj/Release/netstandard2.0/DataClients.csproj.AssemblyReference.cache
index c7401a9..24157b3 100644
Binary files a/DataClients/obj/Release/netstandard2.0/DataClients.csproj.AssemblyReference.cache and b/DataClients/obj/Release/netstandard2.0/DataClients.csproj.AssemblyReference.cache differ
diff --git a/Korp90TimePasport/obj/Debug/netcoreapp3.1/Korp90TimePasport.csproj.AssemblyReference.cache b/Korp90TimePasport/obj/Debug/netcoreapp3.1/Korp90TimePasport.csproj.AssemblyReference.cache
index 3726b52..1e74e02 100644
Binary files a/Korp90TimePasport/obj/Debug/netcoreapp3.1/Korp90TimePasport.csproj.AssemblyReference.cache and b/Korp90TimePasport/obj/Debug/netcoreapp3.1/Korp90TimePasport.csproj.AssemblyReference.cache differ
diff --git a/Korp90TimePasport/obj/Release/netcoreapp3.1/Korp90TimePasport.csproj.AssemblyReference.cache b/Korp90TimePasport/obj/Release/netcoreapp3.1/Korp90TimePasport.csproj.AssemblyReference.cache
index 623fb12..2a07442 100644
Binary files a/Korp90TimePasport/obj/Release/netcoreapp3.1/Korp90TimePasport.csproj.AssemblyReference.cache and b/Korp90TimePasport/obj/Release/netcoreapp3.1/Korp90TimePasport.csproj.AssemblyReference.cache differ
diff --git a/Mailing/obj/Release/netcoreapp3.1/Mailing.csproj.AssemblyReference.cache b/Mailing/obj/Release/netcoreapp3.1/Mailing.csproj.AssemblyReference.cache
index 9875e03..741a5c6 100644
Binary files a/Mailing/obj/Release/netcoreapp3.1/Mailing.csproj.AssemblyReference.cache and b/Mailing/obj/Release/netcoreapp3.1/Mailing.csproj.AssemblyReference.cache differ
diff --git a/PrintPDF/MigraDoc.DocumentObjectModel/obj/Release/netstandard2.0/MigraDoc.DocumentObjectModel.csproj.AssemblyReference.cache b/PrintPDF/MigraDoc.DocumentObjectModel/obj/Release/netstandard2.0/MigraDoc.DocumentObjectModel.csproj.AssemblyReference.cache
index 34f4a98..f5e894a 100644
Binary files a/PrintPDF/MigraDoc.DocumentObjectModel/obj/Release/netstandard2.0/MigraDoc.DocumentObjectModel.csproj.AssemblyReference.cache and b/PrintPDF/MigraDoc.DocumentObjectModel/obj/Release/netstandard2.0/MigraDoc.DocumentObjectModel.csproj.AssemblyReference.cache differ
diff --git a/PrintPDF/MigraDoc.Rendering/obj/Debug/netstandard2.0/MigraDoc.Rendering.csproj.AssemblyReference.cache b/PrintPDF/MigraDoc.Rendering/obj/Debug/netstandard2.0/MigraDoc.Rendering.csproj.AssemblyReference.cache
index f5e894a..5d37eaf 100644
Binary files a/PrintPDF/MigraDoc.Rendering/obj/Debug/netstandard2.0/MigraDoc.Rendering.csproj.AssemblyReference.cache and b/PrintPDF/MigraDoc.Rendering/obj/Debug/netstandard2.0/MigraDoc.Rendering.csproj.AssemblyReference.cache differ
diff --git a/PrintPDF/MigraDoc.Rendering/obj/Release/netstandard2.0/MigraDoc.Rendering.csproj.AssemblyReference.cache b/PrintPDF/MigraDoc.Rendering/obj/Release/netstandard2.0/MigraDoc.Rendering.csproj.AssemblyReference.cache
index 9466aeb..f5e894a 100644
Binary files a/PrintPDF/MigraDoc.Rendering/obj/Release/netstandard2.0/MigraDoc.Rendering.csproj.AssemblyReference.cache and b/PrintPDF/MigraDoc.Rendering/obj/Release/netstandard2.0/MigraDoc.Rendering.csproj.AssemblyReference.cache differ
diff --git a/PrintPDF/PdfSharp.Charting/obj/Debug/netstandard2.0/PdfSharp.Charting.csproj.AssemblyReference.cache b/PrintPDF/PdfSharp.Charting/obj/Debug/netstandard2.0/PdfSharp.Charting.csproj.AssemblyReference.cache
index f5e894a..34f4a98 100644
Binary files a/PrintPDF/PdfSharp.Charting/obj/Debug/netstandard2.0/PdfSharp.Charting.csproj.AssemblyReference.cache and b/PrintPDF/PdfSharp.Charting/obj/Debug/netstandard2.0/PdfSharp.Charting.csproj.AssemblyReference.cache differ
diff --git a/PrintPDF/PdfSharp.Charting/obj/Release/netstandard2.0/PdfSharp.Charting.csproj.AssemblyReference.cache b/PrintPDF/PdfSharp.Charting/obj/Release/netstandard2.0/PdfSharp.Charting.csproj.AssemblyReference.cache
index 3392f01..f5e894a 100644
Binary files a/PrintPDF/PdfSharp.Charting/obj/Release/netstandard2.0/PdfSharp.Charting.csproj.AssemblyReference.cache and b/PrintPDF/PdfSharp.Charting/obj/Release/netstandard2.0/PdfSharp.Charting.csproj.AssemblyReference.cache differ
diff --git a/SupportClasses/obj/Debug/netstandard2.0/SupportClasses.csproj.AssemblyReference.cache b/SupportClasses/obj/Debug/netstandard2.0/SupportClasses.csproj.AssemblyReference.cache
index 5d37eaf..f5e894a 100644
Binary files a/SupportClasses/obj/Debug/netstandard2.0/SupportClasses.csproj.AssemblyReference.cache and b/SupportClasses/obj/Debug/netstandard2.0/SupportClasses.csproj.AssemblyReference.cache differ
diff --git a/Test2/obj/Debug/net5.0/Test2.csproj.AssemblyReference.cache b/Test2/obj/Debug/net5.0/Test2.csproj.AssemblyReference.cache
index 9d51140..c7e3b0a 100644
Binary files a/Test2/obj/Debug/net5.0/Test2.csproj.AssemblyReference.cache and b/Test2/obj/Debug/net5.0/Test2.csproj.AssemblyReference.cache differ
diff --git a/Test2/obj/Release/net5.0/Test2.csproj.AssemblyReference.cache b/Test2/obj/Release/net5.0/Test2.csproj.AssemblyReference.cache
index 5867ee4..d035ee5 100644
Binary files a/Test2/obj/Release/net5.0/Test2.csproj.AssemblyReference.cache and b/Test2/obj/Release/net5.0/Test2.csproj.AssemblyReference.cache differ
diff --git a/Tests/obj/Release/netcoreapp3.1/Tests.csproj.AssemblyReference.cache b/Tests/obj/Release/netcoreapp3.1/Tests.csproj.AssemblyReference.cache
index f5e894a..d77387f 100644
Binary files a/Tests/obj/Release/netcoreapp3.1/Tests.csproj.AssemblyReference.cache and b/Tests/obj/Release/netcoreapp3.1/Tests.csproj.AssemblyReference.cache differ
diff --git a/WebApplication1/obj/Release/net5.0/WebApplication1.csproj.AssemblyReference.cache b/WebApplication1/obj/Release/net5.0/WebApplication1.csproj.AssemblyReference.cache
index 5966ae5..f5e894a 100644
Binary files a/WebApplication1/obj/Release/net5.0/WebApplication1.csproj.AssemblyReference.cache and b/WebApplication1/obj/Release/net5.0/WebApplication1.csproj.AssemblyReference.cache differ
diff --git a/test3/obj/Debug/net5.0/test3.csproj.AssemblyReference.cache b/test3/obj/Debug/net5.0/test3.csproj.AssemblyReference.cache
index 90c9e15..d8701cc 100644
Binary files a/test3/obj/Debug/net5.0/test3.csproj.AssemblyReference.cache and b/test3/obj/Debug/net5.0/test3.csproj.AssemblyReference.cache differ
diff --git a/test3/obj/Release/net5.0/test3.csproj.AssemblyReference.cache b/test3/obj/Release/net5.0/test3.csproj.AssemblyReference.cache
index af3d65a..0856088 100644
Binary files a/test3/obj/Release/net5.0/test3.csproj.AssemblyReference.cache and b/test3/obj/Release/net5.0/test3.csproj.AssemblyReference.cache differ