Merge branch 'dev' into viewChannelPermissionRename

Discord.Net.targets

@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
-        <VersionPrefix>2.0.0-alpha</VersionPrefix>
-        <VersionSuffix></VersionSuffix>
+        <VersionPrefix>2.0.0</VersionPrefix>
+        <VersionSuffix>beta</VersionSuffix>
         <Authors>RogueException</Authors>
         <PackageTags>discord;discordapp</PackageTags>
         <PackageProjectUrl>https://github.com/RogueException/Discord.Net</PackageProjectUrl>

README.md

@@ -2,11 +2,11 @@
 [![NuGet](https://img.shields.io/nuget/vpre/Discord.Net.svg?maxAge=2592000?style=plastic)](https://www.nuget.org/packages/Discord.Net)
 [![MyGet](https://img.shields.io/myget/discord-net/vpre/Discord.Net.svg)](https://www.myget.org/feed/Packages/discord-net) 
 [![Build status](https://ci.appveyor.com/api/projects/status/5sb7n8a09w9clute/branch/dev?svg=true)](https://ci.appveyor.com/project/RogueException/discord-net/branch/dev)
-[![Discord](https://discordapp.com/api/guilds/81384788765712384/widget.png)](https://discord.gg/0SBTUU1wZTVjAMPx)
+[![Discord](https://discordapp.com/api/guilds/81384788765712384/widget.png)](https://discord.gg/jkrBmQR)
 
 An unofficial .NET API Wrapper for the Discord client (http://discordapp.com).
 
-Check out the [documentation](https://discord.foxbot.me/docs/) or join the [Discord API Chat](https://discord.gg/0SBTUU1wZTVjAMPx).
+Check out the [documentation](https://discord.foxbot.me/docs/) or join the [Discord API Chat](https://discord.gg/jkrBmQR).
 
 ## Installation 
 ### Stable (NuGet)

appveyor.yml

@@ -34,7 +34,7 @@ after_build:
     if ($Env:APPVEYOR_REPO_TAG -eq "true") {
       nuget pack src\Discord.Net\Discord.Net.nuspec -OutputDirectory "artifacts" -properties suffix=""
     } else {
-      nuget pack src\Discord.Net\Discord.Net.nuspec -OutputDirectory "artifacts" -properties suffix="-build-$Env:BUILD"
+      nuget pack src\Discord.Net\Discord.Net.nuspec -OutputDirectory "artifacts" -properties suffix="-$Env:BUILD"
     }
 - ps: Get-ChildItem artifacts\*.nupkg | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
 

src/Discord.Net/Discord.Net.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Discord.Net</id>
-    <version>2.0.0-alpha$suffix$</version>
+    <version>2.0.0-beta$suffix$</version>
     <title>Discord.Net</title>
     <authors>Discord.Net Contributors</authors>
     <owners>RogueException</owners>
@@ -13,28 +13,28 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <dependencies>
         <group targetFramework="net45">
-            <dependency id="Discord.Net.Core" version="2.0.0-alpha$suffix$" />
-            <dependency id="Discord.Net.Rest" version="2.0.0-alpha$suffix$" />
-            <dependency id="Discord.Net.WebSocket" version="2.0.0-alpha$suffix$" />
-            <dependency id="Discord.Net.Rpc" version="2.0.0-alpha$suffix$" />
-            <dependency id="Discord.Net.Commands" version="2.0.0-alpha$suffix$" />
-            <dependency id="Discord.Net.Webhook" version="2.0.0-alpha$suffix$" />
+            <dependency id="Discord.Net.Core" version="2.0.0-beta$suffix$" />
+            <dependency id="Discord.Net.Rest" version="2.0.0-beta$suffix$" />
+            <dependency id="Discord.Net.WebSocket" version="2.0.0-beta$suffix$" />
+            <dependency id="Discord.Net.Rpc" version="2.0.0-beta$suffix$" />
+            <dependency id="Discord.Net.Commands" version="2.0.0-beta$suffix$" />
+            <dependency id="Discord.Net.Webhook" version="2.0.0-beta$suffix$" />
         </group>
         <group targetFramework="netstandard1.1">
-            <dependency id="Discord.Net.Core" version="2.0.0-alpha$suffix$" />
-            <dependency id="Discord.Net.Rest" version="2.0.0-alpha$suffix$" />
-            <dependency id="Discord.Net.WebSocket" version="2.0.0-alpha$suffix$" />
-            <dependency id="Discord.Net.Rpc" version="2.0.0-alpha$suffix$" />
-            <dependency id="Discord.Net.Commands" version="2.0.0-alpha$suffix$" />
-            <dependency id="Discord.Net.Webhook" version="2.0.0-alpha$suffix$" />
+            <dependency id="Discord.Net.Core" version="2.0.0-beta$suffix$" />
+            <dependency id="Discord.Net.Rest" version="2.0.0-beta$suffix$" />
+            <dependency id="Discord.Net.WebSocket" version="2.0.0-beta$suffix$" />
+            <dependency id="Discord.Net.Rpc" version="2.0.0-beta$suffix$" />
+            <dependency id="Discord.Net.Commands" version="2.0.0-beta$suffix$" />
+            <dependency id="Discord.Net.Webhook" version="2.0.0-beta$suffix$" />
         </group>
         <group targetFramework="netstandard1.3">
-            <dependency id="Discord.Net.Core" version="2.0.0-alpha$suffix$" />
-            <dependency id="Discord.Net.Rest" version="2.0.0-alpha$suffix$" />
-            <dependency id="Discord.Net.WebSocket" version="2.0.0-alpha$suffix$" />
-            <dependency id="Discord.Net.Rpc" version="2.0.0-alpha$suffix$" />
-            <dependency id="Discord.Net.Commands" version="2.0.0-alpha$suffix$" />
-            <dependency id="Discord.Net.Webhook" version="2.0.0-alpha$suffix$" />
+            <dependency id="Discord.Net.Core" version="2.0.0-beta$suffix$" />
+            <dependency id="Discord.Net.Rest" version="2.0.0-beta$suffix$" />
+            <dependency id="Discord.Net.WebSocket" version="2.0.0-beta$suffix$" />
+            <dependency id="Discord.Net.Rpc" version="2.0.0-beta$suffix$" />
+            <dependency id="Discord.Net.Commands" version="2.0.0-beta$suffix$" />
+            <dependency id="Discord.Net.Webhook" version="2.0.0-beta$suffix$" />
         </group>
     </dependencies>
   </metadata>

test/Discord.Net.Tests/Tests.ChannelPermissions.cs

@@ -84,7 +84,7 @@ namespace Discord
             Assert.Equal(groupChannel, ChannelPermissions.Group.RawValue);
             return Task.CompletedTask;
         }
-
+      
         public Task TestChannelPermissionModify()
         {
             // test channel permission modify