diff options
| author | Dennis Kobert <d-kobert@web.de> | 2019-05-05 23:14:17 +0200 |
|---|---|---|
| committer | Dennis Kobert <d-kobert@web.de> | 2019-05-05 23:14:17 +0200 |
| commit | d574650f70daa0cee15220eea305ca7eb594a746 (patch) | |
| tree | 7cc46e53c0317d9e83c46d551e0543e339f6bb1f /DiscoBot | |
| parent | f563fc69cb15047051982f2e7c0364b98ee9d2da (diff) | |
Revert "fixed Properties load path"
This reverts commit 6543b93a67a14ffa6f184e28b67912df7e314315.
Diffstat (limited to 'DiscoBot')
| -rw-r--r-- | DiscoBot/DiscoBot.csproj | 25 | ||||
| -rw-r--r-- | DiscoBot/Program.cs | 2 | ||||
| -rw-r--r-- | DiscoBot/packages.config | 12 |
3 files changed, 17 insertions, 22 deletions
diff --git a/DiscoBot/DiscoBot.csproj b/DiscoBot/DiscoBot.csproj index 7da96db..d25a5e9 100644 --- a/DiscoBot/DiscoBot.csproj +++ b/DiscoBot/DiscoBot.csproj @@ -35,28 +35,23 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Discord.Net.Commands, Version=2.0.1.0, Culture=neutral, PublicKeyToken=null"> - <HintPath>..\packages\Discord.Net.Commands.2.0.1\lib\net46\Discord.Net.Commands.dll</HintPath> - <Private>True</Private> + <Reference Include="Discord.Net.Commands, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Discord.Net.Commands.2.0.0-beta\lib\netstandard1.1\Discord.Net.Commands.dll</HintPath> </Reference> - <Reference Include="Discord.Net.Core, Version=2.0.1.0, Culture=neutral, PublicKeyToken=null"> - <HintPath>..\packages\Discord.Net.Core.2.0.1\lib\net46\Discord.Net.Core.dll</HintPath> - <Private>True</Private> + <Reference Include="Discord.Net.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Discord.Net.Core.2.0.0-beta\lib\net45\Discord.Net.Core.dll</HintPath> </Reference> - <Reference Include="Discord.Net.Rest, Version=2.0.1.0, Culture=neutral, PublicKeyToken=null"> - <HintPath>..\packages\Discord.Net.Rest.2.0.1\lib\net46\Discord.Net.Rest.dll</HintPath> - <Private>True</Private> + <Reference Include="Discord.Net.Rest, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Discord.Net.Rest.2.0.0-beta\lib\net45\Discord.Net.Rest.dll</HintPath> </Reference> <Reference Include="Discord.Net.Rpc, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL"> <HintPath>..\packages\Discord.Net.Rpc.1.0.2\lib\net45\Discord.Net.Rpc.dll</HintPath> </Reference> - <Reference Include="Discord.Net.Webhook, Version=2.0.1.0, Culture=neutral, PublicKeyToken=null"> - <HintPath>..\packages\Discord.Net.Webhook.2.0.1\lib\netstandard1.3\Discord.Net.Webhook.dll</HintPath> - <Private>True</Private> + <Reference Include="Discord.Net.Webhook, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Discord.Net.Webhook.2.0.0-beta\lib\netstandard1.1\Discord.Net.Webhook.dll</HintPath> </Reference> - <Reference Include="Discord.Net.WebSocket, Version=2.0.1.0, Culture=neutral, PublicKeyToken=null"> - <HintPath>..\packages\Discord.Net.WebSocket.2.0.1\lib\net46\Discord.Net.WebSocket.dll</HintPath> - <Private>True</Private> + <Reference Include="Discord.Net.WebSocket, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Discord.Net.WebSocket.2.0.0-beta\lib\net45\Discord.Net.WebSocket.dll</HintPath> </Reference> <Reference Include="FSharp.Core, Version=4.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> <HintPath>..\packages\FSharp.Core.4.5.2\lib\net45\FSharp.Core.dll</HintPath> diff --git a/DiscoBot/Program.cs b/DiscoBot/Program.cs index 9675b48..5dc69c1 100644 --- a/DiscoBot/Program.cs +++ b/DiscoBot/Program.cs @@ -53,7 +53,7 @@ namespace DiscoBot this.client.MessageReceived += this.HandleCommandAsync; // Discover all of the commands in this assembly and load them. - return this.commands.AddModulesAsync(Assembly.GetEntryAssembly(), services); + return this.commands.AddModulesAsync(Assembly.GetEntryAssembly()); } public async Task HandleCommandAsync(SocketMessage messageParam) diff --git a/DiscoBot/packages.config b/DiscoBot/packages.config index b1d02d9..4aa29aa 100644 --- a/DiscoBot/packages.config +++ b/DiscoBot/packages.config @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="Discord.Net" version="2.0.1" targetFramework="net461" /> - <package id="Discord.Net.Commands" version="2.0.1" targetFramework="net461" /> - <package id="Discord.Net.Core" version="2.0.1" targetFramework="net461" /> - <package id="Discord.Net.Rest" version="2.0.1" targetFramework="net461" /> + <package id="Discord.Net" version="2.0.0-beta" targetFramework="net461" /> + <package id="Discord.Net.Commands" version="2.0.0-beta" targetFramework="net461" /> + <package id="Discord.Net.Core" version="2.0.0-beta" targetFramework="net461" /> + <package id="Discord.Net.Rest" version="2.0.0-beta" targetFramework="net461" /> <package id="Discord.Net.Rpc" version="1.0.2" targetFramework="net461" /> - <package id="Discord.Net.Webhook" version="2.0.1" targetFramework="net461" /> - <package id="Discord.Net.WebSocket" version="2.0.1" targetFramework="net461" /> + <package id="Discord.Net.Webhook" version="2.0.0-beta" targetFramework="net461" /> + <package id="Discord.Net.WebSocket" version="2.0.0-beta" targetFramework="net461" /> <package id="FSharp.Core" version="4.5.2" targetFramework="net461" /> <package id="Microsoft.Extensions.DependencyInjection" version="2.2.0-preview2-35157" targetFramework="net461" /> <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.2.0-preview2-35157" targetFramework="net461" /> |