diff --git a/.vs/ASCKU Projects/DesignTimeBuild/.dtbcache.v2 b/.vs/ASCKU Projects/DesignTimeBuild/.dtbcache.v2 index c44fbe4..009e236 100644 Binary files a/.vs/ASCKU Projects/DesignTimeBuild/.dtbcache.v2 and b/.vs/ASCKU Projects/DesignTimeBuild/.dtbcache.v2 differ diff --git a/.vs/ASCKU Projects/v16/.suo b/.vs/ASCKU Projects/v16/.suo index 5d04abf..604faf5 100644 Binary files a/.vs/ASCKU Projects/v16/.suo and b/.vs/ASCKU Projects/v16/.suo differ diff --git a/DataClient/NETClient.cs b/DataClient/NETClient.cs index 73f5d52..c29e3d0 100644 --- a/DataClient/NETClient.cs +++ b/DataClient/NETClient.cs @@ -6,6 +6,7 @@ using System.Net.Sockets; using System.Text; using System.Threading.Tasks; using NLog; +using DataClient.Struct; namespace DataClient { @@ -13,45 +14,212 @@ namespace DataClient { private Logger log = LogManager.GetCurrentClassLogger(); private Encoding enc; - private string ip = "127.0.0.1"; + private TcpClient tcpC = null; + /// Статус процесса выполнения запроса. + /// Предполагается использовать только на больших загрузках и в ассинхронных задачах. + public double Status + { + get + { + if (stat.stat == NetStatus.Status.wait) return 0; + if (stat.stat == NetStatus.Status.in_progress && stat.fullSize <= 0) return 0.01; + if (stat.stat == NetStatus.Status.in_progress) return ((double)stat.size / stat.fullSize); + stat.stat = NetStatus.Status.wait; + stat.fullSize = 0; + stat.size = 0; + return 1; + } + } + private NetStatus stat = new NetStatus(); + /// Коды для работы с СТП. + /* +0x00 0x00 0x00 0x00 - 0000 - version +0x01 0x00 0x00 0x00 - 0001 - file list +0x03 0x00 0x00 0x00 - 0003 - pasp browse +0x04 0x00 0x00 0x00 - 0004 - pasp download +0x05 0x00 0x00 0x00 - 0005 - pasp find +0x06 0x00 0x00 0x00 - 0006 - prog list +0x07 0x00 0x00 0x00 - 0007 - prog download +0x08 0x00 0x00 0x00 - 0008 - server time +0x09 0x00 0x00 0x00 - 0009 - download usov +0x0A 0x00 0x00 0x00 - 0010 - slit history +0x0B 0x00 0x00 0x00 - 0011 - keep alive +- vdp cycle +- vdp active +- vdp last cycle +- rmt watchdog +- set rmt watchdog +0x11 0x00 0x00 0x00 - 0017 - print job +- pasp find2 +- pasp browse2 +- arch history +- download usov nhv +0x17 0x00 0x00 0x00 - 0023 - dir browse +- vdp sim med +- vdp flags +0x1A 0x00 0x00 0x00 - 0026 - user flags +0x1B 0x00 0x00 0x00 - 0027 - user motd +0x1C 0x00 0x00 0x00 - 0028 - user mail +0x1D 0x00 0x00 0x00 - 0029 - download tvso +0x1E 0x00 0x00 0x00 - 0030 - pasp download tvso +0x1F 0x00 0x00 0x00 - 0031 - pasp find tvso +- pasp browse tvsov +0x21 0x00 0x00 0x00 - 0033 - korpus cycle +0x22 0x00 0x00 0x00 - 0034 - korpus last cycle +0x23 0x00 0x00 0x00 - 0035 - download fdan +0x24 0x00 0x00 0x00 - 0036 - client version +- measure id +- read vdp config +- write vdp config +- read tvso config +- delete vdp config +0x2A 0x00 0x00 0x00 - 0042 - get plav personal +0x2B 0x00 0x00 0x00 - 0043 - get server info +0x2C 0x00 0x00 0x00 - 0044 - ctrl split +0x2D 0x00 0x00 0x00 - 0045 - ctrl set time +- ctrl end tc +0x2F 0x00 0x00 0x00 - 0047 - ctrl remove +0x30 0x00 0x00 0x00 - 0048 - ctrl spool +0x31 0x00 0x00 0x00 - 0049 - save pasport +- save pasport 90 +0x33 0x00 0x00 0x00 - 0051 - find time bugs +0x34 0x00 0x00 0x00 - 0052 - update pasport +- get pasp by id +- cp com find pasp by temp +0x37 0x00 0x00 0x00 - 0055 - get splav list +0x38 0x00 0x00 0x00 - 0056 - get field val list +0x39 0x00 0x00 0x00 - 0057 - get plav list form +0x3A 0x00 0x00 0x00 - 0058 - get pasp by priv +0x3B 0x00 0x00 0x00 - 0059 - print job 2 +0x3C 0x00 0x00 0x00 - 0060 - get pasp by name +- get pasp by id 90 +0x3E 0x00 0x00 0x00 - 0062 - find pasp by temp 90 +0x3F 0x00 0x00 0x00 - 0063 - get pasp by priv 90 +0x40 0x00 0x00 0x00 - 0064 - get pasp by name 90 +0x41 0x00 0x00 0x00 - 0065 - get plav list form 90 +- ctrl split db +- ctrl set time db +- ctrl remove db +0x45 0x00 0x00 0x00 - 0069 - update stat +0x46 0x00 0x00 0x00 - 0070 - get cur params arr +0x47 0x00 0x00 0x00 - 0071 - get cur params +0x48 0x00 0x00 0x00 - 0072 - get cur params arr 5 +0x49 0x00 0x00 0x00 - 0073 - get cur params 5 +0x4A 0x00 0x00 0x00 - 0074 - fix db cycle +- by name +- test +*/ + public enum Code : uint + { + download = 2, + download_nh = 21, + + by_name = uint.MaxValue, + + + TCP_COM_VERSION = 0, + TCP_COM_FILE_LIST = 1, + TCP_COM_PASP_BROWSE = 3, + TCP_COM_PASP_DOWNLOAD = 4, + TCP_COM_PASP_FIND = 5, + TCP_COM_PROG_LIST = 6, + TCP_COM_PROG_DOWNLOAD = 7, + TCP_COM_SERVER_TIME = 8, + TCP_COM_DOWNLOAD_USOV = 9, + TCP_COM_SLIT_HISTORY = 10, + TCP_COM_KEEP_ALIVE = 11, + TCP_COM_VDP_CYCLE = 12, + TCP_COM_VDP_ACTIVE = 13, + TCP_COM_VDP_LAST_CYCLE = 14, + TCP_COM_RMT_WATCHDOG = 15, + TCP_COM_SET_RMT_WATCHDOG = 16, + TCP_COM_PRINT_JOB = 17, + TCP_COM_PASP_FIND2 = 18, + TCP_COM_PASP_BROWSE2 = 19, + TCP_COM_ARCH_HISTORY = 20, + TCP_COM_DOWNLOAD_USOV_NH = 22, + TCP_COM_DIR_BROWSE = 23, + TCP_COM_VDP_SIM_MED = 24, + TCP_COM_VDP_FLAGS = 25, + TCP_COM_USER_FLAGS = 26, + TCP_COM_USER_MOTD = 27, + TCP_COM_USER_MAIL = 28, + TCP_COM_DOWNLOAD_TVSO = 29, + TCP_COM_PASP_DOWNLOAD_TVSO = 30, + TCP_COM_PASP_FIND_TVSO = 31, + TCP_COM_PASP_BROWSE_TVSO = 32, + TCP_COM_KORPUS_CYCLE = 33, + TCP_COM_KORPUS_LAST_CYCLE = 34, + TCP_COM_DOWNLOAD_FDAN = 35, + TCP_COM_CLIENT_VERSION = 36, + TCP_COM_MEASURE_ID = 37, + TCP_COM_READ_VDP_CONFIG = 38, + TCP_COM_WRITE_VDP_CONFIG = 39, + TCP_COM_READ_TVSO_CONFIG = 40, + TCP_COM_DELETE_VDP_CONFIG = 41, + TCP_COM_GET_PLAV_PERSONAL = 42, + TCP_COM_GET_SERVER_INFO = 43, + TCP_COM_CTRL_SPLIT = 44, + TCP_COM_CTRL_SET_TIME = 45, + TCP_COM_CTRL_END_TC = 46, + TCP_COM_CTRL_REMOVE = 47, + TCP_COM_CTRL_SPOOL = 48, + TCP_COM_SAVE_PASPORT = 49, + TCP_COM_SAVE_PASPORT_90 = 50, + TCP_COM_FIND_TIME_BUGS = 51, + TCP_COM_UPDATE_PASPORT = 52, + TCP_COM_GET_PASP_BY_ID = 53, + TCP_COM_FIND_PASP_BY_TEMP = 54, + TCP_COM_GET_SPLAV_LIST = 55, + TCP_COM_GET_FIELD_VAL_LIST = 56, + TCP_COM_GET_PLAV_LIST_FORM = 57, + TCP_COM_GET_PASP_BY_PRIV = 58, + TCP_COM_PRINT_JOB_2 = 59, + TCP_COM_GET_PASP_BY_NAME = 60, + TCP_COM_GET_PASP_BY_ID_90 = 61, + TCP_COM_FIND_PASP_BY_TEMP_90 = 62, + TCP_COM_GET_PASP_BY_PRIV_90 = 63, + TCP_COM_GET_PASP_BY_NAME_90 = 64, + TCP_COM_GET_PLAV_LIST_FORM_90 = 65, + TCP_COM_CTRL_SPLIT_DB = 66, + TCP_COM_CTRL_SET_TIME_DB = 67, + TCP_COM_CTRL_REMOVE_DB = 68, + TCP_COM_UPDATE_STAT = 69, + TCP_COM_GET_CUR_PARAMS_ARR = 70, + TCP_COM_GET_CUR_PARAMS = 71, + TCP_COM_GET_CUR_PARAMS_ARR_5 = 72, + TCP_COM_GET_CUR_PARAMS_5 = 73, + TCP_COM_FIX_DB_CYCLE = 74, + } /// IP адрес СТП. public string Ip { get { return ip; } set { ip = (IPAddress.TryParse(value, out _)) ? value : ip; } } - private int port = 1070; + private string ip = "127.0.0.1"; /// Порт СТП. public int Port { get { return port; } set { port = (value < 1) ? 1 : (value > 65535) ? 65535 : value; } } - private int retryCount = 3; + private int port = 1070; /// Количество попыток переподключения. public int RetryCount { get { return retryCount; } set { retryCount = value < 1 ? 1 : value; } } - private int retryInterval = 1; + private int retryCount = 3; /// Время в секундах между попытками переподключения. public int RetryInterval { get { return retryInterval; } set { retryInterval = (value < 1) ? 1 : value; } } - private TcpClient tcpC = null; - /// Коды для работы с СТП. - public enum Code : uint - { - check_command = uint.MaxValue, - version = 0, - pasp_download = 4, - download_nh = 21, - dir_browse = 23, - user_flags = 26 - } + private int retryInterval = 1; + //Construction public NETClient() @@ -80,13 +248,13 @@ namespace DataClient tryCounts = (tryCounts < 1) ? 1 : tryCounts; awaitInterval = (awaitInterval < 1) ? 1 : awaitInterval; var res = new List(); - if (!ns.CanRead) throw new Exception("NetworkStream not access to Read."); - if (!ns.Socket.Connected) throw new Exception("NetworkStream not connected to server."); + if (!ns.CanRead) throw new InvalidOperationException("NetworkStream not access to Read."); + if (!ns.Socket.Connected) throw new InvalidOperationException("NetworkStream not connected to server."); int tryCount = 0; do { - if (!ns.Socket.Connected) throw new Exception("Server drop connection."); + if (!ns.Socket.Connected) throw new InvalidOperationException("Server drop connection."); if (!ns.DataAvailable) { tryCount++; @@ -104,20 +272,20 @@ namespace DataClient /// Открытый сетевой поток. /// Кол-во получаемый байт. /// Массив байт, равный заданному кол-ву. - private byte[] ReceiveBytesFixSize(NetworkStream ns, int size, int awaitInterval = 1, int tryCounts = 3) + private byte[] ReceiveBytesFixSize(NetworkStream ns, uint size, int awaitInterval = 1, int tryCounts = 3) { tryCounts = (tryCounts < 1) ? 1 : tryCounts; awaitInterval = (awaitInterval < 1) ? 1 : awaitInterval; - if (size <= 0) throw new Exception("Size can't be less or zero."); - if (!ns.CanRead) throw new Exception("NetworkStream not access to Read."); - if (!ns.Socket.Connected) throw new Exception("NetworkStream not connected to server."); + if (size == 0) throw new ArgumentException("Size can't be zero."); + if (!ns.CanRead) throw new InvalidOperationException("NetworkStream not access to Read."); + if (!ns.Socket.Connected) throw new InvalidOperationException("NetworkStream not connected to server."); var res = new byte[size]; var countSize = 0; int tryCount = 0; do { - if (!ns.Socket.Connected) throw new Exception("Server drop connection."); + if (!ns.Socket.Connected) throw new InvalidOperationException("Server drop connection."); if (!ns.DataAvailable) { tryCount++; @@ -131,7 +299,7 @@ namespace DataClient if (countSize == size) return res; } while (tryCount < tryCounts); - throw new Exception("Can't get all bytes."); + return res; } /// Отправить массив байт на СТП. /// Открытый сетевой поток. @@ -139,8 +307,8 @@ namespace DataClient /// Результат отправки. private bool SendBytes(NetworkStream ns, byte[] arr) { - if (!ns.CanWrite) throw new Exception("NetworkStream not access to Write."); - if (!ns.Socket.Connected) throw new Exception("NetworkStream not connected to server."); + if (!ns.CanWrite) throw new InvalidOperationException("NetworkStream not access to Write."); + if (!ns.Socket.Connected) throw new InvalidOperationException("NetworkStream not connected to server."); try { ns.Write(arr, 0, arr.Length); } catch { return false; } return true; @@ -153,7 +321,7 @@ namespace DataClient /// Передаваемая строка. /// Байты после передаваемой строкой. /// Массив байт для отправки на СТП. - public byte[] CreateCode(uint code, byte[] prefix = null, string val = null, byte[] postfix = null) + public byte[] CreateCode(uint code, string val = null, byte[] prefix = null, byte[] postfix = null) { var res = new List(); res.AddRange(BitConverter.GetBytes(code)); @@ -197,7 +365,7 @@ namespace DataClient /// Массив байт для отправки. public void SendBytes(byte[] send) { - if (!Connected()) throw new Exception("Connection not exist."); + if (!Connected()) throw new InvalidOperationException("Connection not exist."); var ns = tcpC.GetStream(); SendBytes(ns, send); } @@ -206,7 +374,7 @@ namespace DataClient public byte[] ReceiveBytes() { var res = new List(); - if (!Connected()) throw new Exception("Connection not exist."); + if (!Connected()) throw new InvalidOperationException("Connection not exist."); var ns = tcpC.GetStream(); res.AddRange(ReceiveBytesUnknown(ns)); return res.ToArray(); @@ -214,7 +382,7 @@ namespace DataClient /// Получить определенное количество байт. /// Количество байт. /// Массив байт. - public byte[] ReceiveBytes(int size) + public byte[] ReceiveBytes(uint size) { var res = new List(); if (!Connected()) throw new Exception("Connection not exist."); @@ -222,21 +390,127 @@ namespace DataClient res.AddRange(ReceiveBytesFixSize(ns, size)); return res.ToArray(); } + + //SubMain functions + /// Внутренняя функция получения файлов. + /// Код, который будет отправлен на сервер. + /// Дата. Из неё формируется строка в формате YYYMMDD + /// Номер печи. 00 - общецеховые параметры. + /// Индекс файла. От 0 до 15. + /// + private byte[] GetFile(Code code, DateTime date, int vdp, int idx) + { + if (code != Code.download_nh && code != Code.download) + throw new ArgumentException("Wrong code for this method."); + if (stat.stat == NetStatus.Status.in_progress) + throw new InvalidOperationException("Previous method not finished."); + stat.stat = NetStatus.Status.in_progress; + bool flag_connection = !Connected(); + if (flag_connection) Connect(); + if (!Connected()) + { + stat.stat = NetStatus.Status.complete; + throw new InvalidOperationException("Can't create connection."); + } + var str = date.ToString("yyyyMMdd") + "." + vdp.ToString("D2") + (idx % 16).ToString("X1"); + try { SendBytes(CreateCode((uint)code, str)); } + catch (Exception e) + { + stat.stat = NetStatus.Status.complete; + if (flag_connection) Close(); + throw new InvalidOperationException("Can't send code.", e); + } + + var res = new List(); + var flag_end = false; + try + { + do + { + var tmp = ReceiveBytes(1); + switch (tmp[0]) + { + case 0x00: + stat.stat = NetStatus.Status.complete; + flag_end = true; + break; + case 0x01: + var blockSize = BitConverter.ToUInt32(ReceiveBytes(4)); + res.AddRange(ReceiveBytes(blockSize)); + stat.size = (uint)res.Count; + break; + case 0x02: + var fullSize = BitConverter.ToUInt32(ReceiveBytes(4)); + stat.fullSize = fullSize; + break; + case 0xff: + stat.stat = NetStatus.Status.complete; + flag_end = true; + break; + } + } while (!flag_end); + } + catch (Exception e) + { + throw new InvalidOperationException("Can't download file.", e); + } + finally + { + stat.stat = NetStatus.Status.complete; + if (flag_connection) Close(); + } + return res.ToArray(); + } + + //COMMANDS FUNCTIONS /// Получение файла данных (байтами) с СТП. /// Дата. Из неё формируется строка в формате YYYMMDD /// Номер печи. 00 - общецеховые параметры. /// Индекс файла. От 0 до 15. /// Обработанный массив байт. - public byte[] GetFile(DateTime date, int vdp, int idx) + public byte[] Full_Download_NH(DateTime date, int vdp, int idx) { + try { return GetFile(Code.download_nh, date, vdp, idx); } + catch { throw; } + } + /// Получение файла данных (байтами) с СТП. + /// Дата. Из неё формируется строка в формате YYYMMDD + /// Номер печи. 00 - общецеховые параметры. + /// Индекс файла. От 0 до 15. + /// Обработанный массив байт. + public byte[] Full_Download(DateTime date, int vdp, int idx) + { + try { return GetFile(Code.download, date, vdp, idx); } + catch { throw; } + } + public byte[] Full_By_Name(string val) + { + if (string.IsNullOrEmpty(val)) return null; bool flag_connection = !Connected(); - if (!Connected()) Connect(); - if (!Connected()) throw new Exception("Can't create connection."); - var str = date.ToString("yyyyMMdd") + vdp.ToString("D2") + (idx % 16).ToString("X1"); - SendBytes(CreateCode((uint)Code.download_nh, null, str)); - var res = ReceiveBytes(); - if (flag_connection) Close(); - return res; + if (flag_connection) Connect(); + if (!Connected()) { throw new InvalidOperationException("Can't create connection."); } + try { SendBytes(CreateCode((uint)Code.by_name, val)); } + catch (Exception e) + { + if (flag_connection) Close(); + throw new InvalidOperationException("Can't send code.", e); + } + try + { + var tmp = ReceiveBytes(1); + return tmp[0] switch + { + 0x00 => null, + 0x01 => ReceiveBytes(4), + _ => throw new InvalidOperationException("Wrong answer from server."), + }; + } + catch (Exception e) { throw new InvalidOperationException("Can't receive code.", e); } + finally { if (flag_connection) Close(); } + } + public string[] Full_Dir_Browse(string dir) + { + } } } diff --git a/DataClient/Struct.cs b/DataClient/Struct.cs index d550387..ca31497 100644 --- a/DataClient/Struct.cs +++ b/DataClient/Struct.cs @@ -27,4 +27,16 @@ namespace DataClient.Struct dir = Dir; } } + public class NetStatus + { + public enum Status + { + wait = 0, + in_progress = 1, + complete = 2 + } + public uint fullSize = 0; + public uint size = 0; + public Status stat = Status.wait; + } } diff --git a/DataClient/bin/Debug/net5.0/Config/config.json b/DataClient/bin/Debug/net5.0/Config/config.json new file mode 100644 index 0000000..f71d35f --- /dev/null +++ b/DataClient/bin/Debug/net5.0/Config/config.json @@ -0,0 +1,16 @@ +{ + "servers": [ + { + "name": "STP 1", + "ip": "10.10.45.151", + "port": 1070, + "dir": "Y:\\data" + }, + { + "name": "STP 2", + "ip": "10.10.45.152", + "port": 1070, + "dir": "Z:\\data" + } + ] +} diff --git a/DataClient/bin/Debug/net5.0/DataClient.deps.json b/DataClient/bin/Debug/net5.0/DataClient.deps.json new file mode 100644 index 0000000..9ef3325 --- /dev/null +++ b/DataClient/bin/Debug/net5.0/DataClient.deps.json @@ -0,0 +1,199 @@ +{ + "runtimeTarget": { + "name": ".NETCoreApp,Version=v5.0", + "signature": "" + }, + "compilationOptions": {}, + "targets": { + ".NETCoreApp,Version=v5.0": { + "DataClient/0.0.3": { + "dependencies": { + "NLog": "4.7.10", + "NLog.Extensions.Logging": "1.7.2", + "Newtonsoft.Json": "13.0.1" + }, + "runtime": { + "DataClient.dll": {} + } + }, + "Microsoft.Extensions.Configuration.Abstractions/5.0.0": { + "dependencies": { + "Microsoft.Extensions.Primitives": "5.0.0" + }, + "runtime": { + "lib/netstandard2.0/Microsoft.Extensions.Configuration.Abstractions.dll": { + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" + } + } + }, + "Microsoft.Extensions.DependencyInjection/5.0.0": { + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "5.0.0" + }, + "runtime": { + "lib/net5.0/Microsoft.Extensions.DependencyInjection.dll": { + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" + } + } + }, + "Microsoft.Extensions.DependencyInjection.Abstractions/5.0.0": { + "runtime": { + "lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll": { + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" + } + } + }, + "Microsoft.Extensions.Logging/5.0.0": { + "dependencies": { + "Microsoft.Extensions.DependencyInjection": "5.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "5.0.0", + "Microsoft.Extensions.Logging.Abstractions": "5.0.0", + "Microsoft.Extensions.Options": "5.0.0" + }, + "runtime": { + "lib/netstandard2.1/Microsoft.Extensions.Logging.dll": { + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" + } + } + }, + "Microsoft.Extensions.Logging.Abstractions/5.0.0": { + "runtime": { + "lib/netstandard2.0/Microsoft.Extensions.Logging.Abstractions.dll": { + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" + } + } + }, + "Microsoft.Extensions.Options/5.0.0": { + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "5.0.0", + "Microsoft.Extensions.Primitives": "5.0.0" + }, + "runtime": { + "lib/net5.0/Microsoft.Extensions.Options.dll": { + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" + } + } + }, + "Microsoft.Extensions.Primitives/5.0.0": { + "runtime": { + "lib/netcoreapp3.0/Microsoft.Extensions.Primitives.dll": { + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" + } + } + }, + "Newtonsoft.Json/13.0.1": { + "runtime": { + "lib/netstandard2.0/Newtonsoft.Json.dll": { + "assemblyVersion": "13.0.0.0", + "fileVersion": "13.0.1.25517" + } + } + }, + "NLog/4.7.10": { + "runtime": { + "lib/netstandard2.0/NLog.dll": { + "assemblyVersion": "4.0.0.0", + "fileVersion": "4.7.10.13013" + } + } + }, + "NLog.Extensions.Logging/1.7.2": { + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "5.0.0", + "Microsoft.Extensions.Logging": "5.0.0", + "NLog": "4.7.10" + }, + "runtime": { + "lib/net5.0/NLog.Extensions.Logging.dll": { + "assemblyVersion": "1.0.0.0", + "fileVersion": "1.7.2.1548" + } + } + } + } + }, + "libraries": { + "DataClient/0.0.3": { + "type": "project", + "serviceable": false, + "sha512": "" + }, + "Microsoft.Extensions.Configuration.Abstractions/5.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-ETjSBHMp3OAZ4HxGQYpwyGsD8Sw5FegQXphi0rpoGMT74S4+I2mm7XJEswwn59XAaKOzC15oDSOWEE8SzDCd6Q==", + "path": "microsoft.extensions.configuration.abstractions/5.0.0", + "hashPath": "microsoft.extensions.configuration.abstractions.5.0.0.nupkg.sha512" + }, + "Microsoft.Extensions.DependencyInjection/5.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-Rc2kb/p3Ze6cP6rhFC3PJRdWGbLvSHZc0ev7YlyeU6FmHciDMLrhoVoTUEzKPhN5ZjFgKF1Cf5fOz8mCMIkvpA==", + "path": "microsoft.extensions.dependencyinjection/5.0.0", + "hashPath": "microsoft.extensions.dependencyinjection.5.0.0.nupkg.sha512" + }, + "Microsoft.Extensions.DependencyInjection.Abstractions/5.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-ORj7Zh81gC69TyvmcUm9tSzytcy8AVousi+IVRAI8nLieQjOFryRusSFh7+aLk16FN9pQNqJAiMd7BTKINK0kA==", + "path": "microsoft.extensions.dependencyinjection.abstractions/5.0.0", + "hashPath": "microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg.sha512" + }, + "Microsoft.Extensions.Logging/5.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-MgOwK6tPzB6YNH21wssJcw/2MKwee8b2gI7SllYfn6rvTpIrVvVS5HAjSU2vqSku1fwqRvWP0MdIi14qjd93Aw==", + "path": "microsoft.extensions.logging/5.0.0", + "hashPath": "microsoft.extensions.logging.5.0.0.nupkg.sha512" + }, + "Microsoft.Extensions.Logging.Abstractions/5.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-NxP6ahFcBnnSfwNBi2KH2Oz8Xl5Sm2krjId/jRR3I7teFphwiUoUeZPwTNA21EX+5PtjqmyAvKaOeBXcJjcH/w==", + "path": "microsoft.extensions.logging.abstractions/5.0.0", + "hashPath": "microsoft.extensions.logging.abstractions.5.0.0.nupkg.sha512" + }, + "Microsoft.Extensions.Options/5.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-CBvR92TCJ5uBIdd9/HzDSrxYak+0W/3+yxrNg8Qm6Bmrkh5L+nu6m3WeazQehcZ5q1/6dDA7J5YdQjim0165zg==", + "path": "microsoft.extensions.options/5.0.0", + "hashPath": "microsoft.extensions.options.5.0.0.nupkg.sha512" + }, + "Microsoft.Extensions.Primitives/5.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-cI/VWn9G1fghXrNDagX9nYaaB/nokkZn0HYAawGaELQrl8InSezfe9OnfPZLcJq3esXxygh3hkq2c3qoV3SDyQ==", + "path": "microsoft.extensions.primitives/5.0.0", + "hashPath": "microsoft.extensions.primitives.5.0.0.nupkg.sha512" + }, + "Newtonsoft.Json/13.0.1": { + "type": "package", + "serviceable": true, + "sha512": "sha512-ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==", + "path": "newtonsoft.json/13.0.1", + "hashPath": "newtonsoft.json.13.0.1.nupkg.sha512" + }, + "NLog/4.7.10": { + "type": "package", + "serviceable": true, + "sha512": "sha512-rcegW7kYOCjl7wX0SzsqpPBqnJ51JKi1WkYb6QBVX0Wc5IgH19Pv4t/co+T0s06OS0Ne44xgkY/mHg0PdrmJow==", + "path": "nlog/4.7.10", + "hashPath": "nlog.4.7.10.nupkg.sha512" + }, + "NLog.Extensions.Logging/1.7.2": { + "type": "package", + "serviceable": true, + "sha512": "sha512-0y1QziAUCdePQc4itPOQF3xDcs0iE9NHlIK0hE0eA0+Ef6E9dnJDPveNu7w2ckYaDfJIFHpOoLK8sZmNEyiBCw==", + "path": "nlog.extensions.logging/1.7.2", + "hashPath": "nlog.extensions.logging.1.7.2.nupkg.sha512" + } + } +} \ No newline at end of file diff --git a/DataClient/bin/Debug/net5.0/DataClient.dll b/DataClient/bin/Debug/net5.0/DataClient.dll new file mode 100644 index 0000000..d82d1d2 Binary files /dev/null and b/DataClient/bin/Debug/net5.0/DataClient.dll differ diff --git a/Test2/bin/Debug/net5.0/STPClient.pdb b/DataClient/bin/Debug/net5.0/DataClient.pdb similarity index 59% rename from Test2/bin/Debug/net5.0/STPClient.pdb rename to DataClient/bin/Debug/net5.0/DataClient.pdb index 838924c..c7e8e3d 100644 Binary files a/Test2/bin/Debug/net5.0/STPClient.pdb and b/DataClient/bin/Debug/net5.0/DataClient.pdb differ diff --git a/DataClient/bin/Debug/net5.0/ref/DataClient.dll b/DataClient/bin/Debug/net5.0/ref/DataClient.dll new file mode 100644 index 0000000..7a25400 Binary files /dev/null and b/DataClient/bin/Debug/net5.0/ref/DataClient.dll differ diff --git a/DataClient/obj/DataClient.csproj.nuget.dgspec.json b/DataClient/obj/DataClient.csproj.nuget.dgspec.json index 4b1431a..912f7b5 100644 --- a/DataClient/obj/DataClient.csproj.nuget.dgspec.json +++ b/DataClient/obj/DataClient.csproj.nuget.dgspec.json @@ -1,24 +1,25 @@ { "format": 1, "restore": { - "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": {} + "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": {} }, "projects": { - "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": { + "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": { "version": "0.0.3", "restore": { - "projectUniqueName": "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj", "projectName": "DataClient", - "projectPath": "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "F:\\GIT\\ASCKU_PC\\DataClient\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\DataClient\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -74,7 +75,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/DataClient/obj/DataClient.csproj.nuget.g.props b/DataClient/obj/DataClient.csproj.nuget.g.props index b7eb83f..471ec1a 100644 --- a/DataClient/obj/DataClient.csproj.nuget.g.props +++ b/DataClient/obj/DataClient.csproj.nuget.g.props @@ -5,14 +5,15 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\Admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\ + C:\Users\google\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\;C:\Program Files\dotnet\sdk\NuGetFallbackFolder PackageReference - 5.10.0 + 5.9.0 - + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) diff --git a/DataClient/obj/Debug/net5.0/DataClient.assets.cache b/DataClient/obj/Debug/net5.0/DataClient.assets.cache index aa7337b..520dc20 100644 Binary files a/DataClient/obj/Debug/net5.0/DataClient.assets.cache and b/DataClient/obj/Debug/net5.0/DataClient.assets.cache differ diff --git a/DataClient/obj/Debug/net5.0/DataClient.csproj.CoreCompileInputs.cache b/DataClient/obj/Debug/net5.0/DataClient.csproj.CoreCompileInputs.cache new file mode 100644 index 0000000..eee80e0 --- /dev/null +++ b/DataClient/obj/Debug/net5.0/DataClient.csproj.CoreCompileInputs.cache @@ -0,0 +1 @@ +898e6554eebd2f3d6753598716680015b14c74de diff --git a/DataClient/obj/Debug/net5.0/DataClient.csproj.FileListAbsolute.txt b/DataClient/obj/Debug/net5.0/DataClient.csproj.FileListAbsolute.txt new file mode 100644 index 0000000..a8405e3 --- /dev/null +++ b/DataClient/obj/Debug/net5.0/DataClient.csproj.FileListAbsolute.txt @@ -0,0 +1,13 @@ +D:\GIT\ASCKU_PC\DataClient\bin\Debug\net5.0\Config\config.json +D:\GIT\ASCKU_PC\DataClient\bin\Debug\net5.0\DataClient.deps.json +D:\GIT\ASCKU_PC\DataClient\bin\Debug\net5.0\DataClient.dll +D:\GIT\ASCKU_PC\DataClient\bin\Debug\net5.0\ref\DataClient.dll +D:\GIT\ASCKU_PC\DataClient\bin\Debug\net5.0\DataClient.pdb +D:\GIT\ASCKU_PC\DataClient\obj\Debug\net5.0\DataClient.csprojAssemblyReference.cache +D:\GIT\ASCKU_PC\DataClient\obj\Debug\net5.0\DataClient.GeneratedMSBuildEditorConfig.editorconfig +D:\GIT\ASCKU_PC\DataClient\obj\Debug\net5.0\DataClient.AssemblyInfoInputs.cache +D:\GIT\ASCKU_PC\DataClient\obj\Debug\net5.0\DataClient.AssemblyInfo.cs +D:\GIT\ASCKU_PC\DataClient\obj\Debug\net5.0\DataClient.csproj.CoreCompileInputs.cache +D:\GIT\ASCKU_PC\DataClient\obj\Debug\net5.0\DataClient.dll +D:\GIT\ASCKU_PC\DataClient\obj\Debug\net5.0\ref\DataClient.dll +D:\GIT\ASCKU_PC\DataClient\obj\Debug\net5.0\DataClient.pdb diff --git a/DataClient/obj/Debug/net5.0/DataClient.csprojAssemblyReference.cache b/DataClient/obj/Debug/net5.0/DataClient.csprojAssemblyReference.cache index 476a91a..f13f76b 100644 Binary files a/DataClient/obj/Debug/net5.0/DataClient.csprojAssemblyReference.cache and b/DataClient/obj/Debug/net5.0/DataClient.csprojAssemblyReference.cache differ diff --git a/DataClient/obj/Debug/net5.0/DataClient.dll b/DataClient/obj/Debug/net5.0/DataClient.dll new file mode 100644 index 0000000..d82d1d2 Binary files /dev/null and b/DataClient/obj/Debug/net5.0/DataClient.dll differ diff --git a/DataClient/obj/Debug/net5.0/DataClient.pdb b/DataClient/obj/Debug/net5.0/DataClient.pdb new file mode 100644 index 0000000..c7e8e3d Binary files /dev/null and b/DataClient/obj/Debug/net5.0/DataClient.pdb differ diff --git a/DataClient/obj/Debug/net5.0/ref/DataClient.dll b/DataClient/obj/Debug/net5.0/ref/DataClient.dll new file mode 100644 index 0000000..7a25400 Binary files /dev/null and b/DataClient/obj/Debug/net5.0/ref/DataClient.dll differ diff --git a/DataClient/obj/project.assets.json b/DataClient/obj/project.assets.json index 1a0a914..2656e41 100644 --- a/DataClient/obj/project.assets.json +++ b/DataClient/obj/project.assets.json @@ -361,25 +361,27 @@ ] }, "packageFolders": { - "C:\\Users\\Admin\\.nuget\\packages\\": {}, + "C:\\Users\\google\\.nuget\\packages\\": {}, "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}, - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {} + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}, + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} }, "project": { "version": "0.0.3", "restore": { - "projectUniqueName": "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj", "projectName": "DataClient", - "projectPath": "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "F:\\GIT\\ASCKU_PC\\DataClient\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\DataClient\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -435,7 +437,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/DataClient/obj/project.nuget.cache b/DataClient/obj/project.nuget.cache index 78d73f4..1486ebf 100644 --- a/DataClient/obj/project.nuget.cache +++ b/DataClient/obj/project.nuget.cache @@ -1,19 +1,19 @@ { "version": 2, - "dgSpecHash": "lCVOnkDSpCDkY6mFU39PPTK/8UioIwkzLSm5l9U0BI9kmvrQU3GBEeKlZLkvo3I3Vmgv8BfwOMFxbII4ikrnzA==", + "dgSpecHash": "fLzCMyL0TTYR6ScHYw8lseE4tuHRjlfRhsrbzgdqw/qeVRrQYigyT797G0cUiPOmrt1GVD0KWz3n3AZIE22bzQ==", "success": true, - "projectFilePath": "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj", + "projectFilePath": "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj", "expectedPackageFiles": [ - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.configuration.abstractions\\5.0.0\\microsoft.extensions.configuration.abstractions.5.0.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.dependencyinjection\\5.0.0\\microsoft.extensions.dependencyinjection.5.0.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\5.0.0\\microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.logging\\5.0.0\\microsoft.extensions.logging.5.0.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\5.0.0\\microsoft.extensions.logging.abstractions.5.0.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.options\\5.0.0\\microsoft.extensions.options.5.0.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.primitives\\5.0.0\\microsoft.extensions.primitives.5.0.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\newtonsoft.json\\13.0.1\\newtonsoft.json.13.0.1.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\nlog\\4.7.10\\nlog.4.7.10.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\nlog.extensions.logging\\1.7.2\\nlog.extensions.logging.1.7.2.nupkg.sha512" + "C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.configuration.abstractions\\5.0.0\\microsoft.extensions.configuration.abstractions.5.0.0.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.dependencyinjection\\5.0.0\\microsoft.extensions.dependencyinjection.5.0.0.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\5.0.0\\microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.logging\\5.0.0\\microsoft.extensions.logging.5.0.0.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\5.0.0\\microsoft.extensions.logging.abstractions.5.0.0.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.options\\5.0.0\\microsoft.extensions.options.5.0.0.nupkg.sha512", + "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" ], "logs": [] } \ No newline at end of file diff --git a/DataClients/obj/DataClients.csproj.nuget.dgspec.json b/DataClients/obj/DataClients.csproj.nuget.dgspec.json index f713d96..834aa6e 100644 --- a/DataClients/obj/DataClients.csproj.nuget.dgspec.json +++ b/DataClients/obj/DataClients.csproj.nuget.dgspec.json @@ -1,24 +1,25 @@ { "format": 1, "restore": { - "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": {} + "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": {} }, "projects": { - "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { + "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", "projectName": "DataClients", - "projectPath": "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "F:\\GIT\\ASCKU_PC\\DataClients\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\DataClients\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -34,8 +35,8 @@ "netstandard2.0": { "targetAlias": "netstandard2.0", "projectReferences": { - "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj" + "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj" } } } @@ -75,25 +76,26 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } }, - "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { + "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", "projectName": "SupportClasses", - "projectPath": "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "F:\\GIT\\ASCKU_PC\\SupportClasses\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -138,7 +140,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/DataClients/obj/DataClients.csproj.nuget.g.props b/DataClients/obj/DataClients.csproj.nuget.g.props index b7eb83f..471ec1a 100644 --- a/DataClients/obj/DataClients.csproj.nuget.g.props +++ b/DataClients/obj/DataClients.csproj.nuget.g.props @@ -5,14 +5,15 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\Admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\ + C:\Users\google\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\;C:\Program Files\dotnet\sdk\NuGetFallbackFolder PackageReference - 5.10.0 + 5.9.0 - + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) diff --git a/DataClients/obj/DataClients.csproj.nuget.g.targets b/DataClients/obj/DataClients.csproj.nuget.g.targets index 8f2d2d6..f09823b 100644 --- a/DataClients/obj/DataClients.csproj.nuget.g.targets +++ b/DataClients/obj/DataClients.csproj.nuget.g.targets @@ -4,6 +4,6 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - + \ No newline at end of file diff --git a/DataClients/obj/Debug/netstandard2.0/DataClients.assets.cache b/DataClients/obj/Debug/netstandard2.0/DataClients.assets.cache index 02bae86..bfe4fad 100644 Binary files a/DataClients/obj/Debug/netstandard2.0/DataClients.assets.cache and b/DataClients/obj/Debug/netstandard2.0/DataClients.assets.cache differ diff --git a/DataClients/obj/Debug/netstandard2.0/DataClients.csprojAssemblyReference.cache b/DataClients/obj/Debug/netstandard2.0/DataClients.csprojAssemblyReference.cache index 3b3624c..da845a5 100644 Binary files a/DataClients/obj/Debug/netstandard2.0/DataClients.csprojAssemblyReference.cache and b/DataClients/obj/Debug/netstandard2.0/DataClients.csprojAssemblyReference.cache differ diff --git a/DataClients/obj/project.assets.json b/DataClients/obj/project.assets.json index 64f2ee8..35350d4 100644 --- a/DataClients/obj/project.assets.json +++ b/DataClients/obj/project.assets.json @@ -321,25 +321,27 @@ ] }, "packageFolders": { - "C:\\Users\\Admin\\.nuget\\packages\\": {}, + "C:\\Users\\google\\.nuget\\packages\\": {}, "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}, - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {} + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}, + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", "projectName": "DataClients", - "projectPath": "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "F:\\GIT\\ASCKU_PC\\DataClients\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\DataClients\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -355,8 +357,8 @@ "netstandard2.0": { "targetAlias": "netstandard2.0", "projectReferences": { - "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj" + "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj" } } } @@ -396,7 +398,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/DataClients/obj/project.nuget.cache b/DataClients/obj/project.nuget.cache index c9f07a8..9f967c1 100644 --- a/DataClients/obj/project.nuget.cache +++ b/DataClients/obj/project.nuget.cache @@ -1,14 +1,14 @@ { "version": 2, - "dgSpecHash": "Jx4UMAAsvJkZ+kUms9DHtVovb0p8Xu9CiAkFm801/gOSfERupzhTpmCqqA3eJA4Kluy6pj25MIa0rsKqVEe+DQ==", + "dgSpecHash": "uA9rgRXaUEUYoOTmuecMN9sEzQQ9h4wmOmVaX+dlb8QuS5RVxDdEJxCv+xV1gZk+Klv90ZG2LpnZBC8Qo/W4FA==", "success": true, - "projectFilePath": "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", + "projectFilePath": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", "expectedPackageFiles": [ - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.netcore.platforms\\1.1.0\\microsoft.netcore.platforms.1.1.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\netstandard.library\\2.0.3\\netstandard.library.2.0.3.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\sharpziplib\\1.2.0\\sharpziplib.1.2.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\system.runtime.compilerservices.unsafe\\4.7.1\\system.runtime.compilerservices.unsafe.4.7.1.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\system.text.encoding.codepages\\4.7.1\\system.text.encoding.codepages.4.7.1.nupkg.sha512" + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.netcore.platforms\\1.1.0\\microsoft.netcore.platforms.1.1.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\netstandard.library\\2.0.3\\netstandard.library.2.0.3.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\sharpziplib\\1.2.0\\sharpziplib.1.2.0.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\system.runtime.compilerservices.unsafe\\4.7.1\\system.runtime.compilerservices.unsafe.4.7.1.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\system.text.encoding.codepages\\4.7.1\\system.text.encoding.codepages.4.7.1.nupkg.sha512" ], "logs": [] } \ No newline at end of file diff --git a/Korp90TimePasport/obj/Debug/netcoreapp3.1/Korp90TimePasport.assets.cache b/Korp90TimePasport/obj/Debug/netcoreapp3.1/Korp90TimePasport.assets.cache index cfa5733..874c649 100644 Binary files a/Korp90TimePasport/obj/Debug/netcoreapp3.1/Korp90TimePasport.assets.cache and b/Korp90TimePasport/obj/Debug/netcoreapp3.1/Korp90TimePasport.assets.cache differ diff --git a/Korp90TimePasport/obj/Debug/netcoreapp3.1/Korp90TimePasport.csprojAssemblyReference.cache b/Korp90TimePasport/obj/Debug/netcoreapp3.1/Korp90TimePasport.csprojAssemblyReference.cache index 5e4020e..8ec1903 100644 Binary files a/Korp90TimePasport/obj/Debug/netcoreapp3.1/Korp90TimePasport.csprojAssemblyReference.cache and b/Korp90TimePasport/obj/Debug/netcoreapp3.1/Korp90TimePasport.csprojAssemblyReference.cache differ diff --git a/Korp90TimePasport/obj/Korp90TimePasport.csproj.nuget.dgspec.json b/Korp90TimePasport/obj/Korp90TimePasport.csproj.nuget.dgspec.json index 4bed0d5..14b9b41 100644 --- a/Korp90TimePasport/obj/Korp90TimePasport.csproj.nuget.dgspec.json +++ b/Korp90TimePasport/obj/Korp90TimePasport.csproj.nuget.dgspec.json @@ -1,24 +1,25 @@ { "format": 1, "restore": { - "F:\\GIT\\ASCKU_PC\\Korp90TimePasport\\Korp90TimePasport.csproj": {} + "D:\\GIT\\ASCKU_PC\\Korp90TimePasport\\Korp90TimePasport.csproj": {} }, "projects": { - "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { + "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", "projectName": "DataClients", - "projectPath": "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "F:\\GIT\\ASCKU_PC\\DataClients\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\DataClients\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -34,8 +35,8 @@ "netstandard2.0": { "targetAlias": "netstandard2.0", "projectReferences": { - "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj" + "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj" } } } @@ -75,25 +76,26 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } }, - "F:\\GIT\\ASCKU_PC\\Korp90TimePasport\\Korp90TimePasport.csproj": { + "D:\\GIT\\ASCKU_PC\\Korp90TimePasport\\Korp90TimePasport.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "F:\\GIT\\ASCKU_PC\\Korp90TimePasport\\Korp90TimePasport.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\Korp90TimePasport\\Korp90TimePasport.csproj", "projectName": "Korp90TimePasport", - "projectPath": "F:\\GIT\\ASCKU_PC\\Korp90TimePasport\\Korp90TimePasport.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "F:\\GIT\\ASCKU_PC\\Korp90TimePasport\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\Korp90TimePasport\\Korp90TimePasport.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\Korp90TimePasport\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -109,8 +111,8 @@ "netcoreapp3.1": { "targetAlias": "netcoreapp3.1", "projectReferences": { - "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj" + "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj" } } } @@ -145,25 +147,26 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } }, - "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { + "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", "projectName": "SupportClasses", - "projectPath": "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "F:\\GIT\\ASCKU_PC\\SupportClasses\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -208,7 +211,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/Korp90TimePasport/obj/Korp90TimePasport.csproj.nuget.g.props b/Korp90TimePasport/obj/Korp90TimePasport.csproj.nuget.g.props index b7eb83f..471ec1a 100644 --- a/Korp90TimePasport/obj/Korp90TimePasport.csproj.nuget.g.props +++ b/Korp90TimePasport/obj/Korp90TimePasport.csproj.nuget.g.props @@ -5,14 +5,15 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\Admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\ + C:\Users\google\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\;C:\Program Files\dotnet\sdk\NuGetFallbackFolder PackageReference - 5.10.0 + 5.9.0 - + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) diff --git a/Korp90TimePasport/obj/project.assets.json b/Korp90TimePasport/obj/project.assets.json index 00388ce..980ee1e 100644 --- a/Korp90TimePasport/obj/project.assets.json +++ b/Korp90TimePasport/obj/project.assets.json @@ -224,25 +224,27 @@ ] }, "packageFolders": { - "C:\\Users\\Admin\\.nuget\\packages\\": {}, + "C:\\Users\\google\\.nuget\\packages\\": {}, "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}, - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {} + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}, + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "F:\\GIT\\ASCKU_PC\\Korp90TimePasport\\Korp90TimePasport.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\Korp90TimePasport\\Korp90TimePasport.csproj", "projectName": "Korp90TimePasport", - "projectPath": "F:\\GIT\\ASCKU_PC\\Korp90TimePasport\\Korp90TimePasport.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "F:\\GIT\\ASCKU_PC\\Korp90TimePasport\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\Korp90TimePasport\\Korp90TimePasport.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\Korp90TimePasport\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -258,8 +260,8 @@ "netcoreapp3.1": { "targetAlias": "netcoreapp3.1", "projectReferences": { - "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj" + "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj" } } } @@ -294,7 +296,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/Korp90TimePasport/obj/project.nuget.cache b/Korp90TimePasport/obj/project.nuget.cache index 801d03a..9ece160 100644 --- a/Korp90TimePasport/obj/project.nuget.cache +++ b/Korp90TimePasport/obj/project.nuget.cache @@ -1,13 +1,13 @@ { "version": 2, - "dgSpecHash": "tizkZ0Ysdd44pdYZUmokM3n1pLd+X36F8QIbewGPbBzcEE9AOxiJJ7sw+9GeXazssgleO65MTrKw5IrjzxgfSg==", + "dgSpecHash": "AqbvvkDwL7rcBYkLzhlGt3MNX9HhqeqsJEu5ffbVRs0+3TsQS/BVQ91hVOf+q+SExRT+Ex2NuehhNNw64BSdsA==", "success": true, - "projectFilePath": "F:\\GIT\\ASCKU_PC\\Korp90TimePasport\\Korp90TimePasport.csproj", + "projectFilePath": "D:\\GIT\\ASCKU_PC\\Korp90TimePasport\\Korp90TimePasport.csproj", "expectedPackageFiles": [ - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.netcore.platforms\\5.0.0\\microsoft.netcore.platforms.5.0.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\sharpziplib\\1.2.0\\sharpziplib.1.2.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\system.data.odbc\\5.0.0\\system.data.odbc.5.0.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\system.text.encoding.codepages\\4.7.1\\system.text.encoding.codepages.4.7.1.nupkg.sha512" + "C:\\Users\\google\\.nuget\\packages\\microsoft.netcore.platforms\\5.0.0\\microsoft.netcore.platforms.5.0.0.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\sharpziplib\\1.2.0\\sharpziplib.1.2.0.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\system.data.odbc\\5.0.0\\system.data.odbc.5.0.0.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\system.text.encoding.codepages\\4.7.1\\system.text.encoding.codepages.4.7.1.nupkg.sha512" ], "logs": [] } \ No newline at end of file diff --git a/Mailing/obj/Debug/netcoreapp3.1/Mailing.assets.cache b/Mailing/obj/Debug/netcoreapp3.1/Mailing.assets.cache index 58084fc..4473545 100644 Binary files a/Mailing/obj/Debug/netcoreapp3.1/Mailing.assets.cache and b/Mailing/obj/Debug/netcoreapp3.1/Mailing.assets.cache differ diff --git a/Mailing/obj/Debug/netcoreapp3.1/Mailing.csprojAssemblyReference.cache b/Mailing/obj/Debug/netcoreapp3.1/Mailing.csprojAssemblyReference.cache index 41e2603..a6187b2 100644 Binary files a/Mailing/obj/Debug/netcoreapp3.1/Mailing.csprojAssemblyReference.cache and b/Mailing/obj/Debug/netcoreapp3.1/Mailing.csprojAssemblyReference.cache differ diff --git a/Mailing/obj/Mailing.csproj.nuget.dgspec.json b/Mailing/obj/Mailing.csproj.nuget.dgspec.json index b0b4f86..ed2730a 100644 --- a/Mailing/obj/Mailing.csproj.nuget.dgspec.json +++ b/Mailing/obj/Mailing.csproj.nuget.dgspec.json @@ -1,24 +1,25 @@ { "format": 1, "restore": { - "F:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj": {} + "D:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj": {} }, "projects": { - "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { + "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", "projectName": "DataClients", - "projectPath": "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "F:\\GIT\\ASCKU_PC\\DataClients\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\DataClients\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -34,8 +35,8 @@ "netstandard2.0": { "targetAlias": "netstandard2.0", "projectReferences": { - "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj" + "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj" } } } @@ -75,25 +76,26 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } }, - "F:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj": { + "D:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "F:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj", "projectName": "Mailing", - "projectPath": "F:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "F:\\GIT\\ASCKU_PC\\Mailing\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\Mailing\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -109,20 +111,20 @@ "netcoreapp3.1": { "targetAlias": "netcoreapp3.1", "projectReferences": { - "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj" + "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj" }, - "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" }, - "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj" }, - "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" }, - "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" } } } @@ -157,25 +159,26 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } }, - "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { + "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { "version": "3.0.0", "restore": { - "projectUniqueName": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", "projectName": "MigraDoc.DocumentObjectModel", - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -224,25 +227,26 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } }, - "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": { + "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": { "version": "3.0.0", "restore": { - "projectUniqueName": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", "projectName": "MigraDoc.Rendering", - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -258,14 +262,14 @@ "netstandard2.0": { "targetAlias": "netstandard2.0", "projectReferences": { - "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" }, - "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" }, - "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" } } } @@ -301,25 +305,26 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } }, - "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { "version": "3.0.0", "restore": { - "projectUniqueName": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", "projectName": "PdfSharp.Charting", - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -335,8 +340,8 @@ "netstandard2.0": { "targetAlias": "netstandard2.0", "projectReferences": { - "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" } } } @@ -372,25 +377,26 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } }, - "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { "version": "3.0.0", "restore": { - "projectUniqueName": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", "projectName": "PdfSharp", - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -439,25 +445,26 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } }, - "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { + "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", "projectName": "SupportClasses", - "projectPath": "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "F:\\GIT\\ASCKU_PC\\SupportClasses\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -502,7 +509,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/Mailing/obj/Mailing.csproj.nuget.g.props b/Mailing/obj/Mailing.csproj.nuget.g.props index b7eb83f..471ec1a 100644 --- a/Mailing/obj/Mailing.csproj.nuget.g.props +++ b/Mailing/obj/Mailing.csproj.nuget.g.props @@ -5,14 +5,15 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\Admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\ + C:\Users\google\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\;C:\Program Files\dotnet\sdk\NuGetFallbackFolder PackageReference - 5.10.0 + 5.9.0 - + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) diff --git a/Mailing/obj/project.assets.json b/Mailing/obj/project.assets.json index b4a69a2..164179a 100644 --- a/Mailing/obj/project.assets.json +++ b/Mailing/obj/project.assets.json @@ -334,25 +334,27 @@ ] }, "packageFolders": { - "C:\\Users\\Admin\\.nuget\\packages\\": {}, + "C:\\Users\\google\\.nuget\\packages\\": {}, "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}, - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {} + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}, + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "F:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj", "projectName": "Mailing", - "projectPath": "F:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "F:\\GIT\\ASCKU_PC\\Mailing\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\Mailing\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -368,20 +370,20 @@ "netcoreapp3.1": { "targetAlias": "netcoreapp3.1", "projectReferences": { - "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj" + "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj" }, - "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" }, - "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj" }, - "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" }, - "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" } } } @@ -416,7 +418,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/Mailing/obj/project.nuget.cache b/Mailing/obj/project.nuget.cache index bb3fe7f..0195330 100644 --- a/Mailing/obj/project.nuget.cache +++ b/Mailing/obj/project.nuget.cache @@ -1,14 +1,14 @@ { "version": 2, - "dgSpecHash": "LJqCrJsyNB9LytCuT4dE39e7zbLIz6i/iKg/2yMtD+s0rFsro9NxxBVHLDsZsfBhQhHHeVcucr71wz0QRgMzUw==", + "dgSpecHash": "Fq2IpnyHMNBQTnMq0ZCrHwoCRgbhW2V3rILfncJWwkSpZ1dRVvNmfB6O7vhaEKYd5vbV0iFcMdt415hrQJ6Sog==", "success": true, - "projectFilePath": "F:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj", + "projectFilePath": "D:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj", "expectedPackageFiles": [ - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.netcore.platforms\\3.1.1\\microsoft.netcore.platforms.3.1.1.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.win32.systemevents\\4.5.0\\microsoft.win32.systemevents.4.5.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\sharpziplib\\1.2.0\\sharpziplib.1.2.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\system.drawing.common\\4.5.0\\system.drawing.common.4.5.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\system.text.encoding.codepages\\4.7.1\\system.text.encoding.codepages.4.7.1.nupkg.sha512" + "C:\\Users\\google\\.nuget\\packages\\microsoft.netcore.platforms\\3.1.1\\microsoft.netcore.platforms.3.1.1.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\microsoft.win32.systemevents\\4.5.0\\microsoft.win32.systemevents.4.5.0.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\sharpziplib\\1.2.0\\sharpziplib.1.2.0.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\system.drawing.common\\4.5.0\\system.drawing.common.4.5.0.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\system.text.encoding.codepages\\4.7.1\\system.text.encoding.codepages.4.7.1.nupkg.sha512" ], "logs": [] } \ No newline at end of file diff --git a/PrintPDF/MigraDoc.DocumentObjectModel/obj/Debug/netstandard2.0/MigraDoc.DocumentObjectModel.assets.cache b/PrintPDF/MigraDoc.DocumentObjectModel/obj/Debug/netstandard2.0/MigraDoc.DocumentObjectModel.assets.cache index 12ffc88..241954e 100644 Binary files a/PrintPDF/MigraDoc.DocumentObjectModel/obj/Debug/netstandard2.0/MigraDoc.DocumentObjectModel.assets.cache and b/PrintPDF/MigraDoc.DocumentObjectModel/obj/Debug/netstandard2.0/MigraDoc.DocumentObjectModel.assets.cache differ diff --git a/PrintPDF/MigraDoc.DocumentObjectModel/obj/Debug/netstandard2.0/MigraDoc.DocumentObjectModel.csprojAssemblyReference.cache b/PrintPDF/MigraDoc.DocumentObjectModel/obj/Debug/netstandard2.0/MigraDoc.DocumentObjectModel.csprojAssemblyReference.cache index af31f80..16cda03 100644 Binary files a/PrintPDF/MigraDoc.DocumentObjectModel/obj/Debug/netstandard2.0/MigraDoc.DocumentObjectModel.csprojAssemblyReference.cache and b/PrintPDF/MigraDoc.DocumentObjectModel/obj/Debug/netstandard2.0/MigraDoc.DocumentObjectModel.csprojAssemblyReference.cache differ diff --git a/PrintPDF/MigraDoc.DocumentObjectModel/obj/MigraDoc.DocumentObjectModel.csproj.nuget.dgspec.json b/PrintPDF/MigraDoc.DocumentObjectModel/obj/MigraDoc.DocumentObjectModel.csproj.nuget.dgspec.json index dddbc15..bb20f34 100644 --- a/PrintPDF/MigraDoc.DocumentObjectModel/obj/MigraDoc.DocumentObjectModel.csproj.nuget.dgspec.json +++ b/PrintPDF/MigraDoc.DocumentObjectModel/obj/MigraDoc.DocumentObjectModel.csproj.nuget.dgspec.json @@ -1,24 +1,25 @@ { "format": 1, "restore": { - "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": {} + "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": {} }, "projects": { - "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { + "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { "version": "3.0.0", "restore": { - "projectUniqueName": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", "projectName": "MigraDoc.DocumentObjectModel", - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -67,7 +68,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/PrintPDF/MigraDoc.DocumentObjectModel/obj/MigraDoc.DocumentObjectModel.csproj.nuget.g.props b/PrintPDF/MigraDoc.DocumentObjectModel/obj/MigraDoc.DocumentObjectModel.csproj.nuget.g.props index b7eb83f..471ec1a 100644 --- a/PrintPDF/MigraDoc.DocumentObjectModel/obj/MigraDoc.DocumentObjectModel.csproj.nuget.g.props +++ b/PrintPDF/MigraDoc.DocumentObjectModel/obj/MigraDoc.DocumentObjectModel.csproj.nuget.g.props @@ -5,14 +5,15 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\Admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\ + C:\Users\google\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\;C:\Program Files\dotnet\sdk\NuGetFallbackFolder PackageReference - 5.10.0 + 5.9.0 - + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) diff --git a/PrintPDF/MigraDoc.DocumentObjectModel/obj/MigraDoc.DocumentObjectModel.csproj.nuget.g.targets b/PrintPDF/MigraDoc.DocumentObjectModel/obj/MigraDoc.DocumentObjectModel.csproj.nuget.g.targets index 8f2d2d6..f09823b 100644 --- a/PrintPDF/MigraDoc.DocumentObjectModel/obj/MigraDoc.DocumentObjectModel.csproj.nuget.g.targets +++ b/PrintPDF/MigraDoc.DocumentObjectModel/obj/MigraDoc.DocumentObjectModel.csproj.nuget.g.targets @@ -4,6 +4,6 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - + \ No newline at end of file diff --git a/PrintPDF/MigraDoc.DocumentObjectModel/obj/project.assets.json b/PrintPDF/MigraDoc.DocumentObjectModel/obj/project.assets.json index 28aff03..8757008 100644 --- a/PrintPDF/MigraDoc.DocumentObjectModel/obj/project.assets.json +++ b/PrintPDF/MigraDoc.DocumentObjectModel/obj/project.assets.json @@ -222,25 +222,27 @@ ] }, "packageFolders": { - "C:\\Users\\Admin\\.nuget\\packages\\": {}, + "C:\\Users\\google\\.nuget\\packages\\": {}, "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}, - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {} + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}, + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} }, "project": { "version": "3.0.0", "restore": { - "projectUniqueName": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", "projectName": "MigraDoc.DocumentObjectModel", - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -289,7 +291,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/PrintPDF/MigraDoc.DocumentObjectModel/obj/project.nuget.cache b/PrintPDF/MigraDoc.DocumentObjectModel/obj/project.nuget.cache index 7132270..1a7310a 100644 --- a/PrintPDF/MigraDoc.DocumentObjectModel/obj/project.nuget.cache +++ b/PrintPDF/MigraDoc.DocumentObjectModel/obj/project.nuget.cache @@ -1,12 +1,12 @@ { "version": 2, - "dgSpecHash": "IgtSa87a30hTEmvSKc+YQUdo7hLh+f0kinWAqI2x9y/d+BBwf6XycPkqhLgTg4VSidlGyKRIhW8xK0qIaHTsZw==", + "dgSpecHash": "sBm+civ/y30T28G19ksOeAZSL5HnW74LwApvyScSK1Z25T7B9Gkr9fA+YnAY/upXXLbBJADGkxTQ3draLrfiTQ==", "success": true, - "projectFilePath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", + "projectFilePath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", "expectedPackageFiles": [ - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.netcore.platforms\\1.1.0\\microsoft.netcore.platforms.1.1.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\netstandard.library\\2.0.3\\netstandard.library.2.0.3.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\system.drawing.common\\4.5.0\\system.drawing.common.4.5.0.nupkg.sha512" + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.netcore.platforms\\1.1.0\\microsoft.netcore.platforms.1.1.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\netstandard.library\\2.0.3\\netstandard.library.2.0.3.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\system.drawing.common\\4.5.0\\system.drawing.common.4.5.0.nupkg.sha512" ], "logs": [] } \ No newline at end of file diff --git a/PrintPDF/MigraDoc.Rendering/obj/Debug/netstandard2.0/MigraDoc.Rendering.assets.cache b/PrintPDF/MigraDoc.Rendering/obj/Debug/netstandard2.0/MigraDoc.Rendering.assets.cache index d05f6cb..6c6e3cc 100644 Binary files a/PrintPDF/MigraDoc.Rendering/obj/Debug/netstandard2.0/MigraDoc.Rendering.assets.cache and b/PrintPDF/MigraDoc.Rendering/obj/Debug/netstandard2.0/MigraDoc.Rendering.assets.cache differ diff --git a/PrintPDF/MigraDoc.Rendering/obj/Debug/netstandard2.0/MigraDoc.Rendering.csprojAssemblyReference.cache b/PrintPDF/MigraDoc.Rendering/obj/Debug/netstandard2.0/MigraDoc.Rendering.csprojAssemblyReference.cache index 3662fc9..0d73997 100644 Binary files a/PrintPDF/MigraDoc.Rendering/obj/Debug/netstandard2.0/MigraDoc.Rendering.csprojAssemblyReference.cache and b/PrintPDF/MigraDoc.Rendering/obj/Debug/netstandard2.0/MigraDoc.Rendering.csprojAssemblyReference.cache differ diff --git a/PrintPDF/MigraDoc.Rendering/obj/MigraDoc.Rendering.csproj.nuget.dgspec.json b/PrintPDF/MigraDoc.Rendering/obj/MigraDoc.Rendering.csproj.nuget.dgspec.json index 693aed0..c651205 100644 --- a/PrintPDF/MigraDoc.Rendering/obj/MigraDoc.Rendering.csproj.nuget.dgspec.json +++ b/PrintPDF/MigraDoc.Rendering/obj/MigraDoc.Rendering.csproj.nuget.dgspec.json @@ -1,24 +1,25 @@ { "format": 1, "restore": { - "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": {} + "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": {} }, "projects": { - "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { + "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { "version": "3.0.0", "restore": { - "projectUniqueName": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", "projectName": "MigraDoc.DocumentObjectModel", - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -67,25 +68,26 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } }, - "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": { + "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": { "version": "3.0.0", "restore": { - "projectUniqueName": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", "projectName": "MigraDoc.Rendering", - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -101,14 +103,14 @@ "netstandard2.0": { "targetAlias": "netstandard2.0", "projectReferences": { - "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" }, - "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" }, - "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" } } } @@ -144,25 +146,26 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } }, - "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { "version": "3.0.0", "restore": { - "projectUniqueName": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", "projectName": "PdfSharp.Charting", - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -178,8 +181,8 @@ "netstandard2.0": { "targetAlias": "netstandard2.0", "projectReferences": { - "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" } } } @@ -215,25 +218,26 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } }, - "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { "version": "3.0.0", "restore": { - "projectUniqueName": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", "projectName": "PdfSharp", - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -282,7 +286,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/PrintPDF/MigraDoc.Rendering/obj/MigraDoc.Rendering.csproj.nuget.g.props b/PrintPDF/MigraDoc.Rendering/obj/MigraDoc.Rendering.csproj.nuget.g.props index b7eb83f..471ec1a 100644 --- a/PrintPDF/MigraDoc.Rendering/obj/MigraDoc.Rendering.csproj.nuget.g.props +++ b/PrintPDF/MigraDoc.Rendering/obj/MigraDoc.Rendering.csproj.nuget.g.props @@ -5,14 +5,15 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\Admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\ + C:\Users\google\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\;C:\Program Files\dotnet\sdk\NuGetFallbackFolder PackageReference - 5.10.0 + 5.9.0 - + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) diff --git a/PrintPDF/MigraDoc.Rendering/obj/MigraDoc.Rendering.csproj.nuget.g.targets b/PrintPDF/MigraDoc.Rendering/obj/MigraDoc.Rendering.csproj.nuget.g.targets index 8f2d2d6..f09823b 100644 --- a/PrintPDF/MigraDoc.Rendering/obj/MigraDoc.Rendering.csproj.nuget.g.targets +++ b/PrintPDF/MigraDoc.Rendering/obj/MigraDoc.Rendering.csproj.nuget.g.targets @@ -4,6 +4,6 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - + \ No newline at end of file diff --git a/PrintPDF/MigraDoc.Rendering/obj/project.assets.json b/PrintPDF/MigraDoc.Rendering/obj/project.assets.json index ad0fce5..0860442 100644 --- a/PrintPDF/MigraDoc.Rendering/obj/project.assets.json +++ b/PrintPDF/MigraDoc.Rendering/obj/project.assets.json @@ -280,25 +280,27 @@ ] }, "packageFolders": { - "C:\\Users\\Admin\\.nuget\\packages\\": {}, + "C:\\Users\\google\\.nuget\\packages\\": {}, "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}, - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {} + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}, + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} }, "project": { "version": "3.0.0", "restore": { - "projectUniqueName": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", "projectName": "MigraDoc.Rendering", - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -314,14 +316,14 @@ "netstandard2.0": { "targetAlias": "netstandard2.0", "projectReferences": { - "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" }, - "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" }, - "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" } } } @@ -357,7 +359,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/PrintPDF/MigraDoc.Rendering/obj/project.nuget.cache b/PrintPDF/MigraDoc.Rendering/obj/project.nuget.cache index af473d7..76a4196 100644 --- a/PrintPDF/MigraDoc.Rendering/obj/project.nuget.cache +++ b/PrintPDF/MigraDoc.Rendering/obj/project.nuget.cache @@ -1,12 +1,12 @@ { "version": 2, - "dgSpecHash": "bDTnwokcp6TbOaajNaz0yXvVZ+HofXm9vgS5aE2/RwCzyNFEoATOOr89cFUsNtZBwCBijeGQWTYX9RAThLxU1A==", + "dgSpecHash": "TxR9xRD7C2qxgn4+fmYYQ80yeu7RmqNvCRhmxCD1mxKyia2AoKu19WCJNH7gSVRBpw5yNVgRJYXvflrC/gST+A==", "success": true, - "projectFilePath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", + "projectFilePath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", "expectedPackageFiles": [ - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.netcore.platforms\\1.1.0\\microsoft.netcore.platforms.1.1.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\netstandard.library\\2.0.3\\netstandard.library.2.0.3.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\system.drawing.common\\4.5.0\\system.drawing.common.4.5.0.nupkg.sha512" + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.netcore.platforms\\1.1.0\\microsoft.netcore.platforms.1.1.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\netstandard.library\\2.0.3\\netstandard.library.2.0.3.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\system.drawing.common\\4.5.0\\system.drawing.common.4.5.0.nupkg.sha512" ], "logs": [] } \ No newline at end of file diff --git a/PrintPDF/PdfSharp.Charting/obj/Debug/netstandard2.0/PdfSharp.Charting.assets.cache b/PrintPDF/PdfSharp.Charting/obj/Debug/netstandard2.0/PdfSharp.Charting.assets.cache index 84a0a65..7b0f304 100644 Binary files a/PrintPDF/PdfSharp.Charting/obj/Debug/netstandard2.0/PdfSharp.Charting.assets.cache and b/PrintPDF/PdfSharp.Charting/obj/Debug/netstandard2.0/PdfSharp.Charting.assets.cache differ diff --git a/PrintPDF/PdfSharp.Charting/obj/Debug/netstandard2.0/PdfSharp.Charting.csprojAssemblyReference.cache b/PrintPDF/PdfSharp.Charting/obj/Debug/netstandard2.0/PdfSharp.Charting.csprojAssemblyReference.cache index 88298a9..7cc8a3c 100644 Binary files a/PrintPDF/PdfSharp.Charting/obj/Debug/netstandard2.0/PdfSharp.Charting.csprojAssemblyReference.cache and b/PrintPDF/PdfSharp.Charting/obj/Debug/netstandard2.0/PdfSharp.Charting.csprojAssemblyReference.cache differ diff --git a/PrintPDF/PdfSharp.Charting/obj/PdfSharp.Charting.csproj.nuget.dgspec.json b/PrintPDF/PdfSharp.Charting/obj/PdfSharp.Charting.csproj.nuget.dgspec.json index c9bf13d..1d5cad6 100644 --- a/PrintPDF/PdfSharp.Charting/obj/PdfSharp.Charting.csproj.nuget.dgspec.json +++ b/PrintPDF/PdfSharp.Charting/obj/PdfSharp.Charting.csproj.nuget.dgspec.json @@ -1,24 +1,25 @@ { "format": 1, "restore": { - "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": {} + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": {} }, "projects": { - "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { "version": "3.0.0", "restore": { - "projectUniqueName": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", "projectName": "PdfSharp.Charting", - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -34,8 +35,8 @@ "netstandard2.0": { "targetAlias": "netstandard2.0", "projectReferences": { - "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" } } } @@ -71,25 +72,26 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } }, - "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { "version": "3.0.0", "restore": { - "projectUniqueName": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", "projectName": "PdfSharp", - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -138,7 +140,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/PrintPDF/PdfSharp.Charting/obj/PdfSharp.Charting.csproj.nuget.g.props b/PrintPDF/PdfSharp.Charting/obj/PdfSharp.Charting.csproj.nuget.g.props index b7eb83f..471ec1a 100644 --- a/PrintPDF/PdfSharp.Charting/obj/PdfSharp.Charting.csproj.nuget.g.props +++ b/PrintPDF/PdfSharp.Charting/obj/PdfSharp.Charting.csproj.nuget.g.props @@ -5,14 +5,15 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\Admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\ + C:\Users\google\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\;C:\Program Files\dotnet\sdk\NuGetFallbackFolder PackageReference - 5.10.0 + 5.9.0 - + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) diff --git a/PrintPDF/PdfSharp.Charting/obj/PdfSharp.Charting.csproj.nuget.g.targets b/PrintPDF/PdfSharp.Charting/obj/PdfSharp.Charting.csproj.nuget.g.targets index 8f2d2d6..f09823b 100644 --- a/PrintPDF/PdfSharp.Charting/obj/PdfSharp.Charting.csproj.nuget.g.targets +++ b/PrintPDF/PdfSharp.Charting/obj/PdfSharp.Charting.csproj.nuget.g.targets @@ -4,6 +4,6 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - + \ No newline at end of file diff --git a/PrintPDF/PdfSharp.Charting/obj/project.assets.json b/PrintPDF/PdfSharp.Charting/obj/project.assets.json index 97ad74d..7dd8dab 100644 --- a/PrintPDF/PdfSharp.Charting/obj/project.assets.json +++ b/PrintPDF/PdfSharp.Charting/obj/project.assets.json @@ -241,25 +241,27 @@ ] }, "packageFolders": { - "C:\\Users\\Admin\\.nuget\\packages\\": {}, + "C:\\Users\\google\\.nuget\\packages\\": {}, "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}, - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {} + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}, + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} }, "project": { "version": "3.0.0", "restore": { - "projectUniqueName": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", "projectName": "PdfSharp.Charting", - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -275,8 +277,8 @@ "netstandard2.0": { "targetAlias": "netstandard2.0", "projectReferences": { - "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" } } } @@ -312,7 +314,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/PrintPDF/PdfSharp.Charting/obj/project.nuget.cache b/PrintPDF/PdfSharp.Charting/obj/project.nuget.cache index f0c350a..144e274 100644 --- a/PrintPDF/PdfSharp.Charting/obj/project.nuget.cache +++ b/PrintPDF/PdfSharp.Charting/obj/project.nuget.cache @@ -1,12 +1,12 @@ { "version": 2, - "dgSpecHash": "w6ImBakjanJ2rg89haorn71y5kBxVm6Ng5vEtZkR5Gjcg1UvrsoJk0aw86WoEzmJw76Uv7kaYT82eTMiYaQwgg==", + "dgSpecHash": "ylFR2pFfHruJfLgzgidtqc3YfADHj/7nw+tQ1nHK/jI7pRvAVQTnBsGvB/IdLnxMQFZVD+HIjX9oz6WxWvfZqQ==", "success": true, - "projectFilePath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", + "projectFilePath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", "expectedPackageFiles": [ - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.netcore.platforms\\1.1.0\\microsoft.netcore.platforms.1.1.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\netstandard.library\\2.0.3\\netstandard.library.2.0.3.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\system.drawing.common\\4.5.0\\system.drawing.common.4.5.0.nupkg.sha512" + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.netcore.platforms\\1.1.0\\microsoft.netcore.platforms.1.1.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\netstandard.library\\2.0.3\\netstandard.library.2.0.3.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\system.drawing.common\\4.5.0\\system.drawing.common.4.5.0.nupkg.sha512" ], "logs": [] } \ No newline at end of file diff --git a/PrintPDF/PdfSharp/obj/Debug/netstandard2.0/PdfSharp.assets.cache b/PrintPDF/PdfSharp/obj/Debug/netstandard2.0/PdfSharp.assets.cache index ab0fd11..233265e 100644 Binary files a/PrintPDF/PdfSharp/obj/Debug/netstandard2.0/PdfSharp.assets.cache and b/PrintPDF/PdfSharp/obj/Debug/netstandard2.0/PdfSharp.assets.cache differ diff --git a/PrintPDF/PdfSharp/obj/Debug/netstandard2.0/PdfSharp.csprojAssemblyReference.cache b/PrintPDF/PdfSharp/obj/Debug/netstandard2.0/PdfSharp.csprojAssemblyReference.cache index ec9b2b0..1c3a996 100644 Binary files a/PrintPDF/PdfSharp/obj/Debug/netstandard2.0/PdfSharp.csprojAssemblyReference.cache and b/PrintPDF/PdfSharp/obj/Debug/netstandard2.0/PdfSharp.csprojAssemblyReference.cache differ diff --git a/PrintPDF/PdfSharp/obj/PdfSharp.csproj.nuget.dgspec.json b/PrintPDF/PdfSharp/obj/PdfSharp.csproj.nuget.dgspec.json index f7a5cf8..99cbd8b 100644 --- a/PrintPDF/PdfSharp/obj/PdfSharp.csproj.nuget.dgspec.json +++ b/PrintPDF/PdfSharp/obj/PdfSharp.csproj.nuget.dgspec.json @@ -1,24 +1,25 @@ { "format": 1, "restore": { - "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": {} + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": {} }, "projects": { - "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { "version": "3.0.0", "restore": { - "projectUniqueName": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", "projectName": "PdfSharp", - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -67,7 +68,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/PrintPDF/PdfSharp/obj/PdfSharp.csproj.nuget.g.props b/PrintPDF/PdfSharp/obj/PdfSharp.csproj.nuget.g.props index b7eb83f..471ec1a 100644 --- a/PrintPDF/PdfSharp/obj/PdfSharp.csproj.nuget.g.props +++ b/PrintPDF/PdfSharp/obj/PdfSharp.csproj.nuget.g.props @@ -5,14 +5,15 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\Admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\ + C:\Users\google\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\;C:\Program Files\dotnet\sdk\NuGetFallbackFolder PackageReference - 5.10.0 + 5.9.0 - + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) diff --git a/PrintPDF/PdfSharp/obj/PdfSharp.csproj.nuget.g.targets b/PrintPDF/PdfSharp/obj/PdfSharp.csproj.nuget.g.targets index 8f2d2d6..f09823b 100644 --- a/PrintPDF/PdfSharp/obj/PdfSharp.csproj.nuget.g.targets +++ b/PrintPDF/PdfSharp/obj/PdfSharp.csproj.nuget.g.targets @@ -4,6 +4,6 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - + \ No newline at end of file diff --git a/PrintPDF/PdfSharp/obj/project.assets.json b/PrintPDF/PdfSharp/obj/project.assets.json index f306a2b..9015a39 100644 --- a/PrintPDF/PdfSharp/obj/project.assets.json +++ b/PrintPDF/PdfSharp/obj/project.assets.json @@ -222,25 +222,27 @@ ] }, "packageFolders": { - "C:\\Users\\Admin\\.nuget\\packages\\": {}, + "C:\\Users\\google\\.nuget\\packages\\": {}, "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}, - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {} + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}, + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} }, "project": { "version": "3.0.0", "restore": { - "projectUniqueName": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", "projectName": "PdfSharp", - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -289,7 +291,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/PrintPDF/PdfSharp/obj/project.nuget.cache b/PrintPDF/PdfSharp/obj/project.nuget.cache index 6cab9dd..fa5de92 100644 --- a/PrintPDF/PdfSharp/obj/project.nuget.cache +++ b/PrintPDF/PdfSharp/obj/project.nuget.cache @@ -1,12 +1,12 @@ { "version": 2, - "dgSpecHash": "IBl924vmWiOYYnST8LHVzZeTj/m3S0bcbDhnrLu1O6YE4OWnIlS0w51gKWDAYci7lQVioY/598FEC/7aL1FmQg==", + "dgSpecHash": "gAA+4olGjjwVeZQSmw/Z0DOTpvSV4fy+dgVMwmTj80c7nXa8OCdrFx82JQ+RJR4CtrbDPW55iyjFjOyll2at+A==", "success": true, - "projectFilePath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", + "projectFilePath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", "expectedPackageFiles": [ - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.netcore.platforms\\1.1.0\\microsoft.netcore.platforms.1.1.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\netstandard.library\\2.0.3\\netstandard.library.2.0.3.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\system.drawing.common\\4.5.0\\system.drawing.common.4.5.0.nupkg.sha512" + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.netcore.platforms\\1.1.0\\microsoft.netcore.platforms.1.1.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\netstandard.library\\2.0.3\\netstandard.library.2.0.3.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\system.drawing.common\\4.5.0\\system.drawing.common.4.5.0.nupkg.sha512" ], "logs": [] } \ No newline at end of file diff --git a/SupportClasses/obj/Debug/netstandard2.0/SupportClasses.assets.cache b/SupportClasses/obj/Debug/netstandard2.0/SupportClasses.assets.cache index f92b8ed..0779812 100644 Binary files a/SupportClasses/obj/Debug/netstandard2.0/SupportClasses.assets.cache and b/SupportClasses/obj/Debug/netstandard2.0/SupportClasses.assets.cache differ diff --git a/SupportClasses/obj/SupportClasses.csproj.nuget.dgspec.json b/SupportClasses/obj/SupportClasses.csproj.nuget.dgspec.json index 0c7564a..93d56da 100644 --- a/SupportClasses/obj/SupportClasses.csproj.nuget.dgspec.json +++ b/SupportClasses/obj/SupportClasses.csproj.nuget.dgspec.json @@ -1,24 +1,25 @@ { "format": 1, "restore": { - "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": {} + "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": {} }, "projects": { - "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { + "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", "projectName": "SupportClasses", - "projectPath": "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "F:\\GIT\\ASCKU_PC\\SupportClasses\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -63,7 +64,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/SupportClasses/obj/SupportClasses.csproj.nuget.g.props b/SupportClasses/obj/SupportClasses.csproj.nuget.g.props index b7eb83f..471ec1a 100644 --- a/SupportClasses/obj/SupportClasses.csproj.nuget.g.props +++ b/SupportClasses/obj/SupportClasses.csproj.nuget.g.props @@ -5,14 +5,15 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\Admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\ + C:\Users\google\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\;C:\Program Files\dotnet\sdk\NuGetFallbackFolder PackageReference - 5.10.0 + 5.9.0 - + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) diff --git a/SupportClasses/obj/SupportClasses.csproj.nuget.g.targets b/SupportClasses/obj/SupportClasses.csproj.nuget.g.targets index 8f2d2d6..f09823b 100644 --- a/SupportClasses/obj/SupportClasses.csproj.nuget.g.targets +++ b/SupportClasses/obj/SupportClasses.csproj.nuget.g.targets @@ -4,6 +4,6 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - + \ No newline at end of file diff --git a/SupportClasses/obj/project.assets.json b/SupportClasses/obj/project.assets.json index 05faccc..0a0315d 100644 --- a/SupportClasses/obj/project.assets.json +++ b/SupportClasses/obj/project.assets.json @@ -179,25 +179,27 @@ ] }, "packageFolders": { - "C:\\Users\\Admin\\.nuget\\packages\\": {}, + "C:\\Users\\google\\.nuget\\packages\\": {}, "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}, - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {} + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}, + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", "projectName": "SupportClasses", - "projectPath": "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "F:\\GIT\\ASCKU_PC\\SupportClasses\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -242,7 +244,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/SupportClasses/obj/project.nuget.cache b/SupportClasses/obj/project.nuget.cache index 74ac946..b008c15 100644 --- a/SupportClasses/obj/project.nuget.cache +++ b/SupportClasses/obj/project.nuget.cache @@ -1,11 +1,11 @@ { "version": 2, - "dgSpecHash": "BElZgcPGbiVwCCfXyLaJeUQgG/0stzHf7tJtt01Xw8l8kVI4Rl4V7heHc8pb/6oay3uMAySkdY5xvl544GQRoQ==", + "dgSpecHash": "4z8iakRemDHltW/xazDzU5cngA0Pqip9r1fUiMe+4pEedLlKbRR2y7psVjUGx9IEupBfp4Gj7OPOyPOJ/OLgqQ==", "success": true, - "projectFilePath": "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", + "projectFilePath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", "expectedPackageFiles": [ - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.netcore.platforms\\1.1.0\\microsoft.netcore.platforms.1.1.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\netstandard.library\\2.0.3\\netstandard.library.2.0.3.nupkg.sha512" + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.netcore.platforms\\1.1.0\\microsoft.netcore.platforms.1.1.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\netstandard.library\\2.0.3\\netstandard.library.2.0.3.nupkg.sha512" ], "logs": [] } \ No newline at end of file diff --git a/Test2/Program.cs b/Test2/Program.cs index 4ff87eb..dafaa7f 100644 --- a/Test2/Program.cs +++ b/Test2/Program.cs @@ -7,6 +7,8 @@ using System.Net.Sockets; using System.Net; using System.Collections.Generic; using System.Text; +using System.IO; +using System.Threading.Tasks; namespace Test2 { @@ -15,7 +17,7 @@ namespace Test2 static void Main(string[] args) { LogConf(); - var test = new STPClient(); + T3(); Console.WriteLine("Hello World!"); } static void LogConf() @@ -47,9 +49,123 @@ namespace Test2 s.Connect(ipe); s.Send(send.ToArray()); - - s.Available; - } + + static void T1() + { + var t = new NETClient("10.10.45.151", 1070); + var task = new Task(() => t.Full_Download_NH(new DateTime(2021, 06, 02), 12, 1)); + task.Start(); + do + { + Console.WriteLine("Status: " + (Math.Round(t.Status * 10000) / 100).ToString() + "%"); + Task.Delay(1000).Wait(); + } while (task.Status == TaskStatus.Running); + var res = (task.IsCompletedSuccessfully) ? + task.GetAwaiter().GetResult() : + Array.Empty(); + using (var file = new FileStream(Directory.GetCurrentDirectory() + "/test1.txt", FileMode.Create, FileAccess.Write)) + { + file.Write(res, 0, res.Length); + } + } + static void T3() + { + string[] tes = { + "version", + "file list", + "download", + "pasp browse", + "pasp download", + "pasp find", + "prog list", + "prog download", + "server time", + "download usov", + "slit history", + "keep alive", + "vdp cycle", + "vdp active", + "vdp last cycle", + "rmt watchdog", + "set rmt watchdog", + "print job", + "pasp find2", + "pasp browse2", + "arch history", + "download nh", + "download usov nhv", + "dir browse", + "vdp sim med", + "vdp flags", + "user flags", + "user motd", + "user mail", + "download tvso", + "pasp download tvso", + "pasp find tvso", + "pasp browse tvsov", + "korpus cycle", + "korpus last cycle", + "download fdan", + "client version", + "measure id", + "read vdp config", + "write vdp config", + "read tvso config", + "delete vdp config", + "get plav personal", + "get server info", + "ctrl split", + "ctrl set time", + "ctrl end tc", + "ctrl remove", + "ctrl spool", + "save pasport", + "save pasport 90", + "find time bugs", + "update pasport", + "get pasp by id", + "cp com find pasp by temp", + "get splav list", + "get field val list", + "get plav list form", + "get pasp by priv", + "print job 2", + "get pasp by name", + "get pasp by id 90", + "find pasp by temp 90", + "get pasp by priv 90", + "get pasp by name 90", + "get plav list form 90", + "ctrl split db", + "ctrl set time db", + "ctrl remove db", + "update stat", + "get cur params arr", + "get cur params", + "get cur params arr 5", + "get cur params 5", + "fix db cycle", + "by name", + "test" + }; + var t = new NETClient("10.10.45.151", 1070); + using (var file = new StreamWriter(Directory.GetCurrentDirectory() + "/test_by_name.txt")) + { + for (var i = 0; i < tes.Length; i++) + { + var res = t.Full_By_Name(tes[i]); + if (res != null) + foreach (var b in res) + file.Write("0x" + b.ToString("X2") + " "); + file.Write("- "); + if (res != null) + file.Write(BitConverter.ToUInt32(res).ToString("D4") + " - "); + file.WriteLine(tes[i]); + } + } + } + } } diff --git a/Test2/bin/Debug/net5.0/20210602.121 b/Test2/bin/Debug/net5.0/20210602.121 new file mode 100644 index 0000000..d956eb7 Binary files /dev/null and b/Test2/bin/Debug/net5.0/20210602.121 differ diff --git a/Test2/bin/Debug/net5.0/DataClient.dll b/Test2/bin/Debug/net5.0/DataClient.dll new file mode 100644 index 0000000..d82d1d2 Binary files /dev/null and b/Test2/bin/Debug/net5.0/DataClient.dll differ diff --git a/Test2/bin/Debug/net5.0/DataClient.pdb b/Test2/bin/Debug/net5.0/DataClient.pdb new file mode 100644 index 0000000..c7e8e3d Binary files /dev/null and b/Test2/bin/Debug/net5.0/DataClient.pdb differ diff --git a/Test2/bin/Debug/net5.0/STPClient.dll b/Test2/bin/Debug/net5.0/STPClient.dll deleted file mode 100644 index 3b76eff..0000000 Binary files a/Test2/bin/Debug/net5.0/STPClient.dll and /dev/null differ diff --git a/Test2/bin/Debug/net5.0/Test2.deps.json b/Test2/bin/Debug/net5.0/Test2.deps.json index 87b7b84..3152e79 100644 --- a/Test2/bin/Debug/net5.0/Test2.deps.json +++ b/Test2/bin/Debug/net5.0/Test2.deps.json @@ -8,9 +8,9 @@ ".NETCoreApp,Version=v5.0": { "Test2/1.0.0": { "dependencies": { + "DataClient": "0.0.3", "NLog": "4.7.10", - "NLog.Extensions.Logging": "1.7.2", - "STPClient": "1.0.0" + "NLog.Extensions.Logging": "1.7.2" }, "runtime": { "Test2.dll": {} @@ -117,14 +117,14 @@ } } }, - "STPClient/1.0.0": { + "DataClient/0.0.3": { "dependencies": { "NLog": "4.7.10", "NLog.Extensions.Logging": "1.7.2", "Newtonsoft.Json": "13.0.1" }, "runtime": { - "STPClient.dll": {} + "DataClient.dll": {} } } } @@ -205,7 +205,7 @@ "path": "nlog.extensions.logging/1.7.2", "hashPath": "nlog.extensions.logging.1.7.2.nupkg.sha512" }, - "STPClient/1.0.0": { + "DataClient/0.0.3": { "type": "project", "serviceable": false, "sha512": "" diff --git a/Test2/bin/Debug/net5.0/Test2.dll b/Test2/bin/Debug/net5.0/Test2.dll index c573e73..66f9e02 100644 Binary files a/Test2/bin/Debug/net5.0/Test2.dll and b/Test2/bin/Debug/net5.0/Test2.dll differ diff --git a/Test2/bin/Debug/net5.0/Test2.pdb b/Test2/bin/Debug/net5.0/Test2.pdb index ca9e41a..71e6a59 100644 Binary files a/Test2/bin/Debug/net5.0/Test2.pdb and b/Test2/bin/Debug/net5.0/Test2.pdb differ diff --git a/Test2/bin/Debug/net5.0/ref/Test2.dll b/Test2/bin/Debug/net5.0/ref/Test2.dll index a2c1220..baa4471 100644 Binary files a/Test2/bin/Debug/net5.0/ref/Test2.dll and b/Test2/bin/Debug/net5.0/ref/Test2.dll differ diff --git a/Test2/bin/Debug/net5.0/test_by_name.txt b/Test2/bin/Debug/net5.0/test_by_name.txt new file mode 100644 index 0000000..5e37cd9 --- /dev/null +++ b/Test2/bin/Debug/net5.0/test_by_name.txt @@ -0,0 +1,77 @@ +0x00 0x00 0x00 0x00 - 0000 - version +0x01 0x00 0x00 0x00 - 0001 - file list +0x02 0x00 0x00 0x00 - 0002 - download +0x03 0x00 0x00 0x00 - 0003 - pasp browse +0x04 0x00 0x00 0x00 - 0004 - pasp download +0x05 0x00 0x00 0x00 - 0005 - pasp find +0x06 0x00 0x00 0x00 - 0006 - prog list +0x07 0x00 0x00 0x00 - 0007 - prog download +0x08 0x00 0x00 0x00 - 0008 - server time +0x09 0x00 0x00 0x00 - 0009 - download usov +0x0A 0x00 0x00 0x00 - 0010 - slit history +0x0B 0x00 0x00 0x00 - 0011 - keep alive +- vdp cycle +- vdp active +- vdp last cycle +- rmt watchdog +- set rmt watchdog +0x11 0x00 0x00 0x00 - 0017 - print job +- pasp find2 +- pasp browse2 +- arch history +0x15 0x00 0x00 0x00 - 0021 - download nh +- download usov nhv +0x17 0x00 0x00 0x00 - 0023 - dir browse +- vdp sim med +- vdp flags +0x1A 0x00 0x00 0x00 - 0026 - user flags +0x1B 0x00 0x00 0x00 - 0027 - user motd +0x1C 0x00 0x00 0x00 - 0028 - user mail +0x1D 0x00 0x00 0x00 - 0029 - download tvso +0x1E 0x00 0x00 0x00 - 0030 - pasp download tvso +0x1F 0x00 0x00 0x00 - 0031 - pasp find tvso +- pasp browse tvsov +0x21 0x00 0x00 0x00 - 0033 - korpus cycle +0x22 0x00 0x00 0x00 - 0034 - korpus last cycle +0x23 0x00 0x00 0x00 - 0035 - download fdan +0x24 0x00 0x00 0x00 - 0036 - client version +- measure id +- read vdp config +- write vdp config +- read tvso config +- delete vdp config +0x2A 0x00 0x00 0x00 - 0042 - get plav personal +0x2B 0x00 0x00 0x00 - 0043 - get server info +0x2C 0x00 0x00 0x00 - 0044 - ctrl split +0x2D 0x00 0x00 0x00 - 0045 - ctrl set time +- ctrl end tc +0x2F 0x00 0x00 0x00 - 0047 - ctrl remove +0x30 0x00 0x00 0x00 - 0048 - ctrl spool +0x31 0x00 0x00 0x00 - 0049 - save pasport +- save pasport 90 +0x33 0x00 0x00 0x00 - 0051 - find time bugs +0x34 0x00 0x00 0x00 - 0052 - update pasport +- get pasp by id +- cp com find pasp by temp +0x37 0x00 0x00 0x00 - 0055 - get splav list +0x38 0x00 0x00 0x00 - 0056 - get field val list +0x39 0x00 0x00 0x00 - 0057 - get plav list form +0x3A 0x00 0x00 0x00 - 0058 - get pasp by priv +0x3B 0x00 0x00 0x00 - 0059 - print job 2 +0x3C 0x00 0x00 0x00 - 0060 - get pasp by name +- get pasp by id 90 +0x3E 0x00 0x00 0x00 - 0062 - find pasp by temp 90 +0x3F 0x00 0x00 0x00 - 0063 - get pasp by priv 90 +0x40 0x00 0x00 0x00 - 0064 - get pasp by name 90 +0x41 0x00 0x00 0x00 - 0065 - get plav list form 90 +- ctrl split db +- ctrl set time db +- ctrl remove db +0x45 0x00 0x00 0x00 - 0069 - update stat +0x46 0x00 0x00 0x00 - 0070 - get cur params arr +0x47 0x00 0x00 0x00 - 0071 - get cur params +0x48 0x00 0x00 0x00 - 0072 - get cur params arr 5 +0x49 0x00 0x00 0x00 - 0073 - get cur params 5 +0x4A 0x00 0x00 0x00 - 0074 - fix db cycle +- by name +- test diff --git a/Test2/obj/Debug/net5.0/Test2.assets.cache b/Test2/obj/Debug/net5.0/Test2.assets.cache index 198aec8..abb7629 100644 Binary files a/Test2/obj/Debug/net5.0/Test2.assets.cache and b/Test2/obj/Debug/net5.0/Test2.assets.cache differ diff --git a/Test2/obj/Debug/net5.0/Test2.csproj.CoreCompileInputs.cache b/Test2/obj/Debug/net5.0/Test2.csproj.CoreCompileInputs.cache index 5cd748d..c499282 100644 --- a/Test2/obj/Debug/net5.0/Test2.csproj.CoreCompileInputs.cache +++ b/Test2/obj/Debug/net5.0/Test2.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -2ea938edc2829f51429c0478cd689f4ba6282c7d +eb6c36760288f87d6bbc3932672b14e432196f04 diff --git a/Test2/obj/Debug/net5.0/Test2.csproj.FileListAbsolute.txt b/Test2/obj/Debug/net5.0/Test2.csproj.FileListAbsolute.txt index 19af116..7af7a15 100644 --- a/Test2/obj/Debug/net5.0/Test2.csproj.FileListAbsolute.txt +++ b/Test2/obj/Debug/net5.0/Test2.csproj.FileListAbsolute.txt @@ -7,7 +7,6 @@ D:\GIT\ASCKU_PC\Test2\bin\Debug\net5.0\Microsoft.Extensions.Options.dll D:\GIT\ASCKU_PC\Test2\bin\Debug\net5.0\Microsoft.Extensions.Primitives.dll D:\GIT\ASCKU_PC\Test2\bin\Debug\net5.0\NLog.dll D:\GIT\ASCKU_PC\Test2\bin\Debug\net5.0\NLog.Extensions.Logging.dll -D:\GIT\ASCKU_PC\Test2\bin\Debug\net5.0\STPClient.dll D:\GIT\ASCKU_PC\Test2\obj\Debug\net5.0\Test2.csprojAssemblyReference.cache D:\GIT\ASCKU_PC\Test2\obj\Debug\net5.0\Test2.GeneratedMSBuildEditorConfig.editorconfig D:\GIT\ASCKU_PC\Test2\obj\Debug\net5.0\Test2.AssemblyInfoInputs.cache @@ -22,9 +21,10 @@ D:\GIT\ASCKU_PC\Test2\bin\Debug\net5.0\Test2.runtimeconfig.dev.json D:\GIT\ASCKU_PC\Test2\bin\Debug\net5.0\Test2.dll D:\GIT\ASCKU_PC\Test2\bin\Debug\net5.0\ref\Test2.dll D:\GIT\ASCKU_PC\Test2\bin\Debug\net5.0\Test2.pdb -D:\GIT\ASCKU_PC\Test2\bin\Debug\net5.0\STPClient.pdb D:\GIT\ASCKU_PC\Test2\obj\Debug\net5.0\Test2.csproj.CopyComplete D:\GIT\ASCKU_PC\Test2\obj\Debug\net5.0\Test2.dll D:\GIT\ASCKU_PC\Test2\obj\Debug\net5.0\ref\Test2.dll D:\GIT\ASCKU_PC\Test2\obj\Debug\net5.0\Test2.pdb D:\GIT\ASCKU_PC\Test2\obj\Debug\net5.0\Test2.genruntimeconfig.cache +D:\GIT\ASCKU_PC\Test2\bin\Debug\net5.0\DataClient.dll +D:\GIT\ASCKU_PC\Test2\bin\Debug\net5.0\DataClient.pdb diff --git a/Test2/obj/Debug/net5.0/Test2.csprojAssemblyReference.cache b/Test2/obj/Debug/net5.0/Test2.csprojAssemblyReference.cache index 6b7caa7..4515da9 100644 Binary files a/Test2/obj/Debug/net5.0/Test2.csprojAssemblyReference.cache and b/Test2/obj/Debug/net5.0/Test2.csprojAssemblyReference.cache differ diff --git a/Test2/obj/Debug/net5.0/Test2.dll b/Test2/obj/Debug/net5.0/Test2.dll index c573e73..66f9e02 100644 Binary files a/Test2/obj/Debug/net5.0/Test2.dll and b/Test2/obj/Debug/net5.0/Test2.dll differ diff --git a/Test2/obj/Debug/net5.0/Test2.pdb b/Test2/obj/Debug/net5.0/Test2.pdb index ca9e41a..71e6a59 100644 Binary files a/Test2/obj/Debug/net5.0/Test2.pdb and b/Test2/obj/Debug/net5.0/Test2.pdb differ diff --git a/Test2/obj/Debug/net5.0/apphost.exe b/Test2/obj/Debug/net5.0/apphost.exe index b4cb37c..22f34f0 100644 Binary files a/Test2/obj/Debug/net5.0/apphost.exe and b/Test2/obj/Debug/net5.0/apphost.exe differ diff --git a/Test2/obj/Debug/net5.0/ref/Test2.dll b/Test2/obj/Debug/net5.0/ref/Test2.dll index a2c1220..baa4471 100644 Binary files a/Test2/obj/Debug/net5.0/ref/Test2.dll and b/Test2/obj/Debug/net5.0/ref/Test2.dll differ diff --git a/Test2/obj/Test2.csproj.nuget.dgspec.json b/Test2/obj/Test2.csproj.nuget.dgspec.json index 9e38287..f6dc323 100644 --- a/Test2/obj/Test2.csproj.nuget.dgspec.json +++ b/Test2/obj/Test2.csproj.nuget.dgspec.json @@ -1,24 +1,25 @@ { "format": 1, "restore": { - "F:\\GIT\\ASCKU_PC\\Test2\\Test2.csproj": {} + "D:\\GIT\\ASCKU_PC\\Test2\\Test2.csproj": {} }, "projects": { - "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": { + "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": { "version": "0.0.3", "restore": { - "projectUniqueName": "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj", "projectName": "DataClient", - "projectPath": "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "F:\\GIT\\ASCKU_PC\\DataClient\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\DataClient\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -74,25 +75,26 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } }, - "F:\\GIT\\ASCKU_PC\\Test2\\Test2.csproj": { + "D:\\GIT\\ASCKU_PC\\Test2\\Test2.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "F:\\GIT\\ASCKU_PC\\Test2\\Test2.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\Test2\\Test2.csproj", "projectName": "Test2", - "projectPath": "F:\\GIT\\ASCKU_PC\\Test2\\Test2.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "F:\\GIT\\ASCKU_PC\\Test2\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\Test2\\Test2.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\Test2\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -108,8 +110,8 @@ "net5.0": { "targetAlias": "net5.0", "projectReferences": { - "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj" + "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj" } } } @@ -148,7 +150,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/Test2/obj/Test2.csproj.nuget.g.props b/Test2/obj/Test2.csproj.nuget.g.props index b7eb83f..471ec1a 100644 --- a/Test2/obj/Test2.csproj.nuget.g.props +++ b/Test2/obj/Test2.csproj.nuget.g.props @@ -5,14 +5,15 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\Admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\ + C:\Users\google\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\;C:\Program Files\dotnet\sdk\NuGetFallbackFolder PackageReference - 5.10.0 + 5.9.0 - + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) diff --git a/Test2/obj/project.assets.json b/Test2/obj/project.assets.json index 5a87004..ff54544 100644 --- a/Test2/obj/project.assets.json +++ b/Test2/obj/project.assets.json @@ -381,25 +381,27 @@ ] }, "packageFolders": { - "C:\\Users\\Admin\\.nuget\\packages\\": {}, + "C:\\Users\\google\\.nuget\\packages\\": {}, "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}, - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {} + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}, + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "F:\\GIT\\ASCKU_PC\\Test2\\Test2.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\Test2\\Test2.csproj", "projectName": "Test2", - "projectPath": "F:\\GIT\\ASCKU_PC\\Test2\\Test2.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "F:\\GIT\\ASCKU_PC\\Test2\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\Test2\\Test2.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\Test2\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -415,8 +417,8 @@ "net5.0": { "targetAlias": "net5.0", "projectReferences": { - "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj" + "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj" } } } @@ -455,7 +457,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/Test2/obj/project.nuget.cache b/Test2/obj/project.nuget.cache index 6ed787b..903f4de 100644 --- a/Test2/obj/project.nuget.cache +++ b/Test2/obj/project.nuget.cache @@ -1,19 +1,19 @@ { "version": 2, - "dgSpecHash": "MPBroNfspZ1mtm2ln8dtFWS2ZmiLY7b8ztiR6Jg/ldi+wsG5wKDi1MIiI9GlsMyEiFtM5zNJzJdHDD4DfTO1gw==", + "dgSpecHash": "HhmSRaWdg6GJzveREREh4I6l8jtRdUwLBMWV/9wd89PVj6NuodYu7Nx5js8D/6uwoLtiRHDPF6/kAFeVHlQ5pg==", "success": true, - "projectFilePath": "F:\\GIT\\ASCKU_PC\\Test2\\Test2.csproj", + "projectFilePath": "D:\\GIT\\ASCKU_PC\\Test2\\Test2.csproj", "expectedPackageFiles": [ - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.configuration.abstractions\\5.0.0\\microsoft.extensions.configuration.abstractions.5.0.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.dependencyinjection\\5.0.0\\microsoft.extensions.dependencyinjection.5.0.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\5.0.0\\microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.logging\\5.0.0\\microsoft.extensions.logging.5.0.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\5.0.0\\microsoft.extensions.logging.abstractions.5.0.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.options\\5.0.0\\microsoft.extensions.options.5.0.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.primitives\\5.0.0\\microsoft.extensions.primitives.5.0.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\newtonsoft.json\\13.0.1\\newtonsoft.json.13.0.1.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\nlog\\4.7.10\\nlog.4.7.10.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\nlog.extensions.logging\\1.7.2\\nlog.extensions.logging.1.7.2.nupkg.sha512" + "C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.configuration.abstractions\\5.0.0\\microsoft.extensions.configuration.abstractions.5.0.0.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.dependencyinjection\\5.0.0\\microsoft.extensions.dependencyinjection.5.0.0.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\5.0.0\\microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.logging\\5.0.0\\microsoft.extensions.logging.5.0.0.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\5.0.0\\microsoft.extensions.logging.abstractions.5.0.0.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.options\\5.0.0\\microsoft.extensions.options.5.0.0.nupkg.sha512", + "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" ], "logs": [] } \ No newline at end of file diff --git a/Tests/obj/Debug/netcoreapp3.1/Tests.assets.cache b/Tests/obj/Debug/netcoreapp3.1/Tests.assets.cache index 04133ca..f7fba33 100644 Binary files a/Tests/obj/Debug/netcoreapp3.1/Tests.assets.cache and b/Tests/obj/Debug/netcoreapp3.1/Tests.assets.cache differ diff --git a/Tests/obj/Debug/netcoreapp3.1/Tests.csprojAssemblyReference.cache b/Tests/obj/Debug/netcoreapp3.1/Tests.csprojAssemblyReference.cache index e18355d..d7751b7 100644 Binary files a/Tests/obj/Debug/netcoreapp3.1/Tests.csprojAssemblyReference.cache and b/Tests/obj/Debug/netcoreapp3.1/Tests.csprojAssemblyReference.cache differ diff --git a/Tests/obj/Tests.csproj.nuget.dgspec.json b/Tests/obj/Tests.csproj.nuget.dgspec.json index 4a42649..038c3eb 100644 --- a/Tests/obj/Tests.csproj.nuget.dgspec.json +++ b/Tests/obj/Tests.csproj.nuget.dgspec.json @@ -1,24 +1,25 @@ { "format": 1, "restore": { - "F:\\GIT\\ASCKU_PC\\Tests\\Tests.csproj": {} + "D:\\GIT\\ASCKU_PC\\Tests\\Tests.csproj": {} }, "projects": { - "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { + "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", "projectName": "DataClients", - "projectPath": "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "F:\\GIT\\ASCKU_PC\\DataClients\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\DataClients\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -34,8 +35,8 @@ "netstandard2.0": { "targetAlias": "netstandard2.0", "projectReferences": { - "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj" + "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj" } } } @@ -75,25 +76,26 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } }, - "F:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj": { + "D:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "F:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj", "projectName": "Mailing", - "projectPath": "F:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "F:\\GIT\\ASCKU_PC\\Mailing\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\Mailing\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -109,20 +111,20 @@ "netcoreapp3.1": { "targetAlias": "netcoreapp3.1", "projectReferences": { - "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj" + "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj" }, - "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" }, - "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj" }, - "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" }, - "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" } } } @@ -157,25 +159,26 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } }, - "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { + "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { "version": "3.0.0", "restore": { - "projectUniqueName": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", "projectName": "MigraDoc.DocumentObjectModel", - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -224,25 +227,26 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } }, - "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": { + "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": { "version": "3.0.0", "restore": { - "projectUniqueName": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", "projectName": "MigraDoc.Rendering", - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -258,14 +262,14 @@ "netstandard2.0": { "targetAlias": "netstandard2.0", "projectReferences": { - "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" }, - "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" }, - "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" } } } @@ -301,25 +305,26 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } }, - "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { "version": "3.0.0", "restore": { - "projectUniqueName": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", "projectName": "PdfSharp.Charting", - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -335,8 +340,8 @@ "netstandard2.0": { "targetAlias": "netstandard2.0", "projectReferences": { - "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" } } } @@ -372,25 +377,26 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } }, - "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { "version": "3.0.0", "restore": { - "projectUniqueName": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", "projectName": "PdfSharp", - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -439,25 +445,26 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } }, - "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { + "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", "projectName": "SupportClasses", - "projectPath": "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "F:\\GIT\\ASCKU_PC\\SupportClasses\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -502,25 +509,26 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } }, - "F:\\GIT\\ASCKU_PC\\Tests\\Tests.csproj": { + "D:\\GIT\\ASCKU_PC\\Tests\\Tests.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "F:\\GIT\\ASCKU_PC\\Tests\\Tests.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\Tests\\Tests.csproj", "projectName": "Tests", - "projectPath": "F:\\GIT\\ASCKU_PC\\Tests\\Tests.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "F:\\GIT\\ASCKU_PC\\Tests\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\Tests\\Tests.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\Tests\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -536,23 +544,23 @@ "netcoreapp3.1": { "targetAlias": "netcoreapp3.1", "projectReferences": { - "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj" + "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj" }, - "F:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj" + "D:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj" }, - "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" }, - "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj" }, - "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" }, - "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" } } } @@ -591,7 +599,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/Tests/obj/Tests.csproj.nuget.g.props b/Tests/obj/Tests.csproj.nuget.g.props index b7eb83f..471ec1a 100644 --- a/Tests/obj/Tests.csproj.nuget.g.props +++ b/Tests/obj/Tests.csproj.nuget.g.props @@ -5,14 +5,15 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\Admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\ + C:\Users\google\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\;C:\Program Files\dotnet\sdk\NuGetFallbackFolder PackageReference - 5.10.0 + 5.9.0 - + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) diff --git a/Tests/obj/project.assets.json b/Tests/obj/project.assets.json index 5726389..bcb6a0e 100644 --- a/Tests/obj/project.assets.json +++ b/Tests/obj/project.assets.json @@ -359,25 +359,27 @@ ] }, "packageFolders": { - "C:\\Users\\Admin\\.nuget\\packages\\": {}, + "C:\\Users\\google\\.nuget\\packages\\": {}, "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}, - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {} + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}, + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "F:\\GIT\\ASCKU_PC\\Tests\\Tests.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\Tests\\Tests.csproj", "projectName": "Tests", - "projectPath": "F:\\GIT\\ASCKU_PC\\Tests\\Tests.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "F:\\GIT\\ASCKU_PC\\Tests\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\Tests\\Tests.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\Tests\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -393,23 +395,23 @@ "netcoreapp3.1": { "targetAlias": "netcoreapp3.1", "projectReferences": { - "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj" + "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj" }, - "F:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj" + "D:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj" }, - "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" }, - "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj" }, - "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" }, - "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { - "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" } } } @@ -448,7 +450,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/Tests/obj/project.nuget.cache b/Tests/obj/project.nuget.cache index 87152ef..d1c05b3 100644 --- a/Tests/obj/project.nuget.cache +++ b/Tests/obj/project.nuget.cache @@ -1,14 +1,14 @@ { "version": 2, - "dgSpecHash": "zK/4dC8hKqmLq51tC8l8/0202gukmtzSZfNBg4AgicoMz8gJJbvvmn/ofJMvJvVdR0W99DmmDNeS+DE5PcI1og==", + "dgSpecHash": "+JVwZP7/0pLNGuHgZlzASiN8JWedGIGhi98le9dVNBxqkkn0YIfoy1/t55ebd/PW/fwEUZP6BzK0vbkfIdOJQw==", "success": true, - "projectFilePath": "F:\\GIT\\ASCKU_PC\\Tests\\Tests.csproj", + "projectFilePath": "D:\\GIT\\ASCKU_PC\\Tests\\Tests.csproj", "expectedPackageFiles": [ - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.netcore.platforms\\3.1.1\\microsoft.netcore.platforms.3.1.1.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.win32.systemevents\\4.5.0\\microsoft.win32.systemevents.4.5.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\sharpziplib\\1.2.0\\sharpziplib.1.2.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\system.drawing.common\\4.5.0\\system.drawing.common.4.5.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\system.text.encoding.codepages\\4.7.1\\system.text.encoding.codepages.4.7.1.nupkg.sha512" + "C:\\Users\\google\\.nuget\\packages\\microsoft.netcore.platforms\\3.1.1\\microsoft.netcore.platforms.3.1.1.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\microsoft.win32.systemevents\\4.5.0\\microsoft.win32.systemevents.4.5.0.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\sharpziplib\\1.2.0\\sharpziplib.1.2.0.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\system.drawing.common\\4.5.0\\system.drawing.common.4.5.0.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\system.text.encoding.codepages\\4.7.1\\system.text.encoding.codepages.4.7.1.nupkg.sha512" ], "logs": [] } \ No newline at end of file