diff --git a/.vs/ASCKU Projects/v16/.suo b/.vs/ASCKU Projects/v16/.suo index 937caae..97d7067 100644 Binary files a/.vs/ASCKU Projects/v16/.suo and b/.vs/ASCKU Projects/v16/.suo differ diff --git a/ApiServer/ApiStruct/Data.cs b/ApiServer/ApiStruct/Data.cs new file mode 100644 index 0000000..fc49acc --- /dev/null +++ b/ApiServer/ApiStruct/Data.cs @@ -0,0 +1,33 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using DataClient.Struct; + +namespace ApiServer.ApiStruct +{ + public class DataCheckApi + { + public bool Status { get; set; } + public DateTime DateAndTime { get; set; } + public string Name { get; set; } + } + public class DataCheckClient + { + public bool Status { get; set; } + public bool Exist { get; set; } + public ulong DataSize { get; set; } + } + public class DataCreateApi + { + public bool Status { get; set; } + public DateTime DateAndTime { get; set; } + public string Name { get; set; } + public byte[] Struct { get; set; } + } + public class DataCreateClient + { + public bool Status { get; set; } + } + +} diff --git a/ApiServer/Controllers/DataController.cs b/ApiServer/Controllers/DataController.cs new file mode 100644 index 0000000..cbbfda2 --- /dev/null +++ b/ApiServer/Controllers/DataController.cs @@ -0,0 +1,86 @@ +using Microsoft.AspNetCore.Mvc; +using NLog; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using ApiServer.ApiStruct; +using Newtonsoft.Json; +using System.IO; + +namespace ApiServer.Controllers +{ + [ApiController, Route("[controller]")] + public class DataController : ControllerBase + { + private Logger log = LogManager.GetCurrentClassLogger(); + [HttpPost, Route("check")] + public DataCheckClient Check([FromBody] object value) + { + try + { + var getResult = JsonConvert.DeserializeObject(value.ToString()); + if (!getResult.Status || string.IsNullOrEmpty(getResult.Name)) + { + log.Warn("Wrong answer."); + return new DataCheckClient(); + } + var dataDir = Path.Combine( + Directory.GetCurrentDirectory(), + "data", "data", + getResult.DateAndTime.Year.ToString("D4"), + getResult.DateAndTime.Month.ToString("D2"), + getResult.DateAndTime.Day.ToString("D2"), + getResult.Name); + log.Info("Search data: " + dataDir); + if (!System.IO.File.Exists(dataDir)) + { + log.Info("Data not exist: " + dataDir); + return new DataCheckClient { Status = true, Exist = false, DataSize = 0 }; + } + var dataArr = System.IO.File.ReadAllBytes(dataDir); + log.Info("Send data size: " + dataArr.Length + " | " + dataDir); + return new DataCheckClient { Status = true, Exist = true, DataSize = (ulong)dataArr.Length }; + } + catch (Exception e) + { + log.Warn(e); + return new DataCheckClient(); + } + } + + [HttpPost, Route("create")] + public DataCreateClient Create([FromBody] object value) + { + try + { + var getResult = JsonConvert.DeserializeObject(value.ToString()); + if (!getResult.Status || + string.IsNullOrEmpty(getResult.Name) || + getResult.Struct.Length == 0) + { + log.Warn("Wrong answer."); + return new DataCreateClient(); + } + var dataDir = Path.Combine( + Directory.GetCurrentDirectory(), + "data", "data", + getResult.DateAndTime.Year.ToString("D4"), + getResult.DateAndTime.Month.ToString("D2"), + getResult.DateAndTime.Day.ToString("D2")); + if (!Directory.Exists(dataDir)) + Directory.CreateDirectory(dataDir); + dataDir = Path.Combine(dataDir, getResult.Name); + System.IO.File.WriteAllBytes(dataDir, getResult.Struct); + log.Info("Save data: " + dataDir); + return new DataCreateClient { Status = true }; + } + catch (Exception e) + { + log.Warn(e); + return new DataCreateClient(); + } + } + + } +} diff --git a/ApiServer/Properties/PublishProfiles/FolderProfile.pubxml.user b/ApiServer/Properties/PublishProfiles/FolderProfile.pubxml.user index a47692e..54f5c96 100644 --- a/ApiServer/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/ApiServer/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -4,7 +4,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. --> - True|2021-08-01T14:33:24.0605718Z;True|2021-08-01T19:29:09.0622642+05:00;True|2021-08-01T16:14:00.2837619+05:00;True|2021-07-31T17:43:14.2797709+05:00;False|2021-07-31T17:41:49.3152422+05:00;True|2021-07-31T14:07:45.4057263+05:00;False|2021-07-31T13:53:38.4952669+05:00; + True|2021-08-02T16:42:10.4757931Z;True|2021-08-01T19:33:24.0605718+05:00;True|2021-08-01T19:29:09.0622642+05:00;True|2021-08-01T16:14:00.2837619+05:00;True|2021-07-31T17:43:14.2797709+05:00;False|2021-07-31T17:41:49.3152422+05:00;True|2021-07-31T14:07:45.4057263+05:00;False|2021-07-31T13:53:38.4952669+05:00; <_PublishTargetUrl>F:\GIT\ASCKU_PC\ApiServer\bin\Release\ \ No newline at end of file diff --git a/ApiServer/bin/Release/ApiServer.dll b/ApiServer/bin/Release/ApiServer.dll index 7ec6389..98c26db 100644 Binary files a/ApiServer/bin/Release/ApiServer.dll and b/ApiServer/bin/Release/ApiServer.dll differ diff --git a/ApiServer/bin/Release/ApiServer.pdb b/ApiServer/bin/Release/ApiServer.pdb index 90dff67..db41e54 100644 Binary files a/ApiServer/bin/Release/ApiServer.pdb and b/ApiServer/bin/Release/ApiServer.pdb differ diff --git a/ApiServer/bin/Release/DataClient.dll b/ApiServer/bin/Release/DataClient.dll index 4e3dc96..9be7a0c 100644 Binary files a/ApiServer/bin/Release/DataClient.dll and b/ApiServer/bin/Release/DataClient.dll differ diff --git a/ApiServer/bin/Release/DataClient.pdb b/ApiServer/bin/Release/DataClient.pdb index 4da4ec6..fcafcb5 100644 Binary files a/ApiServer/bin/Release/DataClient.pdb and b/ApiServer/bin/Release/DataClient.pdb differ diff --git a/ApiServer/bin/Release/net5.0/ApiServer.dll b/ApiServer/bin/Release/net5.0/ApiServer.dll index 7ec6389..98c26db 100644 Binary files a/ApiServer/bin/Release/net5.0/ApiServer.dll and b/ApiServer/bin/Release/net5.0/ApiServer.dll differ diff --git a/ApiServer/bin/Release/net5.0/ApiServer.pdb b/ApiServer/bin/Release/net5.0/ApiServer.pdb index 90dff67..db41e54 100644 Binary files a/ApiServer/bin/Release/net5.0/ApiServer.pdb and b/ApiServer/bin/Release/net5.0/ApiServer.pdb differ diff --git a/ApiServer/bin/Release/net5.0/DataClient.dll b/ApiServer/bin/Release/net5.0/DataClient.dll index 4e3dc96..9be7a0c 100644 Binary files a/ApiServer/bin/Release/net5.0/DataClient.dll and b/ApiServer/bin/Release/net5.0/DataClient.dll differ diff --git a/ApiServer/bin/Release/net5.0/DataClient.pdb b/ApiServer/bin/Release/net5.0/DataClient.pdb index 4da4ec6..fcafcb5 100644 Binary files a/ApiServer/bin/Release/net5.0/DataClient.pdb and b/ApiServer/bin/Release/net5.0/DataClient.pdb differ diff --git a/ApiServer/bin/Release/net5.0/ref/ApiServer.dll b/ApiServer/bin/Release/net5.0/ref/ApiServer.dll index 9fd470a..0ae31f9 100644 Binary files a/ApiServer/bin/Release/net5.0/ref/ApiServer.dll and b/ApiServer/bin/Release/net5.0/ref/ApiServer.dll differ diff --git a/ApiServer/obj/Debug/net5.0/ApiServer.csproj.AssemblyReference.cache b/ApiServer/obj/Debug/net5.0/ApiServer.csproj.AssemblyReference.cache index 15b2844..bd3102d 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 becad07..46cf44d 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/ApiServer/obj/Release/net5.0/ApiServer.csproj.CoreCompileInputs.cache b/ApiServer/obj/Release/net5.0/ApiServer.csproj.CoreCompileInputs.cache index f7eb24a..02713a0 100644 --- a/ApiServer/obj/Release/net5.0/ApiServer.csproj.CoreCompileInputs.cache +++ b/ApiServer/obj/Release/net5.0/ApiServer.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d29ca1fc6ac51c211fa6b3f4cdcf6f83a5b03d11 +0ba5eb43d3c8baaf93d0a30f42372f5107b7f4d6 diff --git a/ApiServer/obj/Release/net5.0/ApiServer.dll b/ApiServer/obj/Release/net5.0/ApiServer.dll index 7ec6389..98c26db 100644 Binary files a/ApiServer/obj/Release/net5.0/ApiServer.dll and b/ApiServer/obj/Release/net5.0/ApiServer.dll differ diff --git a/ApiServer/obj/Release/net5.0/ApiServer.pdb b/ApiServer/obj/Release/net5.0/ApiServer.pdb index 90dff67..db41e54 100644 Binary files a/ApiServer/obj/Release/net5.0/ApiServer.pdb and b/ApiServer/obj/Release/net5.0/ApiServer.pdb differ diff --git a/ApiServer/obj/Release/net5.0/PubTmp/Out/ApiServer.dll b/ApiServer/obj/Release/net5.0/PubTmp/Out/ApiServer.dll index 7ec6389..98c26db 100644 Binary files a/ApiServer/obj/Release/net5.0/PubTmp/Out/ApiServer.dll and b/ApiServer/obj/Release/net5.0/PubTmp/Out/ApiServer.dll differ diff --git a/ApiServer/obj/Release/net5.0/PubTmp/Out/ApiServer.pdb b/ApiServer/obj/Release/net5.0/PubTmp/Out/ApiServer.pdb index 90dff67..db41e54 100644 Binary files a/ApiServer/obj/Release/net5.0/PubTmp/Out/ApiServer.pdb and b/ApiServer/obj/Release/net5.0/PubTmp/Out/ApiServer.pdb differ diff --git a/ApiServer/obj/Release/net5.0/PubTmp/Out/DataClient.dll b/ApiServer/obj/Release/net5.0/PubTmp/Out/DataClient.dll index 4e3dc96..9be7a0c 100644 Binary files a/ApiServer/obj/Release/net5.0/PubTmp/Out/DataClient.dll and b/ApiServer/obj/Release/net5.0/PubTmp/Out/DataClient.dll differ diff --git a/ApiServer/obj/Release/net5.0/PubTmp/Out/DataClient.pdb b/ApiServer/obj/Release/net5.0/PubTmp/Out/DataClient.pdb index 4da4ec6..fcafcb5 100644 Binary files a/ApiServer/obj/Release/net5.0/PubTmp/Out/DataClient.pdb and b/ApiServer/obj/Release/net5.0/PubTmp/Out/DataClient.pdb differ diff --git a/ApiServer/obj/Release/net5.0/ref/ApiServer.dll b/ApiServer/obj/Release/net5.0/ref/ApiServer.dll index 9fd470a..0ae31f9 100644 Binary files a/ApiServer/obj/Release/net5.0/ref/ApiServer.dll and b/ApiServer/obj/Release/net5.0/ref/ApiServer.dll differ diff --git a/ClientCollector/Data.cs b/ClientCollector/Data.cs new file mode 100644 index 0000000..fc49acc --- /dev/null +++ b/ClientCollector/Data.cs @@ -0,0 +1,33 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using DataClient.Struct; + +namespace ApiServer.ApiStruct +{ + public class DataCheckApi + { + public bool Status { get; set; } + public DateTime DateAndTime { get; set; } + public string Name { get; set; } + } + public class DataCheckClient + { + public bool Status { get; set; } + public bool Exist { get; set; } + public ulong DataSize { get; set; } + } + public class DataCreateApi + { + public bool Status { get; set; } + public DateTime DateAndTime { get; set; } + public string Name { get; set; } + public byte[] Struct { get; set; } + } + public class DataCreateClient + { + public bool Status { get; set; } + } + +} diff --git a/ClientCollector/Program.cs b/ClientCollector/Program.cs index a28ed25..26e894d 100644 --- a/ClientCollector/Program.cs +++ b/ClientCollector/Program.cs @@ -14,6 +14,7 @@ using Newtonsoft.Json; using System.Text; using System.IO; using System.Collections.Generic; +using System.Diagnostics; namespace ClientCollector { @@ -26,27 +27,36 @@ namespace ClientCollector LogConf(); log.Info("Start Client Collector."); Task taskPasp = null; + Task taskData = null; + while (true) { if (taskPasp == null || taskPasp.IsCompleted) { log.Info("Start Pasport Task."); - taskPasp = Task.Run(WorkPasport); + taskPasp = WorkPasport(); + } + if (taskData == null || taskData.IsCompleted) + { + log.Info("Start Data Task."); + taskData = WorkData(); } log.Info("Wait tasks."); - Task.WaitAny(new Task[] { taskPasp }); + Task.WaitAny(new Task[] { taskPasp, taskData }); } } - static async void WorkPasport() + static async Task WorkPasport() { + await Task.Delay(1000); var IpSTP = "10.10.45.152"; var PortSTP = 1070; var nameCurrDate = "pasport"; var currDate = GetCurrData(nameCurrDate); if (!currDate.HasValue) - currDate = new DateTime(2001, 01, 01); + currDate = new DateTime(2001, 02, 01); NETClient netClient = new NETClient(IpSTP, PortSTP); + var flagcycle = false; while (currDate.Value < DateTime.Now.AddDays(-1)) { try @@ -56,14 +66,17 @@ namespace ClientCollector currDate.Value.Month.ToString("D2") + '/' + currDate.Value.Day.ToString("D2"); log.Info("Get pasports from: " + currDir); - while (!netClient.Connected()) - if (!netClient.Connect()) + while (!netClient.Connected() || flagcycle) + { + flagcycle = false; + if (!netClient.ReConnect()) { netClient.Close(); netClient = new NETClient(IpSTP, PortSTP); log.Warn("Can't connect to STP."); await Task.Delay(10000); } + } var currPasports = netClient.Full_Dir_Browse(currDir); netClient.Close(); if (currPasports == null) @@ -75,20 +88,25 @@ namespace ClientCollector try { log.Info("Get pasport: " + paspDir); - while (!netClient.Connected()) - if (!netClient.Connect()) + while (!netClient.Connected() || flagcycle) + { + flagcycle = false; + if (!netClient.ReConnect()) { log.Warn("Can't connect to STP."); netClient.Close(); netClient = new NETClient(IpSTP, PortSTP); await Task.Delay(10000); } + } var pasp = netClient.Full_Pasp_Download(paspDir); netClient.Close(); if (pasp == null || !pasp.HasData) { log.Warn("Can't get pasport."); + netClient.Close(); netClient = new NETClient(IpSTP, PortSTP); + flagcycle = true; await Task.Delay(10000); continue; } @@ -102,6 +120,8 @@ namespace ClientCollector catch (Exception e) { log.Warn(e.Message); + netClient.Close(); + flagcycle = true; await Task.Delay(5000); } } @@ -110,11 +130,14 @@ namespace ClientCollector log.Info("End day: " + currDir); SaveCurrData(nameCurrDate, currDate.Value); currDate = currDate.Value.AddDays(1); - await Task.Delay(60000); + await Task.Delay(5000); } catch (Exception e) { log.Warn(e.Message); + flagcycle = true; + netClient.Close(); + netClient = new NETClient(IpSTP, PortSTP); await Task.Delay(1000 * 60 * 5); } } @@ -123,28 +146,166 @@ namespace ClientCollector log.Info("Wait next day."); await Task.Delay(1000 * 60 * 60); } while (!(currDate.Value < DateTime.Now.AddDays(-1))); - currDate.Value.AddMonths(-1); + currDate.Value.AddDays(-15); SaveCurrData(nameCurrDate, currDate.Value); } + static async Task WorkData() + { + await Task.Delay(1000); + var IpSTP = "10.10.45.152"; + var PortSTP = 1070; + NETClient netClient = new NETClient(IpSTP, PortSTP); + var mainDir = Path.Combine(Directory.GetCurrentDirectory(), "archive"); + var nameCurrDate = "data"; + var currDate = GetCurrData(nameCurrDate); + if (!currDate.HasValue) + currDate = new DateTime(2001, 02, 01); + var flagcycle = false; + while (currDate.Value < DateTime.Now.AddDays(-1)) + { + try + { + while(DateTime.Now.Hour < 12) + { + log.Info("Await 12:00."); + await Task.Delay(15000 * 60); + } + log.Info("Connect to archive."); + await CreateConnectionNFS(mainDir); + var subDir = Path.Combine(mainDir, "data", + currDate.Value.Year.ToString("D4"), + currDate.Value.Month.ToString("D2"), + currDate.Value.Day.ToString("D2")); + log.Info("Check dir: " + subDir); + if (Directory.Exists(subDir)) + { + var listFiles = Directory.GetFiles(subDir); + foreach(var fileDir in listFiles) + { + log.Info("Get file: " + fileDir); + var fileStruct = File.ReadAllBytes(fileDir); + log.Info("Send file to API: " + fileDir); + while (!SendData(currDate.Value, Path.GetFileName(fileDir), fileStruct)) + { + log.Warn("Can't send data to API."); + await Task.Delay(10000); + } + } + } + log.Info("End day: " + subDir); + SaveCurrData(nameCurrDate, currDate.Value); + currDate = currDate.Value.AddDays(1); + await Task.Delay(5000); + } + catch (Exception e) + { + log.Warn(e.Message); + } + } + do + { + log.Info("Wait next day."); + await Task.Delay(1000 * 60 * 60); + } while (!(currDate.Value < DateTime.Now.AddDays(-1))); + currDate.Value.AddDays(-15); + SaveCurrData(nameCurrDate, currDate.Value); + } + + static async Task CreateConnectionNFS(string dir) + { + var dirCreated = false; + while (!dirCreated) + { + try + { + dirCreated = Directory.Exists(Path.Combine(dir)); + if (!dirCreated) Directory.CreateDirectory(dir); + } + catch (Exception e) + { + log.Warn(e.Message); + log.Warn("Can't create directory"); + await Task.Delay(60000); + } + } + var connected = false; + while (!connected) + { + try + { + var procD = new Process + { + StartInfo = new ProcessStartInfo + { + FileName = "/usr/bin/umount", + Arguments = dir, + UseShellExecute = false, + RedirectStandardError = true, + RedirectStandardOutput = true, + } + }; + var procC = new Process + { + StartInfo = new ProcessStartInfo + { + FileName = "/usr/bin/mount", + Arguments = "-t nfs 10.10.45.236:/archiv " + dir, + UseShellExecute = false, + RedirectStandardError = true, + RedirectStandardOutput = true, + }, + }; + if (!procC.Start()) + { + log.Warn("Can't start mount command."); + await Task.Delay(60000); + continue; + } + var answer = procC.StandardError.ReadToEnd() + procC.StandardOutput.ReadToEnd(); + connected = string.IsNullOrEmpty(answer); + if (connected) + { + log.Info("Connect Success"); + continue; + } + else log.Info(answer); + + if (!procD.Start()) + { + log.Warn("Can't start umount command."); + await Task.Delay(60000); + continue; + } + answer = procC.StandardError.ReadToEnd() + procC.StandardOutput.ReadToEnd(); + log.Info(string.IsNullOrEmpty(answer) ? "NFS disconnected." : answer); + } + catch (Exception e) + { + log.Warn(e.Message); + log.Warn("Can't connect to NFS."); + await Task.Delay(60000); + } + } + } + + static HttpWebRequest GetRequest(string path, bool useProxy = true) + { + HttpWebRequest clientReq = (HttpWebRequest)WebRequest.Create(path); + clientReq.Method = "POST"; + clientReq.ContentType = "application/json; charset=utf-8"; + if (useProxy) + { + clientReq.Proxy = new WebProxy("194.226.128.245", 3128) + { + BypassProxyOnLocal = false, + Credentials = new NetworkCredential("user4", "user4") + }; + } + return clientReq; + } static bool SendPasport(Pasport pasp) { - HttpWebRequest GetRequest(string path, bool useProxy = true) - { - HttpWebRequest clientReq = (HttpWebRequest)WebRequest.Create(path); - clientReq.Method = "POST"; - clientReq.ContentType = "application/json; charset=utf-8"; - if (useProxy) - { - clientReq.Proxy = new WebProxy("194.226.128.245", 3128) - { - BypassProxyOnLocal = false, - Credentials = new NetworkCredential("user4", "user4") - }; - } - return clientReq; - } - try { { @@ -222,7 +383,83 @@ namespace ClientCollector return false; } } + static bool SendData(DateTime dateAndTime, string fileName, byte[] fileStruct) + { + try + { + { + log.Info("Check data on remote API server."); + var req = JsonConvert.SerializeObject( + new DataCheckApi() + { + Status = true, + DateAndTime = dateAndTime, + Name = fileName + }); + var reqArr = Encoding.UTF8.GetBytes(req); + HttpWebRequest clientReq = GetRequest("https://vsmpo.mbucb.ru/api/data/check"); + clientReq.ContentLength = reqArr.Length; + using (var stream = clientReq.GetRequestStream()) + { + stream.Write(reqArr, 0, reqArr.Length); + } + string response = ""; + using (var clientRes = (HttpWebResponse)clientReq.GetResponse()) + { + using (var readStream = new StreamReader(clientRes.GetResponseStream(), Encoding.UTF8)) + { + response = readStream.ReadToEnd(); + readStream.Close(); + clientRes.Close(); + } + } + var rep = JsonConvert.DeserializeObject(response); + if (!rep.Status) return false; + if (rep.Exist && rep.DataSize == (ulong)fileStruct.Length) return true; + if (!rep.Exist) + log.Info("API: Data not exist."); + if (rep.Exist && rep.DataSize != (ulong)fileStruct.Length) + log.Info("API: Wrong size data."); + } + { + log.Info("Send data to remote API server."); + var req = JsonConvert.SerializeObject( + new DataCreateApi() + { + Status = true, + DateAndTime = dateAndTime, + Name = fileName, + Struct = fileStruct + }); + var reqArr = Encoding.UTF8.GetBytes(req); + HttpWebRequest clientReq = GetRequest("https://vsmpo.mbucb.ru/api/data/create"); + clientReq.ContentLength = reqArr.Length; + using (var stream = clientReq.GetRequestStream()) + { + stream.Write(reqArr, 0, reqArr.Length); + } + string response = ""; + using (var clientRes = (HttpWebResponse)clientReq.GetResponse()) + { + using (var readStream = new StreamReader(clientRes.GetResponseStream(), Encoding.UTF8)) + { + response = readStream.ReadToEnd(); + readStream.Close(); + clientRes.Close(); + } + } + var rep = JsonConvert.DeserializeObject(response); + if (!rep.Status) return false; + } + return true; + } + catch (Exception e) + { + log.Warn(e.Message); + return false; + } + } static void LogConf() { var conf = new LoggingConfiguration(); diff --git a/ClientCollector/Properties/PublishProfiles/FolderProfile.pubxml.user b/ClientCollector/Properties/PublishProfiles/FolderProfile.pubxml.user index d22c5fa..ddd9907 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-01T17:53:02.2382201Z;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-02T17:58:49.1867297Z;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/Debug/net5.0/ClientCollector.dll b/ClientCollector/bin/Debug/net5.0/ClientCollector.dll index fb2c413..bcca7d6 100644 Binary files a/ClientCollector/bin/Debug/net5.0/ClientCollector.dll and b/ClientCollector/bin/Debug/net5.0/ClientCollector.dll differ diff --git a/ClientCollector/bin/Debug/net5.0/ClientCollector.pdb b/ClientCollector/bin/Debug/net5.0/ClientCollector.pdb index aa5324b..5e89f2b 100644 Binary files a/ClientCollector/bin/Debug/net5.0/ClientCollector.pdb and b/ClientCollector/bin/Debug/net5.0/ClientCollector.pdb differ diff --git a/ClientCollector/bin/Debug/net5.0/ref/ClientCollector.dll b/ClientCollector/bin/Debug/net5.0/ref/ClientCollector.dll index a1a0689..978ce95 100644 Binary files a/ClientCollector/bin/Debug/net5.0/ref/ClientCollector.dll and b/ClientCollector/bin/Debug/net5.0/ref/ClientCollector.dll differ diff --git a/ClientCollector/bin/Release/ClientCollector.dll b/ClientCollector/bin/Release/ClientCollector.dll index 0d45dd8..aec176f 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 2f073ec..371317e 100644 Binary files a/ClientCollector/bin/Release/ClientCollector.pdb and b/ClientCollector/bin/Release/ClientCollector.pdb differ diff --git a/ClientCollector/bin/Release/DataClient.dll b/ClientCollector/bin/Release/DataClient.dll index 4e3dc96..9be7a0c 100644 Binary files a/ClientCollector/bin/Release/DataClient.dll and b/ClientCollector/bin/Release/DataClient.dll differ diff --git a/ClientCollector/bin/Release/DataClient.pdb b/ClientCollector/bin/Release/DataClient.pdb index 4da4ec6..fcafcb5 100644 Binary files a/ClientCollector/bin/Release/DataClient.pdb and b/ClientCollector/bin/Release/DataClient.pdb differ diff --git a/ClientCollector/bin/Release/net5.0/ClientCollector.dll b/ClientCollector/bin/Release/net5.0/ClientCollector.dll index 0d45dd8..aec176f 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 2f073ec..371317e 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/DataClient.dll b/ClientCollector/bin/Release/net5.0/DataClient.dll index 4e3dc96..9be7a0c 100644 Binary files a/ClientCollector/bin/Release/net5.0/DataClient.dll and b/ClientCollector/bin/Release/net5.0/DataClient.dll differ diff --git a/ClientCollector/bin/Release/net5.0/DataClient.pdb b/ClientCollector/bin/Release/net5.0/DataClient.pdb index 4da4ec6..fcafcb5 100644 Binary files a/ClientCollector/bin/Release/net5.0/DataClient.pdb and b/ClientCollector/bin/Release/net5.0/DataClient.pdb differ diff --git a/ClientCollector/bin/Release/net5.0/ref/ClientCollector.dll b/ClientCollector/bin/Release/net5.0/ref/ClientCollector.dll index b53fbcf..438f38f 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/Debug/net5.0/ClientCollector.csproj.AssemblyReference.cache b/ClientCollector/obj/Debug/net5.0/ClientCollector.csproj.AssemblyReference.cache index 3698696..093d8f9 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/Debug/net5.0/ClientCollector.dll b/ClientCollector/obj/Debug/net5.0/ClientCollector.dll index fb2c413..bcca7d6 100644 Binary files a/ClientCollector/obj/Debug/net5.0/ClientCollector.dll and b/ClientCollector/obj/Debug/net5.0/ClientCollector.dll differ diff --git a/ClientCollector/obj/Debug/net5.0/ClientCollector.pdb b/ClientCollector/obj/Debug/net5.0/ClientCollector.pdb index aa5324b..5e89f2b 100644 Binary files a/ClientCollector/obj/Debug/net5.0/ClientCollector.pdb and b/ClientCollector/obj/Debug/net5.0/ClientCollector.pdb differ diff --git a/ClientCollector/obj/Debug/net5.0/ref/ClientCollector.dll b/ClientCollector/obj/Debug/net5.0/ref/ClientCollector.dll index a1a0689..978ce95 100644 Binary files a/ClientCollector/obj/Debug/net5.0/ref/ClientCollector.dll and b/ClientCollector/obj/Debug/net5.0/ref/ClientCollector.dll differ diff --git a/ClientCollector/obj/Release/net5.0/ClientCollector.csproj.CoreCompileInputs.cache b/ClientCollector/obj/Release/net5.0/ClientCollector.csproj.CoreCompileInputs.cache index 9237baf..9d016bc 100644 --- a/ClientCollector/obj/Release/net5.0/ClientCollector.csproj.CoreCompileInputs.cache +++ b/ClientCollector/obj/Release/net5.0/ClientCollector.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -5e9419778287ec5b4cc0bdffcb19831a1be63478 +ab788a0c45ec070b599653ff0cff4d13aa37f97d diff --git a/ClientCollector/obj/Release/net5.0/ClientCollector.dll b/ClientCollector/obj/Release/net5.0/ClientCollector.dll index 0d45dd8..aec176f 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 2f073ec..371317e 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/ref/ClientCollector.dll b/ClientCollector/obj/Release/net5.0/ref/ClientCollector.dll index b53fbcf..438f38f 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/DataClient/NETClient.cs b/DataClient/NETClient.cs index 918a84f..cb67b0b 100644 --- a/DataClient/NETClient.cs +++ b/DataClient/NETClient.cs @@ -317,6 +317,15 @@ namespace DataClient catch { return false; } return Connected(); } + public bool ReConnect() + { + if (tcpC != null && tcpC.Connected) + tcpC.Close(); + tcpC = new TcpClient(); + try { tcpC.Connect(new IPEndPoint(IPAddress.Parse(ip), port)); } + catch { return false; } + return Connected(); + } /// public bool Connected() { return (tcpC != null && tcpC.Connected); } /// diff --git a/DataClient/bin/Release/net5.0/DataClient.dll b/DataClient/bin/Release/net5.0/DataClient.dll index 4e3dc96..9be7a0c 100644 Binary files a/DataClient/bin/Release/net5.0/DataClient.dll 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 index 4da4ec6..fcafcb5 100644 Binary files a/DataClient/bin/Release/net5.0/DataClient.pdb 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 index 6d7d1d2..13922b3 100644 Binary files a/DataClient/bin/Release/net5.0/ref/DataClient.dll and b/DataClient/bin/Release/net5.0/ref/DataClient.dll differ diff --git a/DataClient/obj/Debug/net5.0/DataClient.csproj.AssemblyReference.cache b/DataClient/obj/Debug/net5.0/DataClient.csproj.AssemblyReference.cache index 9a8b63a..fcb89c0 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.dll b/DataClient/obj/Release/net5.0/DataClient.dll index 4e3dc96..9be7a0c 100644 Binary files a/DataClient/obj/Release/net5.0/DataClient.dll 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 index 4da4ec6..fcafcb5 100644 Binary files a/DataClient/obj/Release/net5.0/DataClient.pdb 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 index 6d7d1d2..13922b3 100644 Binary files a/DataClient/obj/Release/net5.0/ref/DataClient.dll and b/DataClient/obj/Release/net5.0/ref/DataClient.dll differ diff --git a/Korp90TimePasport/obj/Debug/netcoreapp3.1/Korp90TimePasport.csproj.AssemblyReference.cache b/Korp90TimePasport/obj/Debug/netcoreapp3.1/Korp90TimePasport.csproj.AssemblyReference.cache index ec4bf63..fa6c25a 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 bd6b570..cf83b4c 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/Debug/netcoreapp3.1/Mailing.csproj.AssemblyReference.cache b/Mailing/obj/Debug/netcoreapp3.1/Mailing.csproj.AssemblyReference.cache index 55f42fd..f5e894a 100644 Binary files a/Mailing/obj/Debug/netcoreapp3.1/Mailing.csproj.AssemblyReference.cache and b/Mailing/obj/Debug/netcoreapp3.1/Mailing.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 2ce2219..8b013be 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.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..7b3034d 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/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 9846b9c..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/Test2/obj/Release/net5.0/Test2.csproj.AssemblyReference.cache b/Test2/obj/Release/net5.0/Test2.csproj.AssemblyReference.cache index 9a8b63a..d77fb70 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..86ebe25 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/Debug/net5.0/WebApplication1.csproj.AssemblyReference.cache b/WebApplication1/obj/Debug/net5.0/WebApplication1.csproj.AssemblyReference.cache index a475988..f5e894a 100644 Binary files a/WebApplication1/obj/Debug/net5.0/WebApplication1.csproj.AssemblyReference.cache and b/WebApplication1/obj/Debug/net5.0/WebApplication1.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 3faf0de..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/Program.cs b/test3/Program.cs index 197cd41..12ce074 100644 --- a/test3/Program.cs +++ b/test3/Program.cs @@ -4,6 +4,8 @@ using NLog.Config; using NLog.Targets; using System; using System.Collections.Generic; +using System.Diagnostics; +using System.IO; using System.Threading; using System.Threading.Tasks; @@ -15,6 +17,92 @@ namespace test3 static Logger log = LogManager.GetCurrentClassLogger(); static void Main(string[] args) { + var dconn = false; + var conn = false; + foreach(var arg in args) + { + if(int.TryParse(arg, out int a)) + { + if (a == 1) + dconn = true; + if (a == 2) + conn = true; + } + } + if (dconn) + { + var proc = new Process + { + StartInfo = new ProcessStartInfo + { + FileName = "/usr/bin/umount", + Arguments = "/archive_rmt/", + UseShellExecute = false, + RedirectStandardError = true, + RedirectStandardOutput = true, + } + }; + while (true) + { + if (!proc.Start()) + { + Console.WriteLine("Can't Disconnect."); + Task.Delay(5000).Wait(); + continue; + } + var answer = proc.StandardError.ReadToEnd() + proc.StandardOutput.ReadToEnd(); + if (string.IsNullOrEmpty(answer)) + { + Console.WriteLine("Disconnect success."); + break; + } + if (answer.Contains("not mounted")) + { + Console.WriteLine("Already dosconnect."); + break; + } + break; + } + } + if(conn) + { + var proc = new Process + { + StartInfo = new ProcessStartInfo + { + FileName = "/usr/bin/mount", + Arguments = "-t nfs 10.10.45.236:/archiv /archive_rmt/", + UseShellExecute = false, + RedirectStandardError = true, + RedirectStandardOutput = true, + }, + }; + while (true) + { + if (!proc.Start()) + { + Console.WriteLine("Can't Disconnect."); + Task.Delay(5000).Wait(); + continue; + } + var answer = proc.StandardError.ReadToEnd() + proc.StandardOutput.ReadToEnd(); + if (string.IsNullOrEmpty(answer)) + { + Console.WriteLine("Connect success."); + break; + } + if (answer.Contains("busy or already mounted")) + { + Console.WriteLine("Busy dir or already mounted."); + break; + } + break; + } + } + } + + static void Tasks() + { LogConf(); Test1(); Console.ReadKey(); @@ -41,7 +129,6 @@ namespace test3 Console.ReadKey(); } - static void LogConf() { var conf = new LoggingConfiguration(); diff --git a/test3/Properties/PublishProfiles/FolderProfile.pubxml.user b/test3/Properties/PublishProfiles/FolderProfile.pubxml.user index ed43aeb..800682c 100644 --- a/test3/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/test3/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -4,6 +4,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121. --> - True|2021-07-09T08:26:04.0054456Z; + True|2021-08-02T13:47:15.2680386Z;True|2021-08-02T18:37:02.6273387+05:00;True|2021-08-02T18:29:32.8259488+05:00;True|2021-08-02T14:01:44.3772955+05:00;True|2021-08-02T13:59:09.7953609+05:00;True|2021-08-02T13:56:29.9486596+05:00;True|2021-08-02T13:53:13.8764442+05:00;True|2021-07-09T13:26:04.0054456+05:00; \ No newline at end of file diff --git a/test3/bin/Release/net5.0/Config/analog/default.json b/test3/bin/Release/net5.0/Config/analog/default.json new file mode 100644 index 0000000..d096f0e --- /dev/null +++ b/test3/bin/Release/net5.0/Config/analog/default.json @@ -0,0 +1,368 @@ +{ + "deleteAll": true, + "delete": [], + "add": [ + { + "id": 0, + "name": "Òîê äóãè", + "sname": "I ä", + "measure": "êÀ", + "mul": 0.1, + "byteId": [ 0, 1 ] + }, + { + "id": 1, + "name": "Íàïðÿæåíèå äóãè", + "sname": "U ä", + "measure": "Â", + "mul": 0.1, + "byteId": [ 2, 3 ] + }, + { + "id": 2, + "name": "Òîê ðàáî÷åãî äâèãàòåëÿ", + "sname": "I ðä", + "measure": "À", + "mul": 0.1, + "byteId": [4,5] + }, + { + "id": 3, + "name": "U ðàáî÷åãî äâèãàòåëÿ", + "sname": "U ðä", + "measure": "Â", + "mul": 0.1, + "byteId": [6,7] + }, + { + "id": 4, + "name": "Òîê ñîëåíîèäà", + "sname": "I ñîë", + "measure": "À", + "mul": 0.1, + "byteId": [8,9] + }, + { + "id": 5, + "name": "U ñîëåíîèäà", + "sname": "U ñîë", + "measure": "Â", + "mul": 0.1, + "byteId": [10,11] + }, + { + "id": 6, + "name": "Òîê çàäàíèÿ", + "sname": "I ðç", + "measure": "êÀ", + "mul": 0.1, + "byteId": [12,13] + }, + { + "id": 7, + "name": "t êðèñòàëëèçàòîðà íà âõîäå", + "sname": "t êð.âûõ", + "measure": "ãð.Ñ", + "byteId": [14,15] + }, + { + "id": 8, + "name": "t êðèñòàëëèçàòîðà íà âûõîäå", + "sname": "t êð.âõ", + "measure": "ãð.Ñ", + "byteId": [16,17] + }, + { + "id": 9, + "name": "t âàêóóì-êàìåðû", + "sname": "t âàê-êàì", + "measure": "ãð.Ñ", + "byteId": [18,19] + }, + { + "id": 10, + "name": "t øòîêà", + "sname": "t øò", + "measure": "ãð.Ñ", + "byteId": [20,21] + }, + { + "id": 11, + "name": "Ïåðåìåùåíèå 0.1", + "sname": "S øò", + "measure": "ìì", + "mul": 0.1, + "byteId": [22,23] + }, + { + "id": 12, + "name": "Ïåðåìåùåíèå", + "sname": "S øò", + "measure": "ìì", + "byteId": [24,25] + }, + { + "id": 13, + "name": "Îñòàòî÷íîå äàâëåíèå", + "measure": "ìêì.ðò.ñò", + "mul": -1, + "byteId": [26,27] + }, + { + "id": 14, + "name": "Èçîëÿöèÿ øòîê-êðûøêà", + "sname": "R øò-êð", + "measure": "Â", + "mul": 0.1, + "byteId": [28,29] + }, + { + "id": 15, + "name": "Èçîëÿöèÿ êðûøêà-êàìåðà", + "sname": "R êð-êàì", + "measure": "Â", + "mul": 0.1, + "byteId": [30,31] + }, + { + "id": 16, + "name": "Ðàñõîä âîäû", + "sname": "Q â.êð", + "measure": "ì^3/÷", + "byteId": [ 32, 33 ] + }, + { + "id": 17, + "name": "Êàïåëüíûå çàìûêàíèÿ", + "sname": "Êàï.çàì.", + "mul": 0.01, + "byteId": [34,35] + }, + { + "id": 18, + "name": "Óñðåäí¸ííàÿ øèðèíà èìïóëüñîâ ÊÇ", + "sname": "Êàï.çûì.", + "mul": 0.1, + "byteId": [36,37] + }, + { + "id": 19, + "name": "Ïðîòîê âîäû ôëàíöà", + "sname": "Qâ. ôë.", + "measure": "ì^3/÷", + "mul": 0.01, + "byteId": [38,39] + }, + { + "id": 20, + "name": "Ïðîòîê âîäû øòîêà", + "sname": "Qâ. øò.", + "measure": "ì^3/÷", + "mul": 0.01, + "byteId": [40,41] + }, + { + "id": 21, + "name": "Äàâëåíèå âîäû êðèñò.+1,5", + "sname": "P â.êð", + "measure": "êãñ/ñì^2", + "mul": 0.01, + "byteId": [42,43] + }, + { + "id": 22, + "name": "Ïðîòîê âîäû êàìåðû", + "sname": "Qâ. êàì.", + "measure": "ì^3/÷", + "mul": 0.01, + "byteId": [44,45] + }, + { + "id": 23, + "name": "Òîê çàäàíèÿ èñòî÷íèêà(ÑÀÓ)", + "sname": "I ç.èñò ÑÀÓ", + "measure": "êÀ", + "mul": 0.1, + "byteId": [58,59] + }, + { + "id": 25, + "name": "ÏÈÄ-ðåã. îñíîâíàÿ óñòàâêà", + "sname": "ÏÈÄ-îñí", + "measure": "Â", + "mul": 0.1, + "byteId": [62,63] + }, + { + "id": 26, + "name": "ÏÈÄ-ðåã. ìàêñ. ñêîðîñòü", + "sname": "ÏÈÄ-ìàêñ", + "measure": "Â", + "mul": 0.1, + "byteId": [64,65] + }, + { + "id": 27, + "name": "t ôëàíöà âàêóóì-êàìåðû", + "sname": "t ôë.", + "measure": "ãð.Ñ", + "byteId": [66,67] + }, + { + "id": 28, + "name": "t ïîäñòàâêè", + "sname": "t ïîä.", + "measure": "ãð.Ñ", + "byteId": [68,69] + }, + { + "id": 29, + "name": "Ïðîòîê âîäû ïîäñòàâêè", + "sname": "Qâ. ïîä.", + "measure": "ì^3/÷", + "mul": 0.01, + "byteId": [70,71] + }, + { + "id": 30, + "name": "Çàäàíèå ñîëåíîèäà", + "sname": "Çàä. ñîë.", + "measure": "À", + "mul": 0.1, + "byteId": [72,73] + }, + { + "id": 31, + "name": "Òîê çàäàíèÿ èñòî÷íèêà(ïðåîáðàç.)", + "sname": "I ç.èñò. ïðåîá.", + "measure": "êÀ", + "mul": 0.1, + "byteId": [74,75] + }, + { + "id": 33, + "name": "Âàêóóì ïî ÌÅÒÐÀÍ-1200", + "sname": "ÌÅÒÐÀÍ-1200", + "measure": "ìì.ðò.ñò", + "mul": 0.1, + "byteId": [78,79] + }, + { + "id": 34, + "name": "Âàêóóì ïî ÌÅÒÐÀÍ-18,75", + "sname": "ÌÅÒÐÀÍ-18,25", + "measure": "ìì.ðò.ñò", + "mul": 0.001, + "byteId": [80,81] + }, + { + "id": 35, + "name": "Äàâëåíèå ãàçà â áàëëîíå", + "sname": "P ã.áàëë.", + "measure": "êãñ/ñì^2", + "mul": 0.1, + "byteId": [82,83] + }, + { + "id": 36, + "name": "Äàâëåíèå âîäû ïîääîíà", + "sname": "P â.ïîää.", + "measure": "êãñ/ñì^2", + "byteId": [84,85] + }, + { + "id": 37, + "name": "Çàäàíèå òîêà äóãè (ÖÀÏ)", + "sname": "Çàä.I, ÖÀÏ", + "measure": "êÀ", + "mul": 0.1, + "byteId": [86,87] + }, + { + "id": 38, + "name": "Çàäàíèå ñêîðîñòè ðàáî÷åãî äâèãàòåëÿ", + "sname": "Çàä.ñê.ðàá.äâ", + "measure": "Â", + "mul": 0.01, + "byteId": [88,89] + }, + { + "id": 39, + "name": "Òîê äâèãàòåëÿ íàñîñà ARPW", + "sname": "I äâ. ARPW", + "measure": "À", + "mul": 0.01, + "byteId": [90,91] + }, + { + "id": 40, + "name": "Ýíåðãèÿ ïëàâèëüíîãî ïðîë¸òà", + "sname": "Ýí.ïðîë¸òà, ÌÂò", + "measure": "ÌÂò", + "mul": 0.1, + "byteId": [] + }, + { + "id": 41, + "name": "Ñðåäíåå íàïðÿæåíèå ïëàâë. çà 1 ìèí.", + "sname": "U ñð. 1ìèí, Â", + "measure": "Â", + "mul": 0.1, + "byteId": [92,93] + }, + { + "id": 42, + "name": "ÃÌÏ: òîê êàòóøêè 1", + "sname": "I êàò1 ÃÌÏ", + "measure": "À", + "byteId": [94,95] + }, + { + "id": 43, + "name": "ÃÌÏ: òîê êàòóøêè 2", + "sname": "I êàò2 ÃÌÏ", + "measure": "À", + "byteId": [96,97] + }, + { + "id": 44, + "name": "ÃÌÏ: òîê êàòóøêè 3", + "sname": "I êàò3 ÃÌÏ", + "measure": "À", + "byteId": [98,99] + }, + { + "id": 45, + "name": "ÃÌÏ: ÷àñòîòà", + "sname": "×àñò. ÃÌÏ", + "measure": "Ãö", + "mul": 0.1, + "byteId": [100,101] + }, + { + "id": 46, + "name": "ÏÈÄ: êîýôôèöèíò Êp", + "mul": 0.01, + "byteId": [102,103] + }, + { + "id": 47, + "name": "ÏÈÄ: êîýôôèöèíò Êi", + "mul": 0.01, + "byteId": [104,105] + }, + { + "id": 49, + "name": "Êîëè÷åñòâî òî÷åê óñðåäíåíèÿ", + "byteId": [106,107] + }, + { + "id": 50, + "name": "Ïîðîãîâîå U ÄÊÇ", + "measure": "Â", + "mul": 0.1, + "byteId": [108,109] + } + + ] +} diff --git a/test3/bin/Release/net5.0/Config/config.json b/test3/bin/Release/net5.0/Config/config.json new file mode 100644 index 0000000..f71d35f --- /dev/null +++ b/test3/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/test3/bin/Release/net5.0/DataClient.dll b/test3/bin/Release/net5.0/DataClient.dll new file mode 100644 index 0000000..9be7a0c Binary files /dev/null and b/test3/bin/Release/net5.0/DataClient.dll differ diff --git a/test3/bin/Release/net5.0/DataClient.pdb b/test3/bin/Release/net5.0/DataClient.pdb new file mode 100644 index 0000000..fcafcb5 Binary files /dev/null and b/test3/bin/Release/net5.0/DataClient.pdb differ diff --git a/test3/bin/Release/net5.0/Microsoft.Extensions.Configuration.Abstractions.dll b/test3/bin/Release/net5.0/Microsoft.Extensions.Configuration.Abstractions.dll new file mode 100644 index 0000000..dd5ebe2 Binary files /dev/null and b/test3/bin/Release/net5.0/Microsoft.Extensions.Configuration.Abstractions.dll differ diff --git a/test3/bin/Release/net5.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll b/test3/bin/Release/net5.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll new file mode 100644 index 0000000..84aaf39 Binary files /dev/null and b/test3/bin/Release/net5.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll differ diff --git a/test3/bin/Release/net5.0/Microsoft.Extensions.DependencyInjection.dll b/test3/bin/Release/net5.0/Microsoft.Extensions.DependencyInjection.dll new file mode 100644 index 0000000..1034ee6 Binary files /dev/null and b/test3/bin/Release/net5.0/Microsoft.Extensions.DependencyInjection.dll differ diff --git a/test3/bin/Release/net5.0/Microsoft.Extensions.Logging.Abstractions.dll b/test3/bin/Release/net5.0/Microsoft.Extensions.Logging.Abstractions.dll new file mode 100644 index 0000000..2c87f79 Binary files /dev/null and b/test3/bin/Release/net5.0/Microsoft.Extensions.Logging.Abstractions.dll differ diff --git a/test3/bin/Release/net5.0/Microsoft.Extensions.Logging.dll b/test3/bin/Release/net5.0/Microsoft.Extensions.Logging.dll new file mode 100644 index 0000000..6df35e1 Binary files /dev/null and b/test3/bin/Release/net5.0/Microsoft.Extensions.Logging.dll differ diff --git a/test3/bin/Release/net5.0/Microsoft.Extensions.Options.dll b/test3/bin/Release/net5.0/Microsoft.Extensions.Options.dll new file mode 100644 index 0000000..8a2a8c8 Binary files /dev/null and b/test3/bin/Release/net5.0/Microsoft.Extensions.Options.dll differ diff --git a/test3/bin/Release/net5.0/Microsoft.Extensions.Primitives.dll b/test3/bin/Release/net5.0/Microsoft.Extensions.Primitives.dll new file mode 100644 index 0000000..884f9dc Binary files /dev/null and b/test3/bin/Release/net5.0/Microsoft.Extensions.Primitives.dll differ diff --git a/test3/bin/Release/net5.0/NLog.Extensions.Logging.dll b/test3/bin/Release/net5.0/NLog.Extensions.Logging.dll new file mode 100644 index 0000000..936aef2 Binary files /dev/null and b/test3/bin/Release/net5.0/NLog.Extensions.Logging.dll differ diff --git a/test3/bin/Release/net5.0/NLog.dll b/test3/bin/Release/net5.0/NLog.dll new file mode 100644 index 0000000..36689f2 Binary files /dev/null and b/test3/bin/Release/net5.0/NLog.dll differ diff --git a/test3/bin/Release/net5.0/Newtonsoft.Json.dll b/test3/bin/Release/net5.0/Newtonsoft.Json.dll new file mode 100644 index 0000000..1ffeabe Binary files /dev/null and b/test3/bin/Release/net5.0/Newtonsoft.Json.dll differ diff --git a/test3/bin/Release/net5.0/publish/Config/analog/default.json b/test3/bin/Release/net5.0/publish/Config/analog/default.json new file mode 100644 index 0000000..d096f0e --- /dev/null +++ b/test3/bin/Release/net5.0/publish/Config/analog/default.json @@ -0,0 +1,368 @@ +{ + "deleteAll": true, + "delete": [], + "add": [ + { + "id": 0, + "name": "Òîê äóãè", + "sname": "I ä", + "measure": "êÀ", + "mul": 0.1, + "byteId": [ 0, 1 ] + }, + { + "id": 1, + "name": "Íàïðÿæåíèå äóãè", + "sname": "U ä", + "measure": "Â", + "mul": 0.1, + "byteId": [ 2, 3 ] + }, + { + "id": 2, + "name": "Òîê ðàáî÷åãî äâèãàòåëÿ", + "sname": "I ðä", + "measure": "À", + "mul": 0.1, + "byteId": [4,5] + }, + { + "id": 3, + "name": "U ðàáî÷åãî äâèãàòåëÿ", + "sname": "U ðä", + "measure": "Â", + "mul": 0.1, + "byteId": [6,7] + }, + { + "id": 4, + "name": "Òîê ñîëåíîèäà", + "sname": "I ñîë", + "measure": "À", + "mul": 0.1, + "byteId": [8,9] + }, + { + "id": 5, + "name": "U ñîëåíîèäà", + "sname": "U ñîë", + "measure": "Â", + "mul": 0.1, + "byteId": [10,11] + }, + { + "id": 6, + "name": "Òîê çàäàíèÿ", + "sname": "I ðç", + "measure": "êÀ", + "mul": 0.1, + "byteId": [12,13] + }, + { + "id": 7, + "name": "t êðèñòàëëèçàòîðà íà âõîäå", + "sname": "t êð.âûõ", + "measure": "ãð.Ñ", + "byteId": [14,15] + }, + { + "id": 8, + "name": "t êðèñòàëëèçàòîðà íà âûõîäå", + "sname": "t êð.âõ", + "measure": "ãð.Ñ", + "byteId": [16,17] + }, + { + "id": 9, + "name": "t âàêóóì-êàìåðû", + "sname": "t âàê-êàì", + "measure": "ãð.Ñ", + "byteId": [18,19] + }, + { + "id": 10, + "name": "t øòîêà", + "sname": "t øò", + "measure": "ãð.Ñ", + "byteId": [20,21] + }, + { + "id": 11, + "name": "Ïåðåìåùåíèå 0.1", + "sname": "S øò", + "measure": "ìì", + "mul": 0.1, + "byteId": [22,23] + }, + { + "id": 12, + "name": "Ïåðåìåùåíèå", + "sname": "S øò", + "measure": "ìì", + "byteId": [24,25] + }, + { + "id": 13, + "name": "Îñòàòî÷íîå äàâëåíèå", + "measure": "ìêì.ðò.ñò", + "mul": -1, + "byteId": [26,27] + }, + { + "id": 14, + "name": "Èçîëÿöèÿ øòîê-êðûøêà", + "sname": "R øò-êð", + "measure": "Â", + "mul": 0.1, + "byteId": [28,29] + }, + { + "id": 15, + "name": "Èçîëÿöèÿ êðûøêà-êàìåðà", + "sname": "R êð-êàì", + "measure": "Â", + "mul": 0.1, + "byteId": [30,31] + }, + { + "id": 16, + "name": "Ðàñõîä âîäû", + "sname": "Q â.êð", + "measure": "ì^3/÷", + "byteId": [ 32, 33 ] + }, + { + "id": 17, + "name": "Êàïåëüíûå çàìûêàíèÿ", + "sname": "Êàï.çàì.", + "mul": 0.01, + "byteId": [34,35] + }, + { + "id": 18, + "name": "Óñðåäí¸ííàÿ øèðèíà èìïóëüñîâ ÊÇ", + "sname": "Êàï.çûì.", + "mul": 0.1, + "byteId": [36,37] + }, + { + "id": 19, + "name": "Ïðîòîê âîäû ôëàíöà", + "sname": "Qâ. ôë.", + "measure": "ì^3/÷", + "mul": 0.01, + "byteId": [38,39] + }, + { + "id": 20, + "name": "Ïðîòîê âîäû øòîêà", + "sname": "Qâ. øò.", + "measure": "ì^3/÷", + "mul": 0.01, + "byteId": [40,41] + }, + { + "id": 21, + "name": "Äàâëåíèå âîäû êðèñò.+1,5", + "sname": "P â.êð", + "measure": "êãñ/ñì^2", + "mul": 0.01, + "byteId": [42,43] + }, + { + "id": 22, + "name": "Ïðîòîê âîäû êàìåðû", + "sname": "Qâ. êàì.", + "measure": "ì^3/÷", + "mul": 0.01, + "byteId": [44,45] + }, + { + "id": 23, + "name": "Òîê çàäàíèÿ èñòî÷íèêà(ÑÀÓ)", + "sname": "I ç.èñò ÑÀÓ", + "measure": "êÀ", + "mul": 0.1, + "byteId": [58,59] + }, + { + "id": 25, + "name": "ÏÈÄ-ðåã. îñíîâíàÿ óñòàâêà", + "sname": "ÏÈÄ-îñí", + "measure": "Â", + "mul": 0.1, + "byteId": [62,63] + }, + { + "id": 26, + "name": "ÏÈÄ-ðåã. ìàêñ. ñêîðîñòü", + "sname": "ÏÈÄ-ìàêñ", + "measure": "Â", + "mul": 0.1, + "byteId": [64,65] + }, + { + "id": 27, + "name": "t ôëàíöà âàêóóì-êàìåðû", + "sname": "t ôë.", + "measure": "ãð.Ñ", + "byteId": [66,67] + }, + { + "id": 28, + "name": "t ïîäñòàâêè", + "sname": "t ïîä.", + "measure": "ãð.Ñ", + "byteId": [68,69] + }, + { + "id": 29, + "name": "Ïðîòîê âîäû ïîäñòàâêè", + "sname": "Qâ. ïîä.", + "measure": "ì^3/÷", + "mul": 0.01, + "byteId": [70,71] + }, + { + "id": 30, + "name": "Çàäàíèå ñîëåíîèäà", + "sname": "Çàä. ñîë.", + "measure": "À", + "mul": 0.1, + "byteId": [72,73] + }, + { + "id": 31, + "name": "Òîê çàäàíèÿ èñòî÷íèêà(ïðåîáðàç.)", + "sname": "I ç.èñò. ïðåîá.", + "measure": "êÀ", + "mul": 0.1, + "byteId": [74,75] + }, + { + "id": 33, + "name": "Âàêóóì ïî ÌÅÒÐÀÍ-1200", + "sname": "ÌÅÒÐÀÍ-1200", + "measure": "ìì.ðò.ñò", + "mul": 0.1, + "byteId": [78,79] + }, + { + "id": 34, + "name": "Âàêóóì ïî ÌÅÒÐÀÍ-18,75", + "sname": "ÌÅÒÐÀÍ-18,25", + "measure": "ìì.ðò.ñò", + "mul": 0.001, + "byteId": [80,81] + }, + { + "id": 35, + "name": "Äàâëåíèå ãàçà â áàëëîíå", + "sname": "P ã.áàëë.", + "measure": "êãñ/ñì^2", + "mul": 0.1, + "byteId": [82,83] + }, + { + "id": 36, + "name": "Äàâëåíèå âîäû ïîääîíà", + "sname": "P â.ïîää.", + "measure": "êãñ/ñì^2", + "byteId": [84,85] + }, + { + "id": 37, + "name": "Çàäàíèå òîêà äóãè (ÖÀÏ)", + "sname": "Çàä.I, ÖÀÏ", + "measure": "êÀ", + "mul": 0.1, + "byteId": [86,87] + }, + { + "id": 38, + "name": "Çàäàíèå ñêîðîñòè ðàáî÷åãî äâèãàòåëÿ", + "sname": "Çàä.ñê.ðàá.äâ", + "measure": "Â", + "mul": 0.01, + "byteId": [88,89] + }, + { + "id": 39, + "name": "Òîê äâèãàòåëÿ íàñîñà ARPW", + "sname": "I äâ. ARPW", + "measure": "À", + "mul": 0.01, + "byteId": [90,91] + }, + { + "id": 40, + "name": "Ýíåðãèÿ ïëàâèëüíîãî ïðîë¸òà", + "sname": "Ýí.ïðîë¸òà, ÌÂò", + "measure": "ÌÂò", + "mul": 0.1, + "byteId": [] + }, + { + "id": 41, + "name": "Ñðåäíåå íàïðÿæåíèå ïëàâë. çà 1 ìèí.", + "sname": "U ñð. 1ìèí, Â", + "measure": "Â", + "mul": 0.1, + "byteId": [92,93] + }, + { + "id": 42, + "name": "ÃÌÏ: òîê êàòóøêè 1", + "sname": "I êàò1 ÃÌÏ", + "measure": "À", + "byteId": [94,95] + }, + { + "id": 43, + "name": "ÃÌÏ: òîê êàòóøêè 2", + "sname": "I êàò2 ÃÌÏ", + "measure": "À", + "byteId": [96,97] + }, + { + "id": 44, + "name": "ÃÌÏ: òîê êàòóøêè 3", + "sname": "I êàò3 ÃÌÏ", + "measure": "À", + "byteId": [98,99] + }, + { + "id": 45, + "name": "ÃÌÏ: ÷àñòîòà", + "sname": "×àñò. ÃÌÏ", + "measure": "Ãö", + "mul": 0.1, + "byteId": [100,101] + }, + { + "id": 46, + "name": "ÏÈÄ: êîýôôèöèíò Êp", + "mul": 0.01, + "byteId": [102,103] + }, + { + "id": 47, + "name": "ÏÈÄ: êîýôôèöèíò Êi", + "mul": 0.01, + "byteId": [104,105] + }, + { + "id": 49, + "name": "Êîëè÷åñòâî òî÷åê óñðåäíåíèÿ", + "byteId": [106,107] + }, + { + "id": 50, + "name": "Ïîðîãîâîå U ÄÊÇ", + "measure": "Â", + "mul": 0.1, + "byteId": [108,109] + } + + ] +} diff --git a/test3/bin/Release/net5.0/publish/Config/config.json b/test3/bin/Release/net5.0/publish/Config/config.json new file mode 100644 index 0000000..f71d35f --- /dev/null +++ b/test3/bin/Release/net5.0/publish/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/test3/bin/Release/net5.0/publish/DataClient.dll b/test3/bin/Release/net5.0/publish/DataClient.dll new file mode 100644 index 0000000..9be7a0c Binary files /dev/null and b/test3/bin/Release/net5.0/publish/DataClient.dll differ diff --git a/test3/bin/Release/net5.0/publish/DataClient.pdb b/test3/bin/Release/net5.0/publish/DataClient.pdb new file mode 100644 index 0000000..fcafcb5 Binary files /dev/null and b/test3/bin/Release/net5.0/publish/DataClient.pdb differ diff --git a/test3/bin/Release/net5.0/publish/Microsoft.Extensions.Configuration.Abstractions.dll b/test3/bin/Release/net5.0/publish/Microsoft.Extensions.Configuration.Abstractions.dll new file mode 100644 index 0000000..dd5ebe2 Binary files /dev/null and b/test3/bin/Release/net5.0/publish/Microsoft.Extensions.Configuration.Abstractions.dll differ diff --git a/test3/bin/Release/net5.0/publish/Microsoft.Extensions.DependencyInjection.Abstractions.dll b/test3/bin/Release/net5.0/publish/Microsoft.Extensions.DependencyInjection.Abstractions.dll new file mode 100644 index 0000000..84aaf39 Binary files /dev/null and b/test3/bin/Release/net5.0/publish/Microsoft.Extensions.DependencyInjection.Abstractions.dll differ diff --git a/test3/bin/Release/net5.0/publish/Microsoft.Extensions.DependencyInjection.dll b/test3/bin/Release/net5.0/publish/Microsoft.Extensions.DependencyInjection.dll new file mode 100644 index 0000000..1034ee6 Binary files /dev/null and b/test3/bin/Release/net5.0/publish/Microsoft.Extensions.DependencyInjection.dll differ diff --git a/test3/bin/Release/net5.0/publish/Microsoft.Extensions.Logging.Abstractions.dll b/test3/bin/Release/net5.0/publish/Microsoft.Extensions.Logging.Abstractions.dll new file mode 100644 index 0000000..2c87f79 Binary files /dev/null and b/test3/bin/Release/net5.0/publish/Microsoft.Extensions.Logging.Abstractions.dll differ diff --git a/test3/bin/Release/net5.0/publish/Microsoft.Extensions.Logging.dll b/test3/bin/Release/net5.0/publish/Microsoft.Extensions.Logging.dll new file mode 100644 index 0000000..6df35e1 Binary files /dev/null and b/test3/bin/Release/net5.0/publish/Microsoft.Extensions.Logging.dll differ diff --git a/test3/bin/Release/net5.0/publish/Microsoft.Extensions.Options.dll b/test3/bin/Release/net5.0/publish/Microsoft.Extensions.Options.dll new file mode 100644 index 0000000..8a2a8c8 Binary files /dev/null and b/test3/bin/Release/net5.0/publish/Microsoft.Extensions.Options.dll differ diff --git a/test3/bin/Release/net5.0/publish/Microsoft.Extensions.Primitives.dll b/test3/bin/Release/net5.0/publish/Microsoft.Extensions.Primitives.dll new file mode 100644 index 0000000..884f9dc Binary files /dev/null and b/test3/bin/Release/net5.0/publish/Microsoft.Extensions.Primitives.dll differ diff --git a/test3/bin/Release/net5.0/publish/NLog.Extensions.Logging.dll b/test3/bin/Release/net5.0/publish/NLog.Extensions.Logging.dll new file mode 100644 index 0000000..936aef2 Binary files /dev/null and b/test3/bin/Release/net5.0/publish/NLog.Extensions.Logging.dll differ diff --git a/test3/bin/Release/net5.0/publish/NLog.dll b/test3/bin/Release/net5.0/publish/NLog.dll new file mode 100644 index 0000000..36689f2 Binary files /dev/null and b/test3/bin/Release/net5.0/publish/NLog.dll differ diff --git a/test3/bin/Release/net5.0/publish/Newtonsoft.Json.dll b/test3/bin/Release/net5.0/publish/Newtonsoft.Json.dll new file mode 100644 index 0000000..1ffeabe Binary files /dev/null and b/test3/bin/Release/net5.0/publish/Newtonsoft.Json.dll differ diff --git a/test3/bin/Release/net5.0/publish/test3.deps.json b/test3/bin/Release/net5.0/publish/test3.deps.json new file mode 100644 index 0000000..579bf73 --- /dev/null +++ b/test3/bin/Release/net5.0/publish/test3.deps.json @@ -0,0 +1,214 @@ +{ + "runtimeTarget": { + "name": ".NETCoreApp,Version=v5.0", + "signature": "" + }, + "compilationOptions": {}, + "targets": { + ".NETCoreApp,Version=v5.0": { + "test3/1.0.0": { + "dependencies": { + "DataClient": "0.0.3", + "NLog": "4.7.10", + "NLog.Extensions.Logging": "1.7.3" + }, + "runtime": { + "test3.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.3": { + "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.3.1580" + } + } + }, + "DataClient/0.0.3": { + "dependencies": { + "NLog": "4.7.10", + "NLog.Extensions.Logging": "1.7.3", + "Newtonsoft.Json": "13.0.1" + }, + "runtime": { + "DataClient.dll": {} + } + } + } + }, + "libraries": { + "test3/1.0.0": { + "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.3": { + "type": "package", + "serviceable": true, + "sha512": "sha512-7RvUvGd9Ad37pNedjPHbCUroscLGuChLBo0OBveGp92vIpEHLZm/in+Ydd+c9qpv1XMQQIx7yZv1F5qyy/AxHQ==", + "path": "nlog.extensions.logging/1.7.3", + "hashPath": "nlog.extensions.logging.1.7.3.nupkg.sha512" + }, + "DataClient/0.0.3": { + "type": "project", + "serviceable": false, + "sha512": "" + } + } +} \ No newline at end of file diff --git a/test3/bin/Release/net5.0/publish/test3.dll b/test3/bin/Release/net5.0/publish/test3.dll new file mode 100644 index 0000000..f87e846 Binary files /dev/null and b/test3/bin/Release/net5.0/publish/test3.dll differ diff --git a/test3/bin/Release/net5.0/publish/test3.exe b/test3/bin/Release/net5.0/publish/test3.exe new file mode 100644 index 0000000..f83d39d Binary files /dev/null and b/test3/bin/Release/net5.0/publish/test3.exe differ diff --git a/test3/bin/Release/net5.0/publish/test3.pdb b/test3/bin/Release/net5.0/publish/test3.pdb new file mode 100644 index 0000000..059a191 Binary files /dev/null and b/test3/bin/Release/net5.0/publish/test3.pdb differ diff --git a/test3/bin/Release/net5.0/publish/test3.runtimeconfig.json b/test3/bin/Release/net5.0/publish/test3.runtimeconfig.json new file mode 100644 index 0000000..a8e7e82 --- /dev/null +++ b/test3/bin/Release/net5.0/publish/test3.runtimeconfig.json @@ -0,0 +1,9 @@ +{ + "runtimeOptions": { + "tfm": "net5.0", + "framework": { + "name": "Microsoft.NETCore.App", + "version": "5.0.0" + } + } +} \ No newline at end of file diff --git a/test3/bin/Release/net5.0/ref/test3.dll b/test3/bin/Release/net5.0/ref/test3.dll new file mode 100644 index 0000000..452f176 Binary files /dev/null and b/test3/bin/Release/net5.0/ref/test3.dll differ diff --git a/test3/bin/Release/net5.0/test3.deps.json b/test3/bin/Release/net5.0/test3.deps.json new file mode 100644 index 0000000..579bf73 --- /dev/null +++ b/test3/bin/Release/net5.0/test3.deps.json @@ -0,0 +1,214 @@ +{ + "runtimeTarget": { + "name": ".NETCoreApp,Version=v5.0", + "signature": "" + }, + "compilationOptions": {}, + "targets": { + ".NETCoreApp,Version=v5.0": { + "test3/1.0.0": { + "dependencies": { + "DataClient": "0.0.3", + "NLog": "4.7.10", + "NLog.Extensions.Logging": "1.7.3" + }, + "runtime": { + "test3.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.3": { + "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.3.1580" + } + } + }, + "DataClient/0.0.3": { + "dependencies": { + "NLog": "4.7.10", + "NLog.Extensions.Logging": "1.7.3", + "Newtonsoft.Json": "13.0.1" + }, + "runtime": { + "DataClient.dll": {} + } + } + } + }, + "libraries": { + "test3/1.0.0": { + "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.3": { + "type": "package", + "serviceable": true, + "sha512": "sha512-7RvUvGd9Ad37pNedjPHbCUroscLGuChLBo0OBveGp92vIpEHLZm/in+Ydd+c9qpv1XMQQIx7yZv1F5qyy/AxHQ==", + "path": "nlog.extensions.logging/1.7.3", + "hashPath": "nlog.extensions.logging.1.7.3.nupkg.sha512" + }, + "DataClient/0.0.3": { + "type": "project", + "serviceable": false, + "sha512": "" + } + } +} \ No newline at end of file diff --git a/test3/bin/Release/net5.0/test3.dll b/test3/bin/Release/net5.0/test3.dll new file mode 100644 index 0000000..f87e846 Binary files /dev/null and b/test3/bin/Release/net5.0/test3.dll differ diff --git a/test3/bin/Release/net5.0/test3.exe b/test3/bin/Release/net5.0/test3.exe new file mode 100644 index 0000000..f83d39d Binary files /dev/null and b/test3/bin/Release/net5.0/test3.exe differ diff --git a/test3/bin/Release/net5.0/test3.pdb b/test3/bin/Release/net5.0/test3.pdb new file mode 100644 index 0000000..059a191 Binary files /dev/null and b/test3/bin/Release/net5.0/test3.pdb differ diff --git a/test3/bin/Release/net5.0/test3.runtimeconfig.dev.json b/test3/bin/Release/net5.0/test3.runtimeconfig.dev.json new file mode 100644 index 0000000..cb610d9 --- /dev/null +++ b/test3/bin/Release/net5.0/test3.runtimeconfig.dev.json @@ -0,0 +1,10 @@ +{ + "runtimeOptions": { + "additionalProbingPaths": [ + "C:\\Users\\Admin\\.dotnet\\store\\|arch|\\|tfm|", + "C:\\Users\\Admin\\.nuget\\packages", + "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet" + ] + } +} \ No newline at end of file diff --git a/test3/bin/Release/net5.0/test3.runtimeconfig.json b/test3/bin/Release/net5.0/test3.runtimeconfig.json new file mode 100644 index 0000000..a8e7e82 --- /dev/null +++ b/test3/bin/Release/net5.0/test3.runtimeconfig.json @@ -0,0 +1,9 @@ +{ + "runtimeOptions": { + "tfm": "net5.0", + "framework": { + "name": "Microsoft.NETCore.App", + "version": "5.0.0" + } + } +} \ No newline at end of file diff --git a/test3/obj/Debug/net5.0/test3.csproj.AssemblyReference.cache b/test3/obj/Debug/net5.0/test3.csproj.AssemblyReference.cache index 630aa64..417cd5d 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/PublishOutputs.43ddbee22c.txt b/test3/obj/Release/net5.0/PublishOutputs.43ddbee22c.txt new file mode 100644 index 0000000..84e9036 --- /dev/null +++ b/test3/obj/Release/net5.0/PublishOutputs.43ddbee22c.txt @@ -0,0 +1,19 @@ +F:\GIT\ASCKU_PC\test3\bin\Release\net5.0\publish\Config\analog\default.json +F:\GIT\ASCKU_PC\test3\bin\Release\net5.0\publish\Config\config.json +F:\GIT\ASCKU_PC\test3\bin\Release\net5.0\publish\test3.exe +F:\GIT\ASCKU_PC\test3\bin\Release\net5.0\publish\test3.dll +F:\GIT\ASCKU_PC\test3\bin\Release\net5.0\publish\test3.deps.json +F:\GIT\ASCKU_PC\test3\bin\Release\net5.0\publish\test3.runtimeconfig.json +F:\GIT\ASCKU_PC\test3\bin\Release\net5.0\publish\test3.pdb +F:\GIT\ASCKU_PC\test3\bin\Release\net5.0\publish\Microsoft.Extensions.Configuration.Abstractions.dll +F:\GIT\ASCKU_PC\test3\bin\Release\net5.0\publish\Microsoft.Extensions.DependencyInjection.dll +F:\GIT\ASCKU_PC\test3\bin\Release\net5.0\publish\Microsoft.Extensions.DependencyInjection.Abstractions.dll +F:\GIT\ASCKU_PC\test3\bin\Release\net5.0\publish\Microsoft.Extensions.Logging.dll +F:\GIT\ASCKU_PC\test3\bin\Release\net5.0\publish\Microsoft.Extensions.Logging.Abstractions.dll +F:\GIT\ASCKU_PC\test3\bin\Release\net5.0\publish\Microsoft.Extensions.Options.dll +F:\GIT\ASCKU_PC\test3\bin\Release\net5.0\publish\Microsoft.Extensions.Primitives.dll +F:\GIT\ASCKU_PC\test3\bin\Release\net5.0\publish\Newtonsoft.Json.dll +F:\GIT\ASCKU_PC\test3\bin\Release\net5.0\publish\NLog.dll +F:\GIT\ASCKU_PC\test3\bin\Release\net5.0\publish\NLog.Extensions.Logging.dll +F:\GIT\ASCKU_PC\test3\bin\Release\net5.0\publish\DataClient.dll +F:\GIT\ASCKU_PC\test3\bin\Release\net5.0\publish\DataClient.pdb diff --git a/test3/obj/Release/net5.0/apphost.exe b/test3/obj/Release/net5.0/apphost.exe new file mode 100644 index 0000000..f83d39d Binary files /dev/null and b/test3/obj/Release/net5.0/apphost.exe differ diff --git a/test3/obj/Release/net5.0/ref/test3.dll b/test3/obj/Release/net5.0/ref/test3.dll new file mode 100644 index 0000000..452f176 Binary files /dev/null and b/test3/obj/Release/net5.0/ref/test3.dll differ diff --git a/test3/obj/Release/net5.0/test3.csproj.AssemblyReference.cache b/test3/obj/Release/net5.0/test3.csproj.AssemblyReference.cache index 04bed6a..54dc9a1 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 diff --git a/test3/obj/Release/net5.0/test3.csproj.CopyComplete b/test3/obj/Release/net5.0/test3.csproj.CopyComplete new file mode 100644 index 0000000..e69de29 diff --git a/test3/obj/Release/net5.0/test3.csproj.CoreCompileInputs.cache b/test3/obj/Release/net5.0/test3.csproj.CoreCompileInputs.cache new file mode 100644 index 0000000..8cb8cb9 --- /dev/null +++ b/test3/obj/Release/net5.0/test3.csproj.CoreCompileInputs.cache @@ -0,0 +1 @@ +8419d6061e2ad7e005f88f25d12ca7b443efba9b diff --git a/test3/obj/Release/net5.0/test3.csproj.FileListAbsolute.txt b/test3/obj/Release/net5.0/test3.csproj.FileListAbsolute.txt new file mode 100644 index 0000000..7a90a9b --- /dev/null +++ b/test3/obj/Release/net5.0/test3.csproj.FileListAbsolute.txt @@ -0,0 +1,31 @@ +F:\GIT\ASCKU_PC\test3\bin\Release\net5.0\test3.exe +F:\GIT\ASCKU_PC\test3\bin\Release\net5.0\Config\analog\default.json +F:\GIT\ASCKU_PC\test3\bin\Release\net5.0\Config\config.json +F:\GIT\ASCKU_PC\test3\bin\Release\net5.0\test3.deps.json +F:\GIT\ASCKU_PC\test3\bin\Release\net5.0\test3.runtimeconfig.json +F:\GIT\ASCKU_PC\test3\bin\Release\net5.0\test3.runtimeconfig.dev.json +F:\GIT\ASCKU_PC\test3\bin\Release\net5.0\test3.dll +F:\GIT\ASCKU_PC\test3\bin\Release\net5.0\ref\test3.dll +F:\GIT\ASCKU_PC\test3\bin\Release\net5.0\test3.pdb +F:\GIT\ASCKU_PC\test3\bin\Release\net5.0\Microsoft.Extensions.Configuration.Abstractions.dll +F:\GIT\ASCKU_PC\test3\bin\Release\net5.0\Microsoft.Extensions.DependencyInjection.dll +F:\GIT\ASCKU_PC\test3\bin\Release\net5.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll +F:\GIT\ASCKU_PC\test3\bin\Release\net5.0\Microsoft.Extensions.Logging.dll +F:\GIT\ASCKU_PC\test3\bin\Release\net5.0\Microsoft.Extensions.Logging.Abstractions.dll +F:\GIT\ASCKU_PC\test3\bin\Release\net5.0\Microsoft.Extensions.Options.dll +F:\GIT\ASCKU_PC\test3\bin\Release\net5.0\Microsoft.Extensions.Primitives.dll +F:\GIT\ASCKU_PC\test3\bin\Release\net5.0\Newtonsoft.Json.dll +F:\GIT\ASCKU_PC\test3\bin\Release\net5.0\NLog.dll +F:\GIT\ASCKU_PC\test3\bin\Release\net5.0\NLog.Extensions.Logging.dll +F:\GIT\ASCKU_PC\test3\bin\Release\net5.0\DataClient.dll +F:\GIT\ASCKU_PC\test3\bin\Release\net5.0\DataClient.pdb +F:\GIT\ASCKU_PC\test3\obj\Release\net5.0\test3.csproj.AssemblyReference.cache +F:\GIT\ASCKU_PC\test3\obj\Release\net5.0\test3.GeneratedMSBuildEditorConfig.editorconfig +F:\GIT\ASCKU_PC\test3\obj\Release\net5.0\test3.AssemblyInfoInputs.cache +F:\GIT\ASCKU_PC\test3\obj\Release\net5.0\test3.AssemblyInfo.cs +F:\GIT\ASCKU_PC\test3\obj\Release\net5.0\test3.csproj.CoreCompileInputs.cache +F:\GIT\ASCKU_PC\test3\obj\Release\net5.0\test3.csproj.CopyComplete +F:\GIT\ASCKU_PC\test3\obj\Release\net5.0\test3.dll +F:\GIT\ASCKU_PC\test3\obj\Release\net5.0\ref\test3.dll +F:\GIT\ASCKU_PC\test3\obj\Release\net5.0\test3.pdb +F:\GIT\ASCKU_PC\test3\obj\Release\net5.0\test3.genruntimeconfig.cache diff --git a/test3/obj/Release/net5.0/test3.dll b/test3/obj/Release/net5.0/test3.dll new file mode 100644 index 0000000..f87e846 Binary files /dev/null and b/test3/obj/Release/net5.0/test3.dll differ diff --git a/test3/obj/Release/net5.0/test3.genruntimeconfig.cache b/test3/obj/Release/net5.0/test3.genruntimeconfig.cache new file mode 100644 index 0000000..54eedca --- /dev/null +++ b/test3/obj/Release/net5.0/test3.genruntimeconfig.cache @@ -0,0 +1 @@ +c48a2583feac6211ef2cc759b84fcbe9f88aa144 diff --git a/test3/obj/Release/net5.0/test3.pdb b/test3/obj/Release/net5.0/test3.pdb new file mode 100644 index 0000000..059a191 Binary files /dev/null and b/test3/obj/Release/net5.0/test3.pdb differ diff --git a/test3/test3.csproj.user b/test3/test3.csproj.user index bf8c49f..b4ee3ee 100644 --- a/test3/test3.csproj.user +++ b/test3/test3.csproj.user @@ -1,6 +1,6 @@  - <_LastSelectedProfileId>D:\GIT\ASCKU_PC\test3\Properties\PublishProfiles\FolderProfile.pubxml + <_LastSelectedProfileId>F:\GIT\ASCKU_PC\test3\Properties\PublishProfiles\FolderProfile.pubxml \ No newline at end of file