From be9567e608199b29a6d9a5dffa6214560805d1e3 Mon Sep 17 00:00:00 2001 From: Daniel Date: Tue, 21 Jul 2020 18:48:20 +0200 Subject: [PATCH 01/14] Update README.md Added winget setup command. --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e8ead6d..210c2b9 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,9 @@ *Discord Media Loader* is a small tool for downloading all attachments of *Discord* servers. -**[Download](https://github.com/Serraniel/DiscordMediaLoader/releases)** **Build:** [![build status badge](https://ci.serraniel.com/app/rest/builds/buildType:(DiscordMediaLoader_BuildMaster)/statusIcon)](https://ci.serraniel.com/viewType.html?buildTypeId=DiscordMediaLoader_BuildMaster) +**[Downloadlatest release](https://github.com/Serraniel/DiscordMediaLoader/releases)** or install with *winget*: `winget install Serraniel.DiscordMediaLoder -e`. + +**Build:** [![build status badge](https://ci.serraniel.com/app/rest/builds/buildType:(DiscordMediaLoader_BuildMaster)/statusIcon)](https://ci.serraniel.com/viewType.html?buildTypeId=DiscordMediaLoader_BuildMaster) ## License -- 2.43.4 From f6135572fe7b13d002f5253e92b9b77e6268b92e Mon Sep 17 00:00:00 2001 From: Serraniel Date: Mon, 27 Jul 2020 10:41:45 +0200 Subject: [PATCH 02/14] #34 Dev DB path REVERT THIS LATER!!! --- Discord Media Loader.Application/Classes/Core.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Discord Media Loader.Application/Classes/Core.cs b/Discord Media Loader.Application/Classes/Core.cs index 1f9d25b..f720687 100644 --- a/Discord Media Loader.Application/Classes/Core.cs +++ b/Discord Media Loader.Application/Classes/Core.cs @@ -92,7 +92,7 @@ namespace DML.Application.Classes } Logger.Debug("Loading database..."); - Database = new LiteDatabase(Path.Combine(DataDirectory, "config.db")); + Database = new LiteDatabase(Path.Combine(DataDirectory, "config_dev.db")); Database.Log.Logging += (message) => Logger.Trace($"LiteDB: {message}"); Logger.Debug("Loading settings collection out of database..."); -- 2.43.4 From 123a2e696580b736408b071f21f823048757a810 Mon Sep 17 00:00:00 2001 From: Serraniel Date: Mon, 27 Jul 2020 11:23:27 +0200 Subject: [PATCH 03/14] #64 Updated Discord.Net nuget packages --- DML.Client/DML.Client.csproj | 5 ++- .../DML.Application.csproj | 41 ++++++++++++------- .../Properties/AssemblyInfo.cs | 2 +- Discord Media Loader.Application/app.config | 36 ++++++++-------- .../packages.config | 41 +++++++++++-------- Discord Media Loader/App.config | 6 +-- .../Discord Media Loader.csproj | 36 +++++++--------- .../Properties/AssemblyInfo.cs | 2 +- Discord Media Loader/packages.config | 15 +++---- 9 files changed, 97 insertions(+), 87 deletions(-) diff --git a/DML.Client/DML.Client.csproj b/DML.Client/DML.Client.csproj index 3bcc684..e408e6c 100644 --- a/DML.Client/DML.Client.csproj +++ b/DML.Client/DML.Client.csproj @@ -1,11 +1,12 @@ - netstandard1.4 + netstandard2.0 - + + diff --git a/Discord Media Loader.Application/DML.Application.csproj b/Discord Media Loader.Application/DML.Application.csproj index 5a56419..325aa30 100644 --- a/Discord Media Loader.Application/DML.Application.csproj +++ b/Discord Media Loader.Application/DML.Application.csproj @@ -11,6 +11,7 @@ Discord Media Loader.Application v4.6.1 512 + true @@ -30,28 +31,31 @@ 4 - - ..\packages\Discord.Net.Commands.1.0.2\lib\netstandard1.1\Discord.Net.Commands.dll + + ..\packages\Discord.Net.Commands.2.2.0\lib\net461\Discord.Net.Commands.dll - - ..\packages\Discord.Net.Core.1.0.2\lib\net45\Discord.Net.Core.dll + + ..\packages\Discord.Net.Core.2.2.0\lib\net461\Discord.Net.Core.dll - - ..\packages\Discord.Net.Rest.1.0.2\lib\net45\Discord.Net.Rest.dll + + ..\packages\Discord.Net.Rest.2.2.0\lib\net461\Discord.Net.Rest.dll ..\packages\Discord.Net.Rpc.1.0.2\lib\net45\Discord.Net.Rpc.dll - - ..\packages\Discord.Net.Webhook.1.0.2\lib\netstandard1.1\Discord.Net.Webhook.dll + + ..\packages\Discord.Net.Webhook.2.2.0\lib\netstandard2.0\Discord.Net.Webhook.dll - - ..\packages\Discord.Net.WebSocket.1.0.2\lib\net45\Discord.Net.WebSocket.dll + + ..\packages\Discord.Net.WebSocket.2.2.0\lib\net461\Discord.Net.WebSocket.dll ..\packages\LiteDB.3.1.0\lib\net35\LiteDB.dll True + + ..\packages\Microsoft.Bcl.AsyncInterfaces.1.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + ..\packages\Microsoft.Extensions.DependencyInjection.1.1.1\lib\netstandard1.1\Microsoft.Extensions.DependencyInjection.dll @@ -64,8 +68,8 @@ ..\packages\Microsoft.Win32.Registry.4.3.0\lib\net46\Microsoft.Win32.Registry.dll - - ..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll ..\packages\Nito.AsyncEx.3.0.1\lib\net45\Nito.AsyncEx.dll @@ -109,8 +113,8 @@ ..\packages\System.Globalization.Calendars.4.3.0\lib\net46\System.Globalization.Calendars.dll - - ..\packages\System.Interactive.Async.3.1.1\lib\net46\System.Interactive.Async.dll + + ..\packages\System.Interactive.Async.4.0.0\lib\net461\System.Interactive.Async.dll ..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll @@ -126,6 +130,9 @@ ..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll + + ..\packages\System.Linq.Async.4.0.0\lib\net461\System.Linq.Async.dll + ..\packages\System.Net.Http.4.3.0\lib\net46\System.Net.Http.dll @@ -133,6 +140,9 @@ ..\packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll True @@ -149,6 +159,9 @@ ..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll + + ..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + diff --git a/Discord Media Loader.Application/Properties/AssemblyInfo.cs b/Discord Media Loader.Application/Properties/AssemblyInfo.cs index bdeb7bf..1dc3334 100644 --- a/Discord Media Loader.Application/Properties/AssemblyInfo.cs +++ b/Discord Media Loader.Application/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -using System.Reflection; +using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; diff --git a/Discord Media Loader.Application/app.config b/Discord Media Loader.Application/app.config index 05e0aae..290c08c 100644 --- a/Discord Media Loader.Application/app.config +++ b/Discord Media Loader.Application/app.config @@ -1,39 +1,39 @@ - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - \ No newline at end of file + diff --git a/Discord Media Loader.Application/packages.config b/Discord Media Loader.Application/packages.config index 9142f47..69cddad 100644 --- a/Discord Media Loader.Application/packages.config +++ b/Discord Media Loader.Application/packages.config @@ -1,24 +1,26 @@  - - - + + + + - - + + + - + - + @@ -27,40 +29,43 @@ - + - - + + - - + + + - + - - + + + - + - + - + + diff --git a/Discord Media Loader/App.config b/Discord Media Loader/App.config index 1974fd7..f494462 100644 --- a/Discord Media Loader/App.config +++ b/Discord Media Loader/App.config @@ -11,7 +11,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -31,7 +31,7 @@ - + diff --git a/Discord Media Loader/Discord Media Loader.csproj b/Discord Media Loader/Discord Media Loader.csproj index 0977fa7..c7d7e50 100644 --- a/Discord Media Loader/Discord Media Loader.csproj +++ b/Discord Media Loader/Discord Media Loader.csproj @@ -40,23 +40,8 @@ - - ..\packages\Discord.Net.Commands.1.0.2\lib\netstandard1.1\Discord.Net.Commands.dll - - - ..\packages\Discord.Net.Core.1.0.2\lib\net45\Discord.Net.Core.dll - - - ..\packages\Discord.Net.Rest.1.0.2\lib\net45\Discord.Net.Rest.dll - - - ..\packages\Discord.Net.Rpc.1.0.2\lib\net45\Discord.Net.Rpc.dll - - - ..\packages\Discord.Net.Webhook.1.0.2\lib\netstandard1.1\Discord.Net.Webhook.dll - - - ..\packages\Discord.Net.WebSocket.1.0.2\lib\net45\Discord.Net.WebSocket.dll + + ..\packages\Microsoft.Bcl.AsyncInterfaces.1.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll ..\packages\Microsoft.Extensions.DependencyInjection.1.1.1\lib\netstandard1.1\Microsoft.Extensions.DependencyInjection.dll @@ -67,8 +52,8 @@ ..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll - - ..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll ..\packages\Nito.AsyncEx.3.0.1\lib\net45\Nito.AsyncEx.dll @@ -105,8 +90,8 @@ ..\packages\System.Globalization.Calendars.4.3.0\lib\net46\System.Globalization.Calendars.dll - - ..\packages\System.Interactive.Async.3.1.1\lib\net46\System.Interactive.Async.dll + + ..\packages\System.Interactive.Async.4.0.0\lib\net461\System.Interactive.Async.dll ..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll @@ -122,6 +107,9 @@ ..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll + + ..\packages\System.Linq.Async.4.0.0\lib\net461\System.Linq.Async.dll + ..\packages\System.Net.Http.4.3.0\lib\net46\System.Net.Http.dll @@ -129,6 +117,9 @@ ..\packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll True @@ -145,6 +136,9 @@ ..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll + + ..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + diff --git a/Discord Media Loader/Properties/AssemblyInfo.cs b/Discord Media Loader/Properties/AssemblyInfo.cs index 682e27d..91f52f3 100644 --- a/Discord Media Loader/Properties/AssemblyInfo.cs +++ b/Discord Media Loader/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -using System.Reflection; +using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; diff --git a/Discord Media Loader/packages.config b/Discord Media Loader/packages.config index eff2573..f262ed7 100644 --- a/Discord Media Loader/packages.config +++ b/Discord Media Loader/packages.config @@ -1,18 +1,12 @@  - - - - - - - + - + @@ -27,13 +21,14 @@ - + + @@ -44,6 +39,7 @@ + @@ -58,6 +54,7 @@ + -- 2.43.4 From 80cab1ea445c66d18a269729d46c6f32c279066f Mon Sep 17 00:00:00 2001 From: Serraniel Date: Mon, 27 Jul 2020 11:26:01 +0200 Subject: [PATCH 04/14] #34 Temporary disabled login code --- DML.Client/DMLClient.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/DML.Client/DMLClient.cs b/DML.Client/DMLClient.cs index 07060f0..9b43d1f 100644 --- a/DML.Client/DMLClient.cs +++ b/DML.Client/DMLClient.cs @@ -6,11 +6,12 @@ namespace DML.Client { public static class DMLClient { - public static DiscordSocketClient Client { get; set; } = new DiscordSocketClient(new DiscordSocketConfig(){DefaultRetryMode = RetryMode.RetryRatelimit|RetryMode.RetryTimeouts}); + public static DiscordSocketClient Client { get; set; } = new DiscordSocketClient(new DiscordSocketConfig() { DefaultRetryMode = RetryMode.RetryRatelimit | RetryMode.RetryTimeouts }); public static async Task Login(string token) { - await Client.LoginAsync(TokenType.User, token); + // TODO: Fix Login with usertoken + //await Client.LoginAsync(TokenType.User, token); await Client.StartAsync(); await Task.Delay(1000); -- 2.43.4 From aab8d15a8cef856cb7ebe7e75455c73f34f403f2 Mon Sep 17 00:00:00 2001 From: Serraniel Date: Mon, 27 Jul 2020 11:31:51 +0200 Subject: [PATCH 05/14] #34 Switch to C#8 and syntax fixes for AsyncEnumerable --- Discord Media Loader.Application/Classes/Job.cs | 4 ++-- Discord Media Loader.Application/DML.Application.csproj | 2 ++ .../DML.Application.csproj.DotSettings | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 Discord Media Loader.Application/DML.Application.csproj.DotSettings diff --git a/Discord Media Loader.Application/Classes/Job.cs b/Discord Media Loader.Application/Classes/Job.cs index 1b5c8d0..ce8aa33 100644 --- a/Discord Media Loader.Application/Classes/Job.cs +++ b/Discord Media Loader.Application/Classes/Job.cs @@ -95,7 +95,7 @@ namespace DML.AppCore.Classes if (isFirst) { //messages = await channel.GetMessagesAsync(limit).ToArray() as SocketMessage[]; - var realMessages = await channel.GetMessagesAsync(limit).ToArray(); + var realMessages = await channel.GetMessagesAsync(limit).ToArrayAsync(); foreach (var realMessageArray in realMessages) { @@ -107,7 +107,7 @@ namespace DML.AppCore.Classes } else { - var realMessages = await channel.GetMessagesAsync(lastId, Direction.Before, limit).ToArray(); + var realMessages = await channel.GetMessagesAsync(lastId, Direction.Before, limit).ToArrayAsync(); foreach (var realMessageArray in realMessages) { diff --git a/Discord Media Loader.Application/DML.Application.csproj b/Discord Media Loader.Application/DML.Application.csproj index 325aa30..b85fb9b 100644 --- a/Discord Media Loader.Application/DML.Application.csproj +++ b/Discord Media Loader.Application/DML.Application.csproj @@ -21,6 +21,7 @@ DEBUG;TRACE prompt 4 + 8 pdbonly @@ -29,6 +30,7 @@ TRACE prompt 4 + 8 diff --git a/Discord Media Loader.Application/DML.Application.csproj.DotSettings b/Discord Media Loader.Application/DML.Application.csproj.DotSettings new file mode 100644 index 0000000..b9fd6ee --- /dev/null +++ b/Discord Media Loader.Application/DML.Application.csproj.DotSettings @@ -0,0 +1,2 @@ + + CSharp80 \ No newline at end of file -- 2.43.4 From b002031cc31023b8416cba5d16b0bcb8040b8e38 Mon Sep 17 00:00:00 2001 From: Serraniel Date: Mon, 27 Jul 2020 11:38:46 +0200 Subject: [PATCH 06/14] #34 added Discord.Net Sumodule to fix API issues --- .gitmodules | 3 +++ libs/Discord.Net | 1 + 2 files changed, 4 insertions(+) create mode 100644 .gitmodules create mode 160000 libs/Discord.Net diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..8ee5af1 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "libs/Discord.Net"] + path = libs/Discord.Net + url = https://github.com/Serraniel/Discord.Net.git diff --git a/libs/Discord.Net b/libs/Discord.Net new file mode 160000 index 0000000..42ba372 --- /dev/null +++ b/libs/Discord.Net @@ -0,0 +1 @@ +Subproject commit 42ba3720e3b2206a54d96425aa78b268efc6da15 -- 2.43.4 From a464b2cd11a2822feebd6b3892d34652f38ea819 Mon Sep 17 00:00:00 2001 From: Serraniel Date: Mon, 27 Jul 2020 11:58:27 +0200 Subject: [PATCH 07/14] #34 Switched from Discord.Net nuget package to submodule --- DML.Client/DML.Client.csproj | 6 +- .../DML.Application.csproj | 30 ++++------ Discord Media Loader.Application/app.config | 36 ++++++------ .../packages.config | 7 --- Discord Media Loader.sln | 57 ++++++++++++++++++- 5 files changed, 88 insertions(+), 48 deletions(-) diff --git a/DML.Client/DML.Client.csproj b/DML.Client/DML.Client.csproj index e408e6c..775b030 100644 --- a/DML.Client/DML.Client.csproj +++ b/DML.Client/DML.Client.csproj @@ -1,12 +1,12 @@ - + netstandard2.0 - - + + diff --git a/Discord Media Loader.Application/DML.Application.csproj b/Discord Media Loader.Application/DML.Application.csproj index b85fb9b..9458da1 100644 --- a/Discord Media Loader.Application/DML.Application.csproj +++ b/Discord Media Loader.Application/DML.Application.csproj @@ -33,24 +33,6 @@ 8 - - ..\packages\Discord.Net.Commands.2.2.0\lib\net461\Discord.Net.Commands.dll - - - ..\packages\Discord.Net.Core.2.2.0\lib\net461\Discord.Net.Core.dll - - - ..\packages\Discord.Net.Rest.2.2.0\lib\net461\Discord.Net.Rest.dll - - - ..\packages\Discord.Net.Rpc.1.0.2\lib\net45\Discord.Net.Rpc.dll - - - ..\packages\Discord.Net.Webhook.2.2.0\lib\netstandard2.0\Discord.Net.Webhook.dll - - - ..\packages\Discord.Net.WebSocket.2.2.0\lib\net461\Discord.Net.WebSocket.dll - ..\packages\LiteDB.3.1.0\lib\net35\LiteDB.dll True @@ -233,6 +215,18 @@ {045eb4a1-34e7-47e0-867e-e10c40505095} DML.Client + + {8bd82fae-47f7-41fd-a862-892c8aff8c66} + Discord.Net.Core + + + {103472c3-834d-4561-9395-6febfeb165ac} + Discord.Net.Rest + + + {58009f12-b2d9-4f1c-954b-a7cfea17dbc7} + Discord.Net.WebSocket + diff --git a/Discord Media Loader.Application/app.config b/Discord Media Loader.Application/app.config index 290c08c..b3635f7 100644 --- a/Discord Media Loader.Application/app.config +++ b/Discord Media Loader.Application/app.config @@ -1,39 +1,39 @@ - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + diff --git a/Discord Media Loader.Application/packages.config b/Discord Media Loader.Application/packages.config index 69cddad..093503d 100644 --- a/Discord Media Loader.Application/packages.config +++ b/Discord Media Loader.Application/packages.config @@ -1,12 +1,5 @@  - - - - - - - diff --git a/Discord Media Loader.sln b/Discord Media Loader.sln index 09f9aa3..e56fab5 100644 --- a/Discord Media Loader.sln +++ b/Discord Media Loader.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26730.16 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29324.140 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Discord Media Loader", "Discord Media Loader\Discord Media Loader.csproj", "{EDC92554-DBC1-4F9C-9317-379A8BF441E8}" EndProject @@ -9,6 +9,22 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DML.Application", "Discord EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DML.Client", "DML.Client\DML.Client.csproj", "{045EB4A1-34E7-47E0-867E-E10C40505095}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Discord.Net.Core", "libs\Discord.Net\src\Discord.Net.Core\Discord.Net.Core.csproj", "{8BD82FAE-47F7-41FD-A862-892C8AFF8C66}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libs", "libs", "{451BDCAA-EC43-475E-8887-0F80EA605A73}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Discord.Net.Analyzers", "libs\Discord.Net\src\Discord.Net.Analyzers\Discord.Net.Analyzers.csproj", "{99FB0F60-AEEC-4059-9605-6FA2D7408EFC}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Discord.Net.Commands", "libs\Discord.Net\src\Discord.Net.Commands\Discord.Net.Commands.csproj", "{B3B30663-625D-452F-A3D7-57B381D021F6}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Discord.Net.Providers.WS4Net", "libs\Discord.Net\src\Discord.Net.Providers.WS4Net\Discord.Net.Providers.WS4Net.csproj", "{AD6116CD-1DC1-4FED-A2D5-0E72B553DD32}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Discord.Net.Rest", "libs\Discord.Net\src\Discord.Net.Rest\Discord.Net.Rest.csproj", "{103472C3-834D-4561-9395-6FEBFEB165AC}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Discord.Net.Webhook", "libs\Discord.Net\src\Discord.Net.Webhook\Discord.Net.Webhook.csproj", "{58D6AEF3-5837-4601-A5D3-C6F11AC313B0}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Discord.Net.WebSocket", "libs\Discord.Net\src\Discord.Net.WebSocket\Discord.Net.WebSocket.csproj", "{58009F12-B2D9-4F1C-954B-A7CFEA17DBC7}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -27,10 +43,47 @@ Global {045EB4A1-34E7-47E0-867E-E10C40505095}.Debug|Any CPU.Build.0 = Debug|Any CPU {045EB4A1-34E7-47E0-867E-E10C40505095}.Release|Any CPU.ActiveCfg = Release|Any CPU {045EB4A1-34E7-47E0-867E-E10C40505095}.Release|Any CPU.Build.0 = Release|Any CPU + {8BD82FAE-47F7-41FD-A862-892C8AFF8C66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8BD82FAE-47F7-41FD-A862-892C8AFF8C66}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8BD82FAE-47F7-41FD-A862-892C8AFF8C66}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8BD82FAE-47F7-41FD-A862-892C8AFF8C66}.Release|Any CPU.Build.0 = Release|Any CPU + {99FB0F60-AEEC-4059-9605-6FA2D7408EFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {99FB0F60-AEEC-4059-9605-6FA2D7408EFC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {99FB0F60-AEEC-4059-9605-6FA2D7408EFC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {99FB0F60-AEEC-4059-9605-6FA2D7408EFC}.Release|Any CPU.Build.0 = Release|Any CPU + {B3B30663-625D-452F-A3D7-57B381D021F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B3B30663-625D-452F-A3D7-57B381D021F6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B3B30663-625D-452F-A3D7-57B381D021F6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B3B30663-625D-452F-A3D7-57B381D021F6}.Release|Any CPU.Build.0 = Release|Any CPU + {AD6116CD-1DC1-4FED-A2D5-0E72B553DD32}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AD6116CD-1DC1-4FED-A2D5-0E72B553DD32}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AD6116CD-1DC1-4FED-A2D5-0E72B553DD32}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AD6116CD-1DC1-4FED-A2D5-0E72B553DD32}.Release|Any CPU.Build.0 = Release|Any CPU + {103472C3-834D-4561-9395-6FEBFEB165AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {103472C3-834D-4561-9395-6FEBFEB165AC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {103472C3-834D-4561-9395-6FEBFEB165AC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {103472C3-834D-4561-9395-6FEBFEB165AC}.Release|Any CPU.Build.0 = Release|Any CPU + {58D6AEF3-5837-4601-A5D3-C6F11AC313B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {58D6AEF3-5837-4601-A5D3-C6F11AC313B0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {58D6AEF3-5837-4601-A5D3-C6F11AC313B0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {58D6AEF3-5837-4601-A5D3-C6F11AC313B0}.Release|Any CPU.Build.0 = Release|Any CPU + {58009F12-B2D9-4F1C-954B-A7CFEA17DBC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {58009F12-B2D9-4F1C-954B-A7CFEA17DBC7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {58009F12-B2D9-4F1C-954B-A7CFEA17DBC7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {58009F12-B2D9-4F1C-954B-A7CFEA17DBC7}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {8BD82FAE-47F7-41FD-A862-892C8AFF8C66} = {451BDCAA-EC43-475E-8887-0F80EA605A73} + {99FB0F60-AEEC-4059-9605-6FA2D7408EFC} = {451BDCAA-EC43-475E-8887-0F80EA605A73} + {B3B30663-625D-452F-A3D7-57B381D021F6} = {451BDCAA-EC43-475E-8887-0F80EA605A73} + {AD6116CD-1DC1-4FED-A2D5-0E72B553DD32} = {451BDCAA-EC43-475E-8887-0F80EA605A73} + {103472C3-834D-4561-9395-6FEBFEB165AC} = {451BDCAA-EC43-475E-8887-0F80EA605A73} + {58D6AEF3-5837-4601-A5D3-C6F11AC313B0} = {451BDCAA-EC43-475E-8887-0F80EA605A73} + {58009F12-B2D9-4F1C-954B-A7CFEA17DBC7} = {451BDCAA-EC43-475E-8887-0F80EA605A73} + EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {0B742DE0-D6AF-4033-9605-863C32A7FFD8} EndGlobalSection -- 2.43.4 From 4d9f40ac04cf09e7c15fe08c60efc049bc4326a8 Mon Sep 17 00:00:00 2001 From: Serraniel Date: Mon, 27 Jul 2020 12:02:41 +0200 Subject: [PATCH 08/14] #34 Updated submodule to enable user tokens again --- libs/Discord.Net | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/Discord.Net b/libs/Discord.Net index 42ba372..d78a44f 160000 --- a/libs/Discord.Net +++ b/libs/Discord.Net @@ -1 +1 @@ -Subproject commit 42ba3720e3b2206a54d96425aa78b268efc6da15 +Subproject commit d78a44f38cf98133b877f6dda4844e1df17d023e -- 2.43.4 From 237ab35e70f3b17305a0fed684890a488b33cc81 Mon Sep 17 00:00:00 2001 From: Serraniel Date: Mon, 27 Jul 2020 12:53:05 +0200 Subject: [PATCH 09/14] #34 Enabled user login again --- DML.Client/DMLClient.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/DML.Client/DMLClient.cs b/DML.Client/DMLClient.cs index 9b43d1f..59fb2e3 100644 --- a/DML.Client/DMLClient.cs +++ b/DML.Client/DMLClient.cs @@ -10,8 +10,7 @@ namespace DML.Client public static async Task Login(string token) { - // TODO: Fix Login with usertoken - //await Client.LoginAsync(TokenType.User, token); + await Client.LoginAsync(TokenType.User, token); await Client.StartAsync(); await Task.Delay(1000); -- 2.43.4 From 88eb90da181372ba495f7ac4ba839c90f39e4c26 Mon Sep 17 00:00:00 2001 From: Serraniel Date: Mon, 27 Jul 2020 12:53:37 +0200 Subject: [PATCH 10/14] #34 Updated multiple other packages --- .../DML.Application.csproj | 90 ++++++++++++------- Discord Media Loader.Application/app.config | 34 ++++++- .../packages.config | 66 +++++++++----- Discord Media Loader/App.config | 34 ++++++- .../Discord Media Loader.csproj | 65 +++++++++----- Discord Media Loader/packages.config | 51 ++++++----- 6 files changed, 237 insertions(+), 103 deletions(-) diff --git a/Discord Media Loader.Application/DML.Application.csproj b/Discord Media Loader.Application/DML.Application.csproj index 9458da1..e1abba0 100644 --- a/Discord Media Loader.Application/DML.Application.csproj +++ b/Discord Media Loader.Application/DML.Application.csproj @@ -33,46 +33,59 @@ 8 - - ..\packages\LiteDB.3.1.0\lib\net35\LiteDB.dll - True + + ..\packages\LiteDB.4.1.4\lib\net40\LiteDB.dll - ..\packages\Microsoft.Bcl.AsyncInterfaces.1.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + ..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll - - ..\packages\Microsoft.Extensions.DependencyInjection.1.1.1\lib\netstandard1.1\Microsoft.Extensions.DependencyInjection.dll + + ..\packages\Microsoft.Extensions.DependencyInjection.3.1.6\lib\net461\Microsoft.Extensions.DependencyInjection.dll - - ..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.1.1\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll + + ..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.6\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll ..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll - - ..\packages\Microsoft.Win32.Registry.4.3.0\lib\net46\Microsoft.Win32.Registry.dll + + ..\packages\Microsoft.Win32.Registry.4.7.0\lib\net461\Microsoft.Win32.Registry.dll ..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll - - ..\packages\Nito.AsyncEx.3.0.1\lib\net45\Nito.AsyncEx.dll - True + + ..\packages\Nito.AsyncEx.Context.5.0.0\lib\netstandard2.0\Nito.AsyncEx.Context.dll - - ..\packages\Nito.AsyncEx.3.0.1\lib\net45\Nito.AsyncEx.Concurrent.dll - True + + ..\packages\Nito.AsyncEx.Coordination.5.0.0\lib\netstandard2.0\Nito.AsyncEx.Coordination.dll - - ..\packages\Nito.AsyncEx.3.0.1\lib\net45\Nito.AsyncEx.Enlightenment.dll - True + + ..\packages\Nito.AsyncEx.Interop.WaitHandles.5.0.0\lib\netstandard2.0\Nito.AsyncEx.Interop.WaitHandles.dll - - ..\packages\RestSharp.105.2.3\lib\net46\RestSharp.dll - True + + ..\packages\Nito.AsyncEx.Oop.5.0.0\lib\netstandard2.0\Nito.AsyncEx.Oop.dll - - ..\packages\SharpRaven.2.2.0\lib\net45\SharpRaven.dll + + ..\packages\Nito.AsyncEx.Tasks.5.0.0\lib\netstandard2.0\Nito.AsyncEx.Tasks.dll + + + ..\packages\Nito.Cancellation.1.0.5\lib\netstandard2.0\Nito.Cancellation.dll + + + ..\packages\Nito.Collections.Deque.1.0.4\lib\netstandard2.0\Nito.Collections.Deque.dll + + + ..\packages\Nito.Disposables.2.1.0\lib\net461\Nito.Disposables.dll + + + ..\packages\Octokit.0.48.0\lib\net46\Octokit.dll + + + ..\packages\RestSharp.106.11.4\lib\net452\RestSharp.dll + + + ..\packages\SharpRaven.2.4.0\lib\net45\SharpRaven.dll ..\packages\SweetLib.0.2.1-alpha\lib\netstandard1.3\SweetLib.dll @@ -81,11 +94,14 @@ ..\packages\System.AppContext.4.3.0\lib\net46\System.AppContext.dll - - ..\packages\System.Collections.Immutable.1.3.1\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll - True + + ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + + + ..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll + ..\packages\System.Console.4.3.0\lib\net46\System.Console.dll @@ -117,6 +133,9 @@ ..\packages\System.Linq.Async.4.0.0\lib\net461\System.Linq.Async.dll + + ..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll + ..\packages\System.Net.Http.4.3.0\lib\net46\System.Net.Http.dll @@ -124,13 +143,20 @@ ..\packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll + + ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + + - ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll True + + ..\packages\System.Security.AccessControl.4.7.0\lib\net461\System.Security.AccessControl.dll + ..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net461\System.Security.Cryptography.Algorithms.dll @@ -143,9 +169,13 @@ ..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll - - ..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + + ..\packages\System.Security.Principal.Windows.4.7.0\lib\net461\System.Security.Principal.Windows.dll + + ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + + diff --git a/Discord Media Loader.Application/app.config b/Discord Media Loader.Application/app.config index b3635f7..ee0ebcd 100644 --- a/Discord Media Loader.Application/app.config +++ b/Discord Media Loader.Application/app.config @@ -8,7 +8,7 @@ - + @@ -20,7 +20,7 @@ - + @@ -32,7 +32,35 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Discord Media Loader.Application/packages.config b/Discord Media Loader.Application/packages.config index 093503d..73a19af 100644 --- a/Discord Media Loader.Application/packages.config +++ b/Discord Media Loader.Application/packages.config @@ -1,26 +1,38 @@  - - - - - + + + + + - + - - - + + + + + + + + + + + + + + - + + - + - + @@ -32,35 +44,41 @@ - + - - + + + + + + - - - + + + - + + - + + - + - + - + - + \ No newline at end of file diff --git a/Discord Media Loader/App.config b/Discord Media Loader/App.config index f494462..9bd9a4c 100644 --- a/Discord Media Loader/App.config +++ b/Discord Media Loader/App.config @@ -7,7 +7,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -35,7 +35,35 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Discord Media Loader/Discord Media Loader.csproj b/Discord Media Loader/Discord Media Loader.csproj index c7d7e50..d9c4be6 100644 --- a/Discord Media Loader/Discord Media Loader.csproj +++ b/Discord Media Loader/Discord Media Loader.csproj @@ -41,13 +41,13 @@ - ..\packages\Microsoft.Bcl.AsyncInterfaces.1.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + ..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll - - ..\packages\Microsoft.Extensions.DependencyInjection.1.1.1\lib\netstandard1.1\Microsoft.Extensions.DependencyInjection.dll + + ..\packages\Microsoft.Extensions.DependencyInjection.3.1.6\lib\net461\Microsoft.Extensions.DependencyInjection.dll - - ..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.1.1\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll + + ..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.6\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll ..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll @@ -55,29 +55,42 @@ ..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll - - ..\packages\Nito.AsyncEx.3.0.1\lib\net45\Nito.AsyncEx.dll - True + + ..\packages\Nito.AsyncEx.Context.5.0.0\lib\netstandard2.0\Nito.AsyncEx.Context.dll - - ..\packages\Nito.AsyncEx.3.0.1\lib\net45\Nito.AsyncEx.Concurrent.dll - True + + ..\packages\Nito.AsyncEx.Coordination.5.0.0\lib\netstandard2.0\Nito.AsyncEx.Coordination.dll - - ..\packages\Nito.AsyncEx.3.0.1\lib\net45\Nito.AsyncEx.Enlightenment.dll - True + + ..\packages\Nito.AsyncEx.Interop.WaitHandles.5.0.0\lib\netstandard2.0\Nito.AsyncEx.Interop.WaitHandles.dll - - ..\packages\Octokit.0.24.1-alpha0001\lib\net45\Octokit.dll - True + + ..\packages\Nito.AsyncEx.Oop.5.0.0\lib\netstandard2.0\Nito.AsyncEx.Oop.dll + + + ..\packages\Nito.AsyncEx.Tasks.5.0.0\lib\netstandard2.0\Nito.AsyncEx.Tasks.dll + + + ..\packages\Nito.Cancellation.1.0.5\lib\netstandard2.0\Nito.Cancellation.dll + + + ..\packages\Nito.Collections.Deque.1.0.4\lib\netstandard2.0\Nito.Collections.Deque.dll + + + ..\packages\Nito.Disposables.2.1.0\lib\net461\Nito.Disposables.dll + + + ..\packages\Octokit.0.48.0\lib\net46\Octokit.dll ..\packages\System.AppContext.4.3.0\lib\net46\System.AppContext.dll - - ..\packages\System.Collections.Immutable.1.3.1\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll - True + + ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + + + ..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll @@ -110,6 +123,9 @@ ..\packages\System.Linq.Async.4.0.0\lib\net461\System.Linq.Async.dll + + ..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll + ..\packages\System.Net.Http.4.3.0\lib\net46\System.Net.Http.dll @@ -117,8 +133,11 @@ ..\packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll + + ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + - ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll @@ -136,8 +155,8 @@ ..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll - - ..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + + ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll diff --git a/Discord Media Loader/packages.config b/Discord Media Loader/packages.config index f262ed7..73dfd70 100644 --- a/Discord Media Loader/packages.config +++ b/Discord Media Loader/packages.config @@ -1,22 +1,31 @@  - - - - + + + + - - + + + + + + + + + + + - + - + - + @@ -28,34 +37,36 @@ - + - - + + + + - - - + + + - + - + - + - + - + \ No newline at end of file -- 2.43.4 From c9f998de10956679b43484414de802edaaf5d3e2 Mon Sep 17 00:00:00 2001 From: Serraniel Date: Mon, 27 Jul 2020 12:55:27 +0200 Subject: [PATCH 11/14] #34 set correct .Net standard --- Discord Media Loader.Application/packages.config | 2 +- Discord Media Loader/packages.config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Discord Media Loader.Application/packages.config b/Discord Media Loader.Application/packages.config index 73a19af..a53e09d 100644 --- a/Discord Media Loader.Application/packages.config +++ b/Discord Media Loader.Application/packages.config @@ -7,7 +7,7 @@ - + diff --git a/Discord Media Loader/packages.config b/Discord Media Loader/packages.config index 73dfd70..a013433 100644 --- a/Discord Media Loader/packages.config +++ b/Discord Media Loader/packages.config @@ -5,7 +5,7 @@ - + -- 2.43.4 From 4fdae5b5bbfa08cc4042845309f86439b8708156 Mon Sep 17 00:00:00 2001 From: Serraniel Date: Mon, 27 Jul 2020 12:55:59 +0200 Subject: [PATCH 12/14] Revert "#34 Dev DB path" This reverts commit f6135572fe7b13d002f5253e92b9b77e6268b92e. --- Discord Media Loader.Application/Classes/Core.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Discord Media Loader.Application/Classes/Core.cs b/Discord Media Loader.Application/Classes/Core.cs index f720687..1f9d25b 100644 --- a/Discord Media Loader.Application/Classes/Core.cs +++ b/Discord Media Loader.Application/Classes/Core.cs @@ -92,7 +92,7 @@ namespace DML.Application.Classes } Logger.Debug("Loading database..."); - Database = new LiteDatabase(Path.Combine(DataDirectory, "config_dev.db")); + Database = new LiteDatabase(Path.Combine(DataDirectory, "config.db")); Database.Log.Logging += (message) => Logger.Trace($"LiteDB: {message}"); Logger.Debug("Loading settings collection out of database..."); -- 2.43.4 From a32cf6c6ad55d64d8c1b5faf859541b1a2295922 Mon Sep 17 00:00:00 2001 From: Serraniel Date: Mon, 27 Jul 2020 12:58:39 +0200 Subject: [PATCH 13/14] #34 Some project settings --- .../DML.Application.csproj | 70 ++++++++++++++----- .../Discord Media Loader.csproj | 47 +++++++++---- 2 files changed, 86 insertions(+), 31 deletions(-) diff --git a/Discord Media Loader.Application/DML.Application.csproj b/Discord Media Loader.Application/DML.Application.csproj index e1abba0..474cae7 100644 --- a/Discord Media Loader.Application/DML.Application.csproj +++ b/Discord Media Loader.Application/DML.Application.csproj @@ -12,6 +12,8 @@ v4.6.1 512 + + true @@ -87,6 +89,9 @@ ..\packages\SharpRaven.2.4.0\lib\net45\SharpRaven.dll + + ..\packages\SuperSocket.ClientEngine.Core.0.10.0\lib\net45\SuperSocket.ClientEngine.dll + ..\packages\SweetLib.0.2.1-alpha\lib\netstandard1.3\SweetLib.dll @@ -100,14 +105,21 @@ ..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll + + ..\packages\System.Collections.Specialized.4.3.0\lib\net46\System.Collections.Specialized.dll + True + True + - - ..\packages\System.Console.4.3.0\lib\net46\System.Console.dll + + ..\packages\System.Console.4.3.1\lib\net46\System.Console.dll + True + True - - ..\packages\System.Diagnostics.DiagnosticSource.4.3.0\lib\net46\System.Diagnostics.DiagnosticSource.dll + + ..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll @@ -130,14 +142,26 @@ ..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll - - ..\packages\System.Linq.Async.4.0.0\lib\net461\System.Linq.Async.dll + + ..\packages\System.Linq.Async.4.1.1\lib\net461\System.Linq.Async.dll ..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll - - ..\packages\System.Net.Http.4.3.0\lib\net46\System.Net.Http.dll + + ..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll + True + True + + + ..\packages\System.Net.NameResolution.4.3.0\lib\net46\System.Net.NameResolution.dll + True + True + + + ..\packages\System.Net.Security.4.3.2\lib\net46\System.Net.Security.dll + True + True ..\packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll @@ -147,8 +171,8 @@ ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll @@ -158,7 +182,9 @@ ..\packages\System.Security.AccessControl.4.7.0\lib\net461\System.Security.AccessControl.dll - ..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net461\System.Security.Cryptography.Algorithms.dll + ..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net461\System.Security.Cryptography.Algorithms.dll + True + True ..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll @@ -166,8 +192,10 @@ ..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll - - ..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll + + ..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll + True + True ..\packages\System.Security.Principal.Windows.4.7.0\lib\net461\System.Security.Principal.Windows.dll @@ -183,11 +211,12 @@ - ..\packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll - - - ..\packages\WebSocket4Net.0.14.1\lib\net45\WebSocket4Net.dll + ..\packages\System.Xml.ReaderWriter.4.3.1\lib\net46\System.Xml.ReaderWriter.dll True + True + + + ..\packages\WebSocket4Net.0.15.2\lib\net45\WebSocket4Net.dll @@ -265,6 +294,13 @@ + + + + Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}". + + +