From 10463cfdd2a439aa96bde85ca83d01d3862cf612 Mon Sep 17 00:00:00 2001
From: Christopher Felegy <foxbot@protonmail.com>
Date: Sat, 8 Jun 2019 23:13:11 -0400
Subject: [PATCH] meta: bump version to v2.2.0-dev, update CHANGELOG

---
 CHANGELOG.md                       | 18 +++++++++++++++++
 Discord.Net.targets                |  4 ++--
 src/Discord.Net/Discord.Net.nuspec | 32 +++++++++++++++---------------
 3 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8336e2f4e..ac159d86f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,23 @@
 # Changelog
 
+## [2.1.1] - 2019-06-08
+### Fixed
+- #994: Remainder parameters now ignore character escaping, as there is no reason to escape characters here (2e95c49)
+- #1316: `Emote.Equals` now pays no respect to the Name property, since Discord's API does not care about an emote's name (abf3e90)
+- #1317: `Emote.GetHashCode` now pays no respect to the Name property, see above (1b54883)
+- #1323: Optionals will no longer claim to be specified when a reaction message was not cached (1cc5d73)
+- Log messages sourcing from REST events will no longer be raised twice (c78a679)
+- News embeds will be processed as `EmbedType.Unknown`, rather than throwing an error and dropping the message (d287ed1)
+
+### Changed
+- #1311: Members may now be disconnected from voice channels by passing `null` as `GuildUserProperties.Channel` (fc48c66)
+- #1313: `IMessage.Tags` now includes the EveryoneRole on @everyone and @here mentions (1f55f01)
+- #1320: The maximum value for setting slow-mode has been updated to 6 hours, per the new API limit (4433ca7)
+
+### Misc
+- This library's compatibility with Semantic Versioning has been clarified. Please see the README (4d7de17)
+- The depency on System.Interactive.Async has been bumped to `3.2.0` (3e65e03)
+
 ## [2.1.0] - 2019-05-18
 ### Added
 - #1236: Bulk deletes (for messages) may now be accessed via the `MessagesBulkDeleted` event (dec353e)
diff --git a/Discord.Net.targets b/Discord.Net.targets
index 973691e0f..e7b45e52f 100644
--- a/Discord.Net.targets
+++ b/Discord.Net.targets
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
-        <VersionPrefix>2.1.1</VersionPrefix>
-        <VersionSuffix></VersionSuffix>
+        <VersionPrefix>2.2.0</VersionPrefix>
+        <VersionSuffix>dev</VersionSuffix>
         <Authors>RogueException</Authors>
         <PackageTags>discord;discordapp</PackageTags>
         <PackageProjectUrl>https://github.com/RogueException/Discord.Net</PackageProjectUrl>
diff --git a/src/Discord.Net/Discord.Net.nuspec b/src/Discord.Net/Discord.Net.nuspec
index 20258160b..3aa0d6add 100644
--- a/src/Discord.Net/Discord.Net.nuspec
+++ b/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.1.1$suffix$</version>
+    <version>2.2.0-dev$suffix$</version>
     <title>Discord.Net</title>
     <authors>Discord.Net Contributors</authors>
     <owners>RogueException</owners>
@@ -14,25 +14,25 @@
     <iconUrl>https://github.com/RogueException/Discord.Net/raw/dev/docs/marketing/logo/PackageLogo.png</iconUrl>
     <dependencies>
         <group targetFramework="net46">
-            <dependency id="Discord.Net.Core" version="2.1.1$suffix$" />
-            <dependency id="Discord.Net.Rest" version="2.1.1$suffix$" />
-            <dependency id="Discord.Net.WebSocket" version="2.1.1$suffix$" />
-            <dependency id="Discord.Net.Commands" version="2.1.1$suffix$" />
-            <dependency id="Discord.Net.Webhook" version="2.1.1$suffix$" />
+            <dependency id="Discord.Net.Core" version="2.2.0-dev$suffix$" />
+            <dependency id="Discord.Net.Rest" version="2.2.0-dev$suffix$" />
+            <dependency id="Discord.Net.WebSocket" version="2.2.0-dev$suffix$" />
+            <dependency id="Discord.Net.Commands" version="2.2.0-dev$suffix$" />
+            <dependency id="Discord.Net.Webhook" version="2.2.0-dev$suffix$" />
         </group>
         <group targetFramework="netstandard1.3">
-            <dependency id="Discord.Net.Core" version="2.1.1$suffix$" />
-            <dependency id="Discord.Net.Rest" version="2.1.1$suffix$" />
-            <dependency id="Discord.Net.WebSocket" version="2.1.1$suffix$" />
-            <dependency id="Discord.Net.Commands" version="2.1.1$suffix$" />
-            <dependency id="Discord.Net.Webhook" version="2.1.1$suffix$" />
+            <dependency id="Discord.Net.Core" version="2.2.0-dev$suffix$" />
+            <dependency id="Discord.Net.Rest" version="2.2.0-dev$suffix$" />
+            <dependency id="Discord.Net.WebSocket" version="2.2.0-dev$suffix$" />
+            <dependency id="Discord.Net.Commands" version="2.2.0-dev$suffix$" />
+            <dependency id="Discord.Net.Webhook" version="2.2.0-dev$suffix$" />
         </group>
         <group targetFramework="netstandard2.0">
-            <dependency id="Discord.Net.Core" version="2.1.1$suffix$" />
-            <dependency id="Discord.Net.Rest" version="2.1.1$suffix$" />
-            <dependency id="Discord.Net.WebSocket" version="2.1.1$suffix$" />
-            <dependency id="Discord.Net.Commands" version="2.1.1$suffix$" />
-            <dependency id="Discord.Net.Webhook" version="2.1.1$suffix$" />
+            <dependency id="Discord.Net.Core" version="2.2.0-dev$suffix$" />
+            <dependency id="Discord.Net.Rest" version="2.2.0-dev$suffix$" />
+            <dependency id="Discord.Net.WebSocket" version="2.2.0-dev$suffix$" />
+            <dependency id="Discord.Net.Commands" version="2.2.0-dev$suffix$" />
+            <dependency id="Discord.Net.Webhook" version="2.2.0-dev$suffix$" />
         </group>
     </dependencies>
   </metadata>