Browse Source

Fixed compile errors

pull/288/head
RogueException 8 years ago
parent
commit
d7b1c4577d
4 changed files with 9 additions and 15 deletions
  1. +6
    -2
      src/Discord.Net.Net45/Discord.Net.csproj
  2. +0
    -8
      src/Discord.Net.Net45/Enums/GameType.cs
  3. +1
    -3
      src/Discord.Net/Enums/TokenType.cs
  4. +2
    -2
      test/Discord.Net.Tests/Tests.cs

+ 6
- 2
src/Discord.Net.Net45/Discord.Net.csproj View File

@@ -418,6 +418,9 @@
<Compile Include="..\Discord.Net\Enums\ConnectionState.cs">
<Link>Enums\ConnectionState.cs</Link>
</Compile>
<Compile Include="..\Discord.Net\Enums\GameType.cs">
<Link>Enums\GameType.cs</Link>
</Compile>
<Compile Include="..\Discord.Net\Enums\ImageType.cs">
<Link>Enums\ImageType.cs</Link>
</Compile>
@@ -439,6 +442,9 @@
<Compile Include="..\Discord.Net\Enums\StringEnum.cs">
<Link>Enums\StringEnum.cs</Link>
</Compile>
<Compile Include="..\Discord.Net\Enums\TokenType.cs">
<Link>Enums\TokenType.cs</Link>
</Compile>
<Compile Include="..\Discord.Net\Enums\UserStatus.cs">
<Link>Enums\UserStatus.cs</Link>
</Compile>
@@ -610,8 +616,6 @@
<Compile Include="..\Discord.Net\TaskManager.cs">
<Link>TaskManager.cs</Link>
</Compile>
<Compile Include="Enums\GameType.cs" />
<Compile Include="Enums\TokenType.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>


+ 0
- 8
src/Discord.Net.Net45/Enums/GameType.cs View File

@@ -1,8 +0,0 @@
namespace Discord
{
public enum GameType : int
{
Default = 0, // "NotStreaming", pretty much
Twitch
}
}

src/Discord.Net.Net45/Enums/TokenType.cs → src/Discord.Net/Enums/TokenType.cs View File

@@ -1,6 +1,4 @@
using System;

namespace Discord
namespace Discord
{
public enum TokenType
{

+ 2
- 2
test/Discord.Net.Tests/Tests.cs View File

@@ -54,7 +54,7 @@ namespace Discord.Tests
_targetBot = new DiscordClient();
_observerBot = new DiscordClient();

await _hostClient.Connect(HostBotToken);
await _hostClient.Connect(HostBotToken, TokenType.Bot);

await Task.Delay(3000);

@@ -79,7 +79,7 @@ namespace Discord.Tests
{
AssertEvent(
"READY never received",
async () => await _observerBot.Connect(ObserverBotToken),
async () => await _observerBot.Connect(ObserverBotToken, TokenType.Bot),
x => _observerBot.Ready += x,
x => _observerBot.Ready -= x,
null,


Loading…
Cancel
Save