From 7e3ad11a8b7d31909ab6e221e2eee32c5a73f9f4 Mon Sep 17 00:00:00 2001 From: Brandon Smith Date: Fri, 25 Sep 2015 22:01:30 -0300 Subject: [PATCH] Added MonoDevelop support --- .../Discord.Net.Commands.csproj | 11 +++- .../DiscordBotClient.Events.cs | 12 ++--- src/Discord.Net.Net45/Discord.Net.csproj | 18 ++++--- src/Discord.Net/DiscordClient.Events.cs | 51 +++++++++---------- .../WebSockets/Voice/VoiceWebSocket.cs | 2 +- 5 files changed, 52 insertions(+), 42 deletions(-) diff --git a/src/Discord.Net.Commands.Net45/Discord.Net.Commands.csproj b/src/Discord.Net.Commands.Net45/Discord.Net.Commands.csproj index 53ea9d46a..50c89e287 100644 --- a/src/Discord.Net.Commands.Net45/Discord.Net.Commands.csproj +++ b/src/Discord.Net.Commands.Net45/Discord.Net.Commands.csproj @@ -1,5 +1,5 @@  - + Debug @@ -11,6 +11,7 @@ Discord.Net.Commands 512 v4.5 + False true @@ -20,6 +21,7 @@ TRACE;DEBUG;NET45 prompt 4 + 6 pdbonly @@ -29,6 +31,7 @@ prompt 4 true + 6 @@ -59,4 +62,10 @@ --> + + + {8D71A857-879A-4A10-859E-5FF824ED6688} + Discord.Net + + \ No newline at end of file diff --git a/src/Discord.Net.Commands/DiscordBotClient.Events.cs b/src/Discord.Net.Commands/DiscordBotClient.Events.cs index 93c0ea44d..1930d6240 100644 --- a/src/Discord.Net.Commands/DiscordBotClient.Events.cs +++ b/src/Discord.Net.Commands/DiscordBotClient.Events.cs @@ -21,11 +21,11 @@ namespace Discord public CommandEventArgs(Message message, Command command, string commandText, int? permissions, string[] args) { - Message = message; - Command = command; - CommandText = commandText; - Permissions = permissions; - Args = args; + this.Message = message; + this.Command = command; + this.CommandText = commandText; + this.Permissions = permissions; + this.Args = args; } } public class CommandErrorEventArgs : CommandEventArgs @@ -35,7 +35,7 @@ namespace Discord public CommandErrorEventArgs(CommandEventArgs baseArgs, Exception ex) : base(baseArgs.Message, baseArgs.Command, baseArgs.CommandText, baseArgs.Permissions, baseArgs.Args) { - Exception = ex; + this.Exception = ex; } } public partial class DiscordBotClient : DiscordClient diff --git a/src/Discord.Net.Net45/Discord.Net.csproj b/src/Discord.Net.Net45/Discord.Net.csproj index 3fd23fc13..7a5ef0a27 100644 --- a/src/Discord.Net.Net45/Discord.Net.csproj +++ b/src/Discord.Net.Net45/Discord.Net.csproj @@ -1,5 +1,5 @@  - + Debug @@ -13,6 +13,7 @@ v4.5 + False true @@ -22,8 +23,8 @@ TRACE;DEBUG;NET45 prompt 2 - false true + 6 pdbonly @@ -34,6 +35,7 @@ 4 true true + 6 true @@ -45,18 +47,18 @@ AnyCPU prompt MinimumRecommendedRules.ruleset + false + 6 - + + + ..\..\..\DiscordBot\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll - True - + ..\..\..\DiscordBot\packages\RestSharp.105.2.3\lib\net45\RestSharp.dll - True - - diff --git a/src/Discord.Net/DiscordClient.Events.cs b/src/Discord.Net/DiscordClient.Events.cs index c781d3435..888b1437d 100644 --- a/src/Discord.Net/DiscordClient.Events.cs +++ b/src/Discord.Net/DiscordClient.Events.cs @@ -25,7 +25,12 @@ namespace Discord { public readonly bool WasUnexpected; public readonly Exception Error; - internal DisconnectedEventArgs(bool wasUnexpected, Exception error) { WasUnexpected = wasUnexpected; Error = error; } + + internal DisconnectedEventArgs(bool wasUnexpected, Exception error) + { + this.WasUnexpected = wasUnexpected; + this.Error = error; + } } public sealed class LogMessageEventArgs : EventArgs { @@ -33,7 +38,12 @@ namespace Discord public LogMessageSource Source { get; } public string Message { get; } - internal LogMessageEventArgs(LogMessageSeverity severity, LogMessageSource source, string msg) { Severity = severity; Source = source; Message = msg; } + internal LogMessageEventArgs(LogMessageSeverity severity, LogMessageSource source, string msg) + { + this.Severity = severity; + this.Source = source; + this.Message = msg; + } } public sealed class ServerEventArgs : EventArgs @@ -41,7 +51,7 @@ namespace Discord public Server Server { get; } public string ServerId => Server.Id; - internal ServerEventArgs(Server server) { Server = server; } + internal ServerEventArgs(Server server) { this.Server = server; } } public sealed class ChannelEventArgs : EventArgs { @@ -50,14 +60,14 @@ namespace Discord public Server Server => Channel.Server; public string ServerId => Channel.ServerId; - internal ChannelEventArgs(Channel channel) { Channel = channel; } + internal ChannelEventArgs(Channel channel) { this.Channel = channel; } } public sealed class UserEventArgs : EventArgs { public User User { get; } public string UserId => User.Id; - internal UserEventArgs(User user) { User = user; } + internal UserEventArgs(User user) { this.User = user; } } public sealed class MessageEventArgs : EventArgs { @@ -71,7 +81,7 @@ namespace Discord public User User => Member.User; public string UserId => Message.UserId; - internal MessageEventArgs(Message msg) { Message = msg; } + internal MessageEventArgs(Message msg) { this.Message = msg; } } public sealed class RoleEventArgs : EventArgs { @@ -80,7 +90,7 @@ namespace Discord public Server Server => Role.Server; public string ServerId => Role.ServerId; - internal RoleEventArgs(Role role) { Role = role; } + internal RoleEventArgs(Role role) { this.Role = role; } } public sealed class BanEventArgs : EventArgs { @@ -91,9 +101,9 @@ namespace Discord internal BanEventArgs(User user, string userId, Server server) { - User = user; - UserId = userId; - Server = server; + this.User = user; + this.UserId = userId; + this.Server = server; } } public sealed class MemberEventArgs : EventArgs @@ -104,7 +114,7 @@ namespace Discord public Server Server => Member.Server; public string ServerId => Member.ServerId; - internal MemberEventArgs(Member member) { Member = member; } + internal MemberEventArgs(Member member) { this.Member = member; } } public sealed class UserTypingEventArgs : EventArgs { @@ -117,8 +127,8 @@ namespace Discord internal UserTypingEventArgs(User user, Channel channel) { - User = user; - Channel = channel; + this.User = user; + this.Channel = channel; } } public sealed class UserIsSpeakingEventArgs : EventArgs @@ -134,21 +144,10 @@ namespace Discord internal UserIsSpeakingEventArgs(Member member, bool isSpeaking) { - Member = member; - IsSpeaking = isSpeaking; + this.Member = member; + this.IsSpeaking = isSpeaking; } } - /*public sealed class VoiceServerUpdatedEventArgs : EventArgs - { - public Server Server { get; } - public string ServerId => Server.Id; - public string Endpoint { get; } - internal VoiceServerUpdatedEventArgs(Server server, string endpoint) - { - Server = server; - Endpoint = endpoint; - } - }*/ public partial class DiscordClient { diff --git a/src/Discord.Net/WebSockets/Voice/VoiceWebSocket.cs b/src/Discord.Net/WebSockets/Voice/VoiceWebSocket.cs index 054bd0882..f06dc7ada 100644 --- a/src/Discord.Net/WebSockets/Voice/VoiceWebSocket.cs +++ b/src/Discord.Net/WebSockets/Voice/VoiceWebSocket.cs @@ -102,7 +102,7 @@ namespace Discord.WebSockets.Voice _isClearing = false; _udp = new UdpClient(new IPEndPoint(IPAddress.Any, 0)); -#if !DNX451 +#if !DNX451 && !__MonoCS__ _udp.AllowNatTraversal(true); #endif