diff --git a/NetWork/NetWork.csproj b/NetWork/NetWork.csproj index 7b2dc92..6538645 100644 --- a/NetWork/NetWork.csproj +++ b/NetWork/NetWork.csproj @@ -22,6 +22,9 @@ + + + diff --git a/NetWork/Program.cs b/NetWork/Program.cs index 8401575..b96ab03 100644 --- a/NetWork/Program.cs +++ b/NetWork/Program.cs @@ -6,12 +6,21 @@ using System.Text.RegularExpressions; using NAudio.CoreAudioApi; using SimpleWifi; using DotRas; - +using NLog; namespace NetWork { class Program { - + public static Logger StartLogger() + { + var config = new NLog.Config.LoggingConfiguration(); + var logfile = new NLog.Targets.FileTarget("lgfle") { FileName = "logme.txt" }; + config.AddRule(LogLevel.Debug,LogLevel.Fatal,logfile); + NLog.LogManager.Configuration= config; + NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger(); + return logger; + } + public static Logger logger = StartLogger(); public static string[] StringsOfPaths = System.IO.Directory.GetFiles(@"C:\Program Files\Google\Drive File Stream\", "GoogleDriveFS.exe", System.IO.SearchOption.AllDirectories); public static Dictionary progs = new() { { "GoogleDriveFS", StringsOfPaths[^1] }, { "googledrivesync", @"C:\Program Files\Google\Drive\googledrivesync.exe" }, { "qbittorrent", @"C:\Program Files\qBittorrent\qbittorrent.exe" }, { "Surfshark", @"C:\Program Files (x86)\Surfshark\Surfshark.exe" } }; public static Dictionary paths = new() { { StringsOfPaths[^1], "GoogleDriveFS.exe" }, { @"C:\Program Files\Google\Drive\googledrivesync.exe", "googledrivesync.exe" }, { @"C:\Program Files\qBittorrent\qbittorrent.exe", "qbittorrent.exe" }, { @"C:\Program Files (x86)\Surfshark\Surfshark.exe", "Surfshark" } }; @@ -22,24 +31,20 @@ namespace NetWork /// A bool parameter. it swiches between stopping (default) and starting rdp session. public static void StopRDP(bool stop = true) { + if (stop) { Process[] ids = Process.GetProcessesByName("mstsc"); foreach (var id in ids) { - - ManagementObjectSearcher search = new($"SELECT CommandLine FROM Win32_Process WHERE ProcessId = {id.Id}"); + logger.Debug(id.MainWindowTitle); Regex rdp = new("(משרדוש.rdp|161.2)"); - foreach (var searchedObject in search.Get()) + if (rdp.IsMatch(id.MainWindowTitle) || id.MainWindowTitle.Equals("חיבור לשולחן עבודה מרוחק")) { - if (rdp.Match(searchedObject["CommandLine"].ToString()).Success) - { - id.Kill(); - } + id.Kill(); } Console.WriteLine(""); } - } else { @@ -50,24 +55,21 @@ namespace NetWork } else { + bool started = false; foreach (var id in ids) { - bool started = false; - ManagementObjectSearcher search = new($"SELECT CommandLine FROM Win32_Process WHERE ProcessId = {id.Id}"); Regex rdp = new("(משרדוש.rdp|161.2)"); - foreach (var searchedObject in search.Get()) + logger.Debug(id.MainWindowTitle); + if (rdp.IsMatch(id.MainWindowTitle) || id.MainWindowTitle.Equals("חיבור לשולחן עבודה מרוחק")) { - if (rdp.Match(searchedObject["CommandLine"].ToString()).Success) - { - started = true; - } - } - if (!started) - { - StartProgram("rdp"); - } + started = true; + } + } + if (!started) + { + StartProgram("rdp"); + } - } Console.WriteLine(""); } @@ -349,22 +351,22 @@ namespace NetWork switch (HirarcyNetworks(network_connection)) { case "vpn": - programs_to_run = new string[] { "googledrivesync", "GoogleDriveFS", "qbittorrent", "Surfshark" }; + programs_to_run = new string[] { "GoogleDriveFS", "qbittorrent", "Surfshark" }; programs_to_stop = new string[] { "rdp" }; mute = false; break; case "ek": - programs_to_run = new string[] { "rdp", "googledrivesync", "GoogleDriveFS" }; + programs_to_run = new string[] { "rdp", "GoogleDriveFS" }; programs_to_stop = new string[] { "qbittorrent", "Surfshark" }; mute = false; break; case "good_lan": - programs_to_run = new string[] { "googledrivesync", "GoogleDriveFS", "qbittorrent", "Surfshark" }; + programs_to_run = new string[] { "GoogleDriveFS", "qbittorrent", "Surfshark" }; programs_to_stop = new string[] { "rdp" }; mute = false; break; case "lan": - programs_to_run = new string[] { "rdp", "googledrivesync", "GoogleDriveFS" }; + programs_to_run = new string[] { "rdp", "GoogleDriveFS" }; programs_to_stop = new string[] { "qbittorrent", "Surfshark" }; mute = false; Dial(true); @@ -372,15 +374,15 @@ namespace NetWork default: if (network_connection["Wi-Fi"]) { - programs_to_run = new string[] { "googledrivesync", "GoogleDriveFS", "qbittorrent", "Surfshark" }; + programs_to_run = new string[] { "GoogleDriveFS", "qbittorrent", "Surfshark" }; programs_to_stop = new string[] { "rdp" }; mute = false; break; } else { - programs_to_run = new string[] { "googledrivesync", "GoogleDriveFS" }; - programs_to_stop = new string[] { "qbittorrent", "Surfshark" }; + programs_to_run = new string[] { "GoogleDriveFS" }; + programs_to_stop = new string[] { "qbittorrent", "Surfshark","rdp" }; mute = true; } break; @@ -397,6 +399,7 @@ namespace NetWork } static void Main(string[] args) { + logger.Debug("me"); DoTheSchtik(); } diff --git a/NetWork/Properties/PublishProfiles/FolderProfile.pubxml.user b/NetWork/Properties/PublishProfiles/FolderProfile.pubxml.user index e07767e..c5a6575 100644 --- a/NetWork/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/NetWork/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -4,6 +4,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121. --> - True|2021-06-26T18:39:14.9764613Z; + True|2021-07-05T16:01:01.3302488Z;False|2021-07-05T18:53:34.6361454+03:00;False|2021-07-05T18:51:45.7049687+03:00;True|2021-06-26T21:39:14.9764613+03:00; \ No newline at end of file diff --git a/NetWork/obj/Debug/NetWork.1.0.0.nuspec b/NetWork/obj/Debug/NetWork.1.0.0.nuspec index 85b357f..9828145 100644 --- a/NetWork/obj/Debug/NetWork.1.0.0.nuspec +++ b/NetWork/obj/Debug/NetWork.1.0.0.nuspec @@ -14,6 +14,9 @@ + + + diff --git a/NetWork/obj/Debug/net5.0-windows7.0/NetWork.assets.cache b/NetWork/obj/Debug/net5.0-windows7.0/NetWork.assets.cache index 9653bb1..f1fd9c5 100644 Binary files a/NetWork/obj/Debug/net5.0-windows7.0/NetWork.assets.cache and b/NetWork/obj/Debug/net5.0-windows7.0/NetWork.assets.cache differ diff --git a/NetWork/obj/Debug/net5.0-windows7.0/NetWork.csproj.CoreCompileInputs.cache b/NetWork/obj/Debug/net5.0-windows7.0/NetWork.csproj.CoreCompileInputs.cache index d4b0283..56aba21 100644 --- a/NetWork/obj/Debug/net5.0-windows7.0/NetWork.csproj.CoreCompileInputs.cache +++ b/NetWork/obj/Debug/net5.0-windows7.0/NetWork.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -b12bbc8565f6610c6edf9c63353648b20956c171 +a19c91e593629bc1868d5ae3b28d0cacd1cd4802 diff --git a/NetWork/obj/Debug/net5.0-windows7.0/NetWork.csproj.FileListAbsolute.txt b/NetWork/obj/Debug/net5.0-windows7.0/NetWork.csproj.FileListAbsolute.txt index c44e1fa..9b2be40 100644 --- a/NetWork/obj/Debug/net5.0-windows7.0/NetWork.csproj.FileListAbsolute.txt +++ b/NetWork/obj/Debug/net5.0-windows7.0/NetWork.csproj.FileListAbsolute.txt @@ -205,3 +205,13 @@ C:\Users\סארט\source\repos\NetWork\NetWork\obj\Debug\net5.0-windows7.0\ref\N C:\Users\סארט\source\repos\NetWork\NetWork\obj\Debug\net5.0-windows7.0\NetWork.genruntimeconfig.cache C:\Users\סארט\source\repos\NetWork\NetWork\bin\Debug\net5.0-windows7.0\SimpleWifi.dll C:\Users\סארט\source\repos\NetWork\NetWork\bin\Debug\net5.0-windows7.0\DotRas.dll +C:\Users\סארט\source\repos\NetWork\NetWork\bin\Debug\net5.0-windows7.0\Microsoft.Extensions.Configuration.Abstractions.dll +C:\Users\סארט\source\repos\NetWork\NetWork\bin\Debug\net5.0-windows7.0\Microsoft.Extensions.DependencyInjection.dll +C:\Users\סארט\source\repos\NetWork\NetWork\bin\Debug\net5.0-windows7.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll +C:\Users\סארט\source\repos\NetWork\NetWork\bin\Debug\net5.0-windows7.0\Microsoft.Extensions.Logging.dll +C:\Users\סארט\source\repos\NetWork\NetWork\bin\Debug\net5.0-windows7.0\Microsoft.Extensions.Logging.Abstractions.dll +C:\Users\סארט\source\repos\NetWork\NetWork\bin\Debug\net5.0-windows7.0\Microsoft.Extensions.Options.dll +C:\Users\סארט\source\repos\NetWork\NetWork\bin\Debug\net5.0-windows7.0\Microsoft.Extensions.Primitives.dll +C:\Users\סארט\source\repos\NetWork\NetWork\bin\Debug\net5.0-windows7.0\NLog.dll +C:\Users\סארט\source\repos\NetWork\NetWork\bin\Debug\net5.0-windows7.0\NLog.Extensions.Logging.dll +C:\Users\סארט\source\repos\NetWork\NetWork\bin\Debug\net5.0-windows7.0\Serilog.dll diff --git a/NetWork/obj/Debug/net5.0-windows7.0/apphost.exe b/NetWork/obj/Debug/net5.0-windows7.0/apphost.exe index 07756c9..d04c032 100644 Binary files a/NetWork/obj/Debug/net5.0-windows7.0/apphost.exe and b/NetWork/obj/Debug/net5.0-windows7.0/apphost.exe differ diff --git a/NetWork/obj/NetWork.csproj.nuget.dgspec.json b/NetWork/obj/NetWork.csproj.nuget.dgspec.json index 58bf49f..368967e 100644 --- a/NetWork/obj/NetWork.csproj.nuget.dgspec.json +++ b/NetWork/obj/NetWork.csproj.nuget.dgspec.json @@ -73,6 +73,18 @@ "target": "Package", "version": "[2.0.3, )" }, + "NLog": { + "target": "Package", + "version": "[4.7.10, )" + }, + "NLog.Extensions.Logging": { + "target": "Package", + "version": "[1.7.3, )" + }, + "Serilog": { + "target": "Package", + "version": "[2.10.0, )" + }, "SimpleWifi.netstandard": { "target": "Package", "version": "[2.0.0, )" @@ -97,7 +109,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.302\\RuntimeIdentifierGraph.json" } } } diff --git a/NetWork/obj/project.assets.json b/NetWork/obj/project.assets.json index 556269e..6ffbb2a 100644 --- a/NetWork/obj/project.assets.json +++ b/NetWork/obj/project.assets.json @@ -17,6 +17,85 @@ "lib/net40/DotRas.dll": {} } }, + "Microsoft.Extensions.Configuration.Abstractions/5.0.0": { + "type": "package", + "dependencies": { + "Microsoft.Extensions.Primitives": "5.0.0" + }, + "compile": { + "lib/netstandard2.0/Microsoft.Extensions.Configuration.Abstractions.dll": {} + }, + "runtime": { + "lib/netstandard2.0/Microsoft.Extensions.Configuration.Abstractions.dll": {} + } + }, + "Microsoft.Extensions.DependencyInjection/5.0.0": { + "type": "package", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "5.0.0" + }, + "compile": { + "lib/net5.0/Microsoft.Extensions.DependencyInjection.dll": {} + }, + "runtime": { + "lib/net5.0/Microsoft.Extensions.DependencyInjection.dll": {} + } + }, + "Microsoft.Extensions.DependencyInjection.Abstractions/5.0.0": { + "type": "package", + "compile": { + "lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll": {} + }, + "runtime": { + "lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll": {} + } + }, + "Microsoft.Extensions.Logging/5.0.0": { + "type": "package", + "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" + }, + "compile": { + "lib/netstandard2.1/Microsoft.Extensions.Logging.dll": {} + }, + "runtime": { + "lib/netstandard2.1/Microsoft.Extensions.Logging.dll": {} + } + }, + "Microsoft.Extensions.Logging.Abstractions/5.0.0": { + "type": "package", + "compile": { + "lib/netstandard2.0/Microsoft.Extensions.Logging.Abstractions.dll": {} + }, + "runtime": { + "lib/netstandard2.0/Microsoft.Extensions.Logging.Abstractions.dll": {} + } + }, + "Microsoft.Extensions.Options/5.0.0": { + "type": "package", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "5.0.0", + "Microsoft.Extensions.Primitives": "5.0.0" + }, + "compile": { + "lib/net5.0/Microsoft.Extensions.Options.dll": {} + }, + "runtime": { + "lib/net5.0/Microsoft.Extensions.Options.dll": {} + } + }, + "Microsoft.Extensions.Primitives/5.0.0": { + "type": "package", + "compile": { + "lib/netcoreapp3.0/Microsoft.Extensions.Primitives.dll": {} + }, + "runtime": { + "lib/netcoreapp3.0/Microsoft.Extensions.Primitives.dll": {} + } + }, "Microsoft.Management.Infrastructure/2.0.0": { "type": "package", "dependencies": { @@ -1007,6 +1086,38 @@ "build/netstandard2.0/NETStandard.Library.targets": {} } }, + "NLog/4.7.10": { + "type": "package", + "compile": { + "lib/netstandard2.0/NLog.dll": {} + }, + "runtime": { + "lib/netstandard2.0/NLog.dll": {} + } + }, + "NLog.Extensions.Logging/1.7.3": { + "type": "package", + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "5.0.0", + "Microsoft.Extensions.Logging": "5.0.0", + "NLog": "4.7.10" + }, + "compile": { + "lib/net5.0/NLog.Extensions.Logging.dll": {} + }, + "runtime": { + "lib/net5.0/NLog.Extensions.Logging.dll": {} + } + }, + "Serilog/2.10.0": { + "type": "package", + "compile": { + "lib/netstandard2.1/Serilog.dll": {} + }, + "runtime": { + "lib/netstandard2.1/Serilog.dll": {} + } + }, "SimpleWifi.netstandard/2.0.0": { "type": "package", "compile": { @@ -1116,6 +1227,156 @@ "lib/net40/DotRas.xml" ] }, + "Microsoft.Extensions.Configuration.Abstractions/5.0.0": { + "sha512": "ETjSBHMp3OAZ4HxGQYpwyGsD8Sw5FegQXphi0rpoGMT74S4+I2mm7XJEswwn59XAaKOzC15oDSOWEE8SzDCd6Q==", + "type": "package", + "path": "microsoft.extensions.configuration.abstractions/5.0.0", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "LICENSE.TXT", + "THIRD-PARTY-NOTICES.TXT", + "lib/net461/Microsoft.Extensions.Configuration.Abstractions.dll", + "lib/net461/Microsoft.Extensions.Configuration.Abstractions.xml", + "lib/netstandard2.0/Microsoft.Extensions.Configuration.Abstractions.dll", + "lib/netstandard2.0/Microsoft.Extensions.Configuration.Abstractions.xml", + "microsoft.extensions.configuration.abstractions.5.0.0.nupkg.sha512", + "microsoft.extensions.configuration.abstractions.nuspec", + "useSharedDesignerContext.txt", + "version.txt" + ] + }, + "Microsoft.Extensions.DependencyInjection/5.0.0": { + "sha512": "Rc2kb/p3Ze6cP6rhFC3PJRdWGbLvSHZc0ev7YlyeU6FmHciDMLrhoVoTUEzKPhN5ZjFgKF1Cf5fOz8mCMIkvpA==", + "type": "package", + "path": "microsoft.extensions.dependencyinjection/5.0.0", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "LICENSE.TXT", + "THIRD-PARTY-NOTICES.TXT", + "lib/net461/Microsoft.Extensions.DependencyInjection.dll", + "lib/net461/Microsoft.Extensions.DependencyInjection.xml", + "lib/net5.0/Microsoft.Extensions.DependencyInjection.dll", + "lib/net5.0/Microsoft.Extensions.DependencyInjection.xml", + "lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.dll", + "lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.xml", + "lib/netstandard2.1/Microsoft.Extensions.DependencyInjection.dll", + "lib/netstandard2.1/Microsoft.Extensions.DependencyInjection.xml", + "microsoft.extensions.dependencyinjection.5.0.0.nupkg.sha512", + "microsoft.extensions.dependencyinjection.nuspec", + "useSharedDesignerContext.txt", + "version.txt" + ] + }, + "Microsoft.Extensions.DependencyInjection.Abstractions/5.0.0": { + "sha512": "ORj7Zh81gC69TyvmcUm9tSzytcy8AVousi+IVRAI8nLieQjOFryRusSFh7+aLk16FN9pQNqJAiMd7BTKINK0kA==", + "type": "package", + "path": "microsoft.extensions.dependencyinjection.abstractions/5.0.0", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "LICENSE.TXT", + "THIRD-PARTY-NOTICES.TXT", + "lib/net461/Microsoft.Extensions.DependencyInjection.Abstractions.dll", + "lib/net461/Microsoft.Extensions.DependencyInjection.Abstractions.xml", + "lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll", + "lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.Abstractions.xml", + "microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg.sha512", + "microsoft.extensions.dependencyinjection.abstractions.nuspec", + "useSharedDesignerContext.txt", + "version.txt" + ] + }, + "Microsoft.Extensions.Logging/5.0.0": { + "sha512": "MgOwK6tPzB6YNH21wssJcw/2MKwee8b2gI7SllYfn6rvTpIrVvVS5HAjSU2vqSku1fwqRvWP0MdIi14qjd93Aw==", + "type": "package", + "path": "microsoft.extensions.logging/5.0.0", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "LICENSE.TXT", + "THIRD-PARTY-NOTICES.TXT", + "lib/net461/Microsoft.Extensions.Logging.dll", + "lib/net461/Microsoft.Extensions.Logging.xml", + "lib/netstandard2.0/Microsoft.Extensions.Logging.dll", + "lib/netstandard2.0/Microsoft.Extensions.Logging.xml", + "lib/netstandard2.1/Microsoft.Extensions.Logging.dll", + "lib/netstandard2.1/Microsoft.Extensions.Logging.xml", + "microsoft.extensions.logging.5.0.0.nupkg.sha512", + "microsoft.extensions.logging.nuspec", + "useSharedDesignerContext.txt", + "version.txt" + ] + }, + "Microsoft.Extensions.Logging.Abstractions/5.0.0": { + "sha512": "NxP6ahFcBnnSfwNBi2KH2Oz8Xl5Sm2krjId/jRR3I7teFphwiUoUeZPwTNA21EX+5PtjqmyAvKaOeBXcJjcH/w==", + "type": "package", + "path": "microsoft.extensions.logging.abstractions/5.0.0", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "LICENSE.TXT", + "THIRD-PARTY-NOTICES.TXT", + "lib/net461/Microsoft.Extensions.Logging.Abstractions.dll", + "lib/net461/Microsoft.Extensions.Logging.Abstractions.xml", + "lib/netstandard2.0/Microsoft.Extensions.Logging.Abstractions.dll", + "lib/netstandard2.0/Microsoft.Extensions.Logging.Abstractions.xml", + "microsoft.extensions.logging.abstractions.5.0.0.nupkg.sha512", + "microsoft.extensions.logging.abstractions.nuspec", + "useSharedDesignerContext.txt", + "version.txt" + ] + }, + "Microsoft.Extensions.Options/5.0.0": { + "sha512": "CBvR92TCJ5uBIdd9/HzDSrxYak+0W/3+yxrNg8Qm6Bmrkh5L+nu6m3WeazQehcZ5q1/6dDA7J5YdQjim0165zg==", + "type": "package", + "path": "microsoft.extensions.options/5.0.0", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "LICENSE.TXT", + "THIRD-PARTY-NOTICES.TXT", + "lib/net461/Microsoft.Extensions.Options.dll", + "lib/net461/Microsoft.Extensions.Options.xml", + "lib/net5.0/Microsoft.Extensions.Options.dll", + "lib/net5.0/Microsoft.Extensions.Options.xml", + "lib/netstandard2.0/Microsoft.Extensions.Options.dll", + "lib/netstandard2.0/Microsoft.Extensions.Options.xml", + "microsoft.extensions.options.5.0.0.nupkg.sha512", + "microsoft.extensions.options.nuspec", + "useSharedDesignerContext.txt", + "version.txt" + ] + }, + "Microsoft.Extensions.Primitives/5.0.0": { + "sha512": "cI/VWn9G1fghXrNDagX9nYaaB/nokkZn0HYAawGaELQrl8InSezfe9OnfPZLcJq3esXxygh3hkq2c3qoV3SDyQ==", + "type": "package", + "path": "microsoft.extensions.primitives/5.0.0", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "LICENSE.TXT", + "THIRD-PARTY-NOTICES.TXT", + "lib/net461/Microsoft.Extensions.Primitives.dll", + "lib/net461/Microsoft.Extensions.Primitives.xml", + "lib/netcoreapp3.0/Microsoft.Extensions.Primitives.dll", + "lib/netcoreapp3.0/Microsoft.Extensions.Primitives.xml", + "lib/netstandard2.0/Microsoft.Extensions.Primitives.dll", + "lib/netstandard2.0/Microsoft.Extensions.Primitives.xml", + "microsoft.extensions.primitives.5.0.0.nupkg.sha512", + "microsoft.extensions.primitives.nuspec", + "useSharedDesignerContext.txt", + "version.txt" + ] + }, "Microsoft.Management.Infrastructure/2.0.0": { "sha512": "IaKZRNBBv3sdrmBWd+aqwHq8cVHk/3WgWFAN/dt40MRY9rbtHiDfTTmaEN0tGTmQqGCGDo/ncntA8MvFMvcsRw==", "type": "package", @@ -1691,6 +1952,89 @@ "netstandard.library.nuspec" ] }, + "NLog/4.7.10": { + "sha512": "rcegW7kYOCjl7wX0SzsqpPBqnJ51JKi1WkYb6QBVX0Wc5IgH19Pv4t/co+T0s06OS0Ne44xgkY/mHg0PdrmJow==", + "type": "package", + "path": "nlog/4.7.10", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "lib/monoandroid44/NLog.dll", + "lib/monoandroid44/NLog.xml", + "lib/net35/NLog.dll", + "lib/net35/NLog.xml", + "lib/net40-client/NLog.dll", + "lib/net40-client/NLog.xml", + "lib/net45/NLog.dll", + "lib/net45/NLog.xml", + "lib/netstandard1.3/NLog.dll", + "lib/netstandard1.3/NLog.xml", + "lib/netstandard1.5/NLog.dll", + "lib/netstandard1.5/NLog.xml", + "lib/netstandard2.0/NLog.dll", + "lib/netstandard2.0/NLog.xml", + "lib/sl4/NLog.dll", + "lib/sl4/NLog.xml", + "lib/sl5/NLog.dll", + "lib/sl5/NLog.xml", + "lib/wp8/NLog.dll", + "lib/wp8/NLog.xml", + "lib/xamarinios10/NLog.dll", + "lib/xamarinios10/NLog.xml", + "nlog.4.7.10.nupkg.sha512", + "nlog.nuspec" + ] + }, + "NLog.Extensions.Logging/1.7.3": { + "sha512": "7RvUvGd9Ad37pNedjPHbCUroscLGuChLBo0OBveGp92vIpEHLZm/in+Ydd+c9qpv1XMQQIx7yZv1F5qyy/AxHQ==", + "type": "package", + "path": "nlog.extensions.logging/1.7.3", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "N.png", + "lib/net451/NLog.Extensions.Logging.dll", + "lib/net451/NLog.Extensions.Logging.xml", + "lib/net461/NLog.Extensions.Logging.dll", + "lib/net461/NLog.Extensions.Logging.xml", + "lib/net5.0/NLog.Extensions.Logging.dll", + "lib/net5.0/NLog.Extensions.Logging.xml", + "lib/netcoreapp3.0/NLog.Extensions.Logging.dll", + "lib/netcoreapp3.0/NLog.Extensions.Logging.xml", + "lib/netstandard1.3/NLog.Extensions.Logging.dll", + "lib/netstandard1.3/NLog.Extensions.Logging.xml", + "lib/netstandard1.5/NLog.Extensions.Logging.dll", + "lib/netstandard1.5/NLog.Extensions.Logging.xml", + "lib/netstandard2.0/NLog.Extensions.Logging.dll", + "lib/netstandard2.0/NLog.Extensions.Logging.xml", + "nlog.extensions.logging.1.7.3.nupkg.sha512", + "nlog.extensions.logging.nuspec" + ] + }, + "Serilog/2.10.0": { + "sha512": "+QX0hmf37a0/OZLxM3wL7V6/ADvC1XihXN4Kq/p6d8lCPfgkRdiuhbWlMaFjR9Av0dy5F0+MBeDmDdRZN/YwQA==", + "type": "package", + "path": "serilog/2.10.0", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "icon.png", + "lib/net45/Serilog.dll", + "lib/net45/Serilog.xml", + "lib/net46/Serilog.dll", + "lib/net46/Serilog.xml", + "lib/netstandard1.0/Serilog.dll", + "lib/netstandard1.0/Serilog.xml", + "lib/netstandard1.3/Serilog.dll", + "lib/netstandard1.3/Serilog.xml", + "lib/netstandard2.0/Serilog.dll", + "lib/netstandard2.0/Serilog.xml", + "lib/netstandard2.1/Serilog.dll", + "lib/netstandard2.1/Serilog.xml", + "serilog.2.10.0.nupkg.sha512", + "serilog.nuspec" + ] + }, "SimpleWifi.netstandard/2.0.0": { "sha512": "lJuk2zjX4snKbrxfDnDEwYb8dTFR/UbyMb9umljexOP1nuXjdYXNX3T2+zrdxZue359ZqvHC8aAAGkgWS6PFFw==", "type": "package", @@ -1866,6 +2210,9 @@ "Microsoft.NETCore.Windows.ApiSets-x64 >= 1.0.0", "NAudio >= 2.0.1", "NETStandard.Library >= 2.0.3", + "NLog >= 4.7.10", + "NLog.Extensions.Logging >= 1.7.3", + "Serilog >= 2.10.0", "SimpleWifi.netstandard >= 2.0.0", "System.Management >= 5.0.0" ] @@ -1943,6 +2290,18 @@ "target": "Package", "version": "[2.0.3, )" }, + "NLog": { + "target": "Package", + "version": "[4.7.10, )" + }, + "NLog.Extensions.Logging": { + "target": "Package", + "version": "[1.7.3, )" + }, + "Serilog": { + "target": "Package", + "version": "[2.10.0, )" + }, "SimpleWifi.netstandard": { "target": "Package", "version": "[2.0.0, )" @@ -1967,7 +2326,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.302\\RuntimeIdentifierGraph.json" } } }, diff --git a/NetWork/obj/project.nuget.cache b/NetWork/obj/project.nuget.cache index 7355b67..62a6cbd 100644 --- a/NetWork/obj/project.nuget.cache +++ b/NetWork/obj/project.nuget.cache @@ -1,11 +1,18 @@ { "version": 2, - "dgSpecHash": "eKrNSb5czMQrjXGP2pUE43ZmZzGO2c2J1hQ6OR0QcHyrRZp5+qziN7735xc7iLHR98jr2eXTcf/C4o0hrMzwDw==", + "dgSpecHash": "r0Hk06vwDhi8qjlLv7VastSp8B/ZpOaCY0jysAVwoA19LD4HimR6ftY0hQaul6RgLlDaF0ZruAqFuzpzuXgv5Q==", "success": true, "projectFilePath": "C:\\Users\\סארט\\source\\repos\\NetWork\\NetWork\\NetWork.csproj", "expectedPackageFiles": [ "C:\\Users\\סארט\\.nuget\\packages\\audiocontrol.x64\\1.0.1\\audiocontrol.x64.1.0.1.nupkg.sha512", "C:\\Users\\סארט\\.nuget\\packages\\dotras.for.win8\\1.3.0\\dotras.for.win8.1.3.0.nupkg.sha512", + "C:\\Users\\סארט\\.nuget\\packages\\microsoft.extensions.configuration.abstractions\\5.0.0\\microsoft.extensions.configuration.abstractions.5.0.0.nupkg.sha512", + "C:\\Users\\סארט\\.nuget\\packages\\microsoft.extensions.dependencyinjection\\5.0.0\\microsoft.extensions.dependencyinjection.5.0.0.nupkg.sha512", + "C:\\Users\\סארט\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\5.0.0\\microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg.sha512", + "C:\\Users\\סארט\\.nuget\\packages\\microsoft.extensions.logging\\5.0.0\\microsoft.extensions.logging.5.0.0.nupkg.sha512", + "C:\\Users\\סארט\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\5.0.0\\microsoft.extensions.logging.abstractions.5.0.0.nupkg.sha512", + "C:\\Users\\סארט\\.nuget\\packages\\microsoft.extensions.options\\5.0.0\\microsoft.extensions.options.5.0.0.nupkg.sha512", + "C:\\Users\\סארט\\.nuget\\packages\\microsoft.extensions.primitives\\5.0.0\\microsoft.extensions.primitives.5.0.0.nupkg.sha512", "C:\\Users\\סארט\\.nuget\\packages\\microsoft.management.infrastructure\\2.0.0\\microsoft.management.infrastructure.2.0.0.nupkg.sha512", "C:\\Users\\סארט\\.nuget\\packages\\microsoft.management.infrastructure.runtime.unix\\2.0.0\\microsoft.management.infrastructure.runtime.unix.2.0.0.nupkg.sha512", "C:\\Users\\סארט\\.nuget\\packages\\microsoft.management.infrastructure.runtime.win\\2.0.0\\microsoft.management.infrastructure.runtime.win.2.0.0.nupkg.sha512", @@ -21,6 +28,9 @@ "C:\\Users\\סארט\\.nuget\\packages\\naudio.winforms\\2.0.1\\naudio.winforms.2.0.1.nupkg.sha512", "C:\\Users\\סארט\\.nuget\\packages\\naudio.winmm\\2.0.1\\naudio.winmm.2.0.1.nupkg.sha512", "C:\\Users\\סארט\\.nuget\\packages\\netstandard.library\\2.0.3\\netstandard.library.2.0.3.nupkg.sha512", + "C:\\Users\\סארט\\.nuget\\packages\\nlog\\4.7.10\\nlog.4.7.10.nupkg.sha512", + "C:\\Users\\סארט\\.nuget\\packages\\nlog.extensions.logging\\1.7.3\\nlog.extensions.logging.1.7.3.nupkg.sha512", + "C:\\Users\\סארט\\.nuget\\packages\\serilog\\2.10.0\\serilog.2.10.0.nupkg.sha512", "C:\\Users\\סארט\\.nuget\\packages\\simplewifi.netstandard\\2.0.0\\simplewifi.netstandard.2.0.0.nupkg.sha512", "C:\\Users\\סארט\\.nuget\\packages\\system.codedom\\5.0.0\\system.codedom.5.0.0.nupkg.sha512", "C:\\Users\\סארט\\.nuget\\packages\\system.management\\5.0.0\\system.management.5.0.0.nupkg.sha512", diff --git a/Windows.Common/obj/Debug/Windows.Common.csproj.AssemblyReference.cache b/Windows.Common/obj/Debug/Windows.Common.csproj.AssemblyReference.cache index f5e894a..59a348f 100644 Binary files a/Windows.Common/obj/Debug/Windows.Common.csproj.AssemblyReference.cache and b/Windows.Common/obj/Debug/Windows.Common.csproj.AssemblyReference.cache differ diff --git a/Windows.Common/obj/Release/Windows.Common.csproj.AssemblyReference.cache b/Windows.Common/obj/Release/Windows.Common.csproj.AssemblyReference.cache new file mode 100644 index 0000000..f5e894a Binary files /dev/null and b/Windows.Common/obj/Release/Windows.Common.csproj.AssemblyReference.cache differ