From b5d817f1712163746a1e473f459c12b42c683755 Mon Sep 17 00:00:00 2001
From: RogueException <rogueexception@gmail.com>
Date: Sat, 1 Apr 2017 11:11:09 -0300
Subject: [PATCH] Cleaned up csprojs, added support for tag builds.

---
 Discord.Net.sln                                    | 10 ++++------
 Discord.Net.targets                                | 20 +++++++++++++++++++
 build.ps1                                          |  4 ++--
 pack.ps1                                           | 21 ++++++++++++--------
 .../Discord.Net.Analyzers.csproj                   | 22 ++++-----------------
 .../Discord.Net.Commands.csproj                    | 22 ++++-----------------
 src/Discord.Net.Core/Discord.Net.Core.csproj       | 22 ++++-----------------
 .../Discord.Net.DebugTools.csproj                  | 20 +++----------------
 .../Discord.Net.Providers.UdpClient.csproj         | 22 ++++-----------------
 .../Discord.Net.Providers.WS4Net.csproj            | 23 ++++------------------
 src/Discord.Net.Relay/Discord.Net.Relay.csproj     | 20 +++----------------
 src/Discord.Net.Rest/Discord.Net.Rest.csproj       | 20 +++----------------
 src/Discord.Net.Rpc/Discord.Net.Rpc.csproj         | 20 +++----------------
 .../Discord.Net.WebSocket.csproj                   | 22 ++++-----------------
 src/Discord.Net.Webhook/Discord.Net.Webhook.csproj | 20 +++----------------
 src/Discord.Net/Discord.Net.nuspec                 | 22 ++++++++++-----------
 test/Discord.Net.Tests/Discord.Net.Tests.csproj    |  6 ++++--
 17 files changed, 93 insertions(+), 223 deletions(-)
 create mode 100644 Discord.Net.targets

diff --git a/Discord.Net.sln b/Discord.Net.sln
index ac75f147e..1c8347293 100644
--- a/Discord.Net.sln
+++ b/Discord.Net.sln
@@ -24,11 +24,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions", "Extensions",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Discord.Net.Tests", "test\Discord.Net.Tests\Discord.Net.Tests.csproj", "{C38E5BC1-11CB-4101-8A38-5B40A1BC6433}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F66D75C0-E304-46E0-9C3A-294F340DB37D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Discord.Net.Relay", "src\Discord.Net.Relay\Discord.Net.Relay.csproj", "{2705FCB3-68C9-4CEB-89CC-01F8EC80512B}"
 EndProject
-Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "Discord.Net.Relay", "src\Discord.Net.Relay\Discord.Net.Relay.csproj", "{2705FCB3-68C9-4CEB-89CC-01F8EC80512B}"
-EndProject
-Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "Discord.Net.Webhook", "src\Discord.Net.Webhook\Discord.Net.Webhook.csproj", "{9AFAB80E-D2D3-4EDB-B58C-BACA78D1EA30}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Discord.Net.Webhook", "src\Discord.Net.Webhook\Discord.Net.Webhook.csproj", "{9AFAB80E-D2D3-4EDB-B58C-BACA78D1EA30}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -171,7 +169,7 @@ Global
 		{688FD1D8-7F01-4539-B2E9-F473C5D699C7} = {288C363D-A636-4EAE-9AC1-4698B641B26E}
 		{6BDEEC08-417B-459F-9CA3-FF8BAB18CAC7} = {B0657AAE-DCC5-4FBF-8E5D-1FB578CF3012}
 		{ABC9F4B9-2452-4725-B522-754E0A02E282} = {B0657AAE-DCC5-4FBF-8E5D-1FB578CF3012}
-		{2705FCB3-68C9-4CEB-89CC-01F8EC80512B} = {F66D75C0-E304-46E0-9C3A-294F340DB37D}
-		{9AFAB80E-D2D3-4EDB-B58C-BACA78D1EA30} = {F66D75C0-E304-46E0-9C3A-294F340DB37D}
+		{2705FCB3-68C9-4CEB-89CC-01F8EC80512B} = {CC3D4B1C-9DE0-448B-8AE7-F3F1F3EC5C3A}
+		{9AFAB80E-D2D3-4EDB-B58C-BACA78D1EA30} = {CC3D4B1C-9DE0-448B-8AE7-F3F1F3EC5C3A}
 	EndGlobalSection
 EndGlobal
diff --git a/Discord.Net.targets b/Discord.Net.targets
new file mode 100644
index 000000000..867af36ec
--- /dev/null
+++ b/Discord.Net.targets
@@ -0,0 +1,20 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+        <VersionPrefix>1.0.0</VersionPrefix>
+        <VersionSuffix>rc</VersionSuffix>
+        <VersionSuffix Condition="'$(BuildNumber)' == ''">$(VersionSuffix)-dev</VersionSuffix>
+        <VersionSuffix Condition="'$(BuildNumber)' != '' And $(IsTagBuild) != 'true'">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
+        <Authors>RogueException</Authors>
+        <PackageTags>discord;discordapp</PackageTags>
+        <PackageProjectUrl>https://github.com/RogueException/Discord.Net</PackageProjectUrl>
+        <PackageLicenseUrl>http://opensource.org/licenses/MIT</PackageLicenseUrl>
+        <RepositoryType>git</RepositoryType>
+        <RepositoryUrl>git://github.com/RogueException/Discord.Net</RepositoryUrl>
+        <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
+    </PropertyGroup>
+    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+        <NoWarn>$(NoWarn);CS1573;CS1591</NoWarn>
+        <WarningsAsErrors>true</WarningsAsErrors>
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/build.ps1 b/build.ps1
index 08508bbcf..1b960011a 100644
--- a/build.ps1
+++ b/build.ps1
@@ -1,4 +1,4 @@
-appveyor-retry dotnet restore Discord.Net.sln -v Minimal /p:BuildNumber="$Env:BUILD"
+appveyor-retry dotnet restore Discord.Net.sln -v Minimal /p:BuildNumber="$Env:BUILD" /p:IsTagBuild="$Env:APPVEYOR_REPO_TAG"
 if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
-dotnet build Discord.Net.sln -c "Release" /p:BuildNumber="$Env:BUILD"
+dotnet build Discord.Net.sln -c "Release" /p:BuildNumber="$Env:BUILD" /p:IsTagBuild="$Env:APPVEYOR_REPO_TAG"
 if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
\ No newline at end of file
diff --git a/pack.ps1 b/pack.ps1
index 0f84ea309..c14f5402d 100644
--- a/pack.ps1
+++ b/pack.ps1
@@ -1,17 +1,22 @@
-dotnet pack "src\Discord.Net.Core\Discord.Net.Core.csproj" -c "Release" -o "../../artifacts" --no-build /p:BuildNumber="$Env:BUILD"
+dotnet pack "src\Discord.Net.Core\Discord.Net.Core.csproj" -c "Release" -o "../../artifacts" --no-build /p:BuildNumber="$Env:BUILD" /p:IsTagBuild="$Env:APPVEYOR_REPO_TAG"
 if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
-dotnet pack "src\Discord.Net.Rest\Discord.Net.Rest.csproj" -c "Release" -o "../../artifacts" --no-build /p:BuildNumber="$Env:BUILD"
+dotnet pack "src\Discord.Net.Rest\Discord.Net.Rest.csproj" -c "Release" -o "../../artifacts" --no-build /p:BuildNumber="$Env:BUILD" /p:IsTagBuild="$Env:APPVEYOR_REPO_TAG"
 if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
-dotnet pack "src\Discord.Net.WebSocket\Discord.Net.WebSocket.csproj" -c "Release" -o "../../artifacts" --no-build /p:BuildNumber="$Env:BUILD"
+dotnet pack "src\Discord.Net.WebSocket\Discord.Net.WebSocket.csproj" -c "Release" -o "../../artifacts" --no-build /p:BuildNumber="$Env:BUILD" /p:IsTagBuild="$Env:APPVEYOR_REPO_TAG"
 if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
-dotnet pack "src\Discord.Net.Rpc\Discord.Net.Rpc.csproj" -c "Release" -o "../../artifacts" --no-build /p:BuildNumber="$Env:BUILD"
+dotnet pack "src\Discord.Net.Rpc\Discord.Net.Rpc.csproj" -c "Release" -o "../../artifacts" --no-build /p:BuildNumber="$Env:BUILD" /p:IsTagBuild="$Env:APPVEYOR_REPO_TAG"
 if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
-dotnet pack "src\Discord.Net.Commands\Discord.Net.Commands.csproj" -c "Release" -o "../../artifacts" --no-build /p:BuildNumber="$Env:BUILD"
+dotnet pack "src\Discord.Net.Commands\Discord.Net.Commands.csproj" -c "Release" -o "../../artifacts" --no-build /p:BuildNumber="$Env:BUILD" /p:IsTagBuild="$Env:APPVEYOR_REPO_TAG"
 if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
-dotnet pack "src\Discord.Net.Providers.WS4Net\Discord.Net.Providers.WS4Net.csproj" -c "Release" -o "../../artifacts" --no-build /p:BuildNumber="$Env:BUILD"
+dotnet pack "src\Discord.Net.Providers.WS4Net\Discord.Net.Providers.WS4Net.csproj" -c "Release" -o "../../artifacts" --no-build /p:BuildNumber="$Env:BUILD" /p:IsTagBuild="$Env:APPVEYOR_REPO_TAG"
 if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
-dotnet pack "src\Discord.Net.Providers.UdpClient\Discord.Net.Providers.UdpClient.csproj" -c "Release" -o "../../artifacts" --no-build /p:BuildNumber="$Env:BUILD"
+dotnet pack "src\Discord.Net.Providers.UdpClient\Discord.Net.Providers.UdpClient.csproj" -c "Release" -o "../../artifacts" --no-build /p:BuildNumber="$Env:BUILD" /p:IsTagBuild="$Env:APPVEYOR_REPO_TAG"
 if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
 
-nuget pack src\Discord.Net\Discord.Net.nuspec -OutputDirectory "artifacts" -properties build="$Env:BUILD"
+if ($Env:APPVEYOR_REPO_TAG -eq "true") {
+    nuget pack src\Discord.Net\Discord.Net.nuspec -OutputDirectory "artifacts" -properties suffix="-$Env:BUILD"
+}
+else {
+    nuget pack src\Discord.Net\Discord.Net.nuspec -OutputDirectory "artifacts" -properties suffix=""
+}
 if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
\ No newline at end of file
diff --git a/src/Discord.Net.Analyzers/Discord.Net.Analyzers.csproj b/src/Discord.Net.Analyzers/Discord.Net.Analyzers.csproj
index 0612e423f..129da98fe 100644
--- a/src/Discord.Net.Analyzers/Discord.Net.Analyzers.csproj
+++ b/src/Discord.Net.Analyzers/Discord.Net.Analyzers.csproj
@@ -1,20 +1,11 @@
 <Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="../../Discord.Net.targets" />
   <PropertyGroup>
-    <VersionPrefix>1.0.0</VersionPrefix>
-    <VersionSuffix Condition="'$(BuildNumber)' == ''">rc-dev</VersionSuffix>
-    <VersionSuffix Condition="'$(BuildNumber)' != ''">rc-$(BuildNumber)</VersionSuffix>
-    <TargetFrameworks>netstandard1.3</TargetFrameworks>
     <AssemblyName>Discord.Net.Analyzers</AssemblyName>
-    <Authors>RogueException</Authors>
-    <Description>A Discord.Net extension adding compile-time analysis.</Description>
-    <PackageTags>discord;discordapp</PackageTags>
-    <PackageProjectUrl>https://github.com/RogueException/Discord.Net</PackageProjectUrl>
-    <PackageLicenseUrl>http://opensource.org/licenses/MIT</PackageLicenseUrl>
-    <RepositoryType>git</RepositoryType>
-    <RepositoryUrl>git://github.com/RogueException/Discord.Net</RepositoryUrl>
     <RootNamespace>Discord.Analyzers</RootNamespace>
-    <PackageTargetFallback>portable-net45+win81</PackageTargetFallback>
-    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
+    <Description>A Discord.Net extension adding compile-time analysis.</Description>
+    <TargetFrameworks>netstandard1.3</TargetFrameworks>
+    <PackageTargetFallback>$(PackageTargetFallback);portable-net45+win81</PackageTargetFallback>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Discord.Net.Core\Discord.Net.Core.csproj" />
@@ -24,9 +15,4 @@
         <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <NoWarn>$(NoWarn);CS1573;CS1591</NoWarn>
-    <WarningsAsErrors>true</WarningsAsErrors>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Discord.Net.Commands/Discord.Net.Commands.csproj b/src/Discord.Net.Commands/Discord.Net.Commands.csproj
index 452b52f21..05853109a 100644
--- a/src/Discord.Net.Commands/Discord.Net.Commands.csproj
+++ b/src/Discord.Net.Commands/Discord.Net.Commands.csproj
@@ -1,26 +1,12 @@
-<Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="../../Discord.Net.targets" />
   <PropertyGroup>
-    <VersionPrefix>1.0.0</VersionPrefix>
-    <VersionSuffix Condition="'$(BuildNumber)' == ''">rc-dev</VersionSuffix>
-    <VersionSuffix Condition="'$(BuildNumber)' != ''">rc-$(BuildNumber)</VersionSuffix>
-    <TargetFrameworks>netstandard1.1;netstandard1.3</TargetFrameworks>
     <AssemblyName>Discord.Net.Commands</AssemblyName>
-    <Authors>RogueException</Authors>
-    <Description>A Discord.Net extension adding support for bot commands.</Description>
-    <PackageTags>discord;discordapp</PackageTags>
-    <PackageProjectUrl>https://github.com/RogueException/Discord.Net</PackageProjectUrl>
-    <PackageLicenseUrl>http://opensource.org/licenses/MIT</PackageLicenseUrl>
-    <RepositoryType>git</RepositoryType>
-    <RepositoryUrl>git://github.com/RogueException/Discord.Net</RepositoryUrl>
     <RootNamespace>Discord.Commands</RootNamespace>
-    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
+    <Description>A Discord.Net extension adding support for bot commands.</Description>
+    <TargetFrameworks>netstandard1.1;netstandard1.3</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Discord.Net.Core\Discord.Net.Core.csproj" />
   </ItemGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <NoWarn>$(NoWarn);CS1573;CS1591</NoWarn>
-    <WarningsAsErrors>true</WarningsAsErrors>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Discord.Net.Core/Discord.Net.Core.csproj b/src/Discord.Net.Core/Discord.Net.Core.csproj
index 9f75d7327..262ea9007 100644
--- a/src/Discord.Net.Core/Discord.Net.Core.csproj
+++ b/src/Discord.Net.Core/Discord.Net.Core.csproj
@@ -1,19 +1,10 @@
-<Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="../../Discord.Net.targets" />
   <PropertyGroup>
-    <VersionPrefix>1.0.0</VersionPrefix>
-    <VersionSuffix Condition="'$(BuildNumber)' == ''">rc-dev</VersionSuffix>
-    <VersionSuffix Condition="'$(BuildNumber)' != ''">rc-$(BuildNumber)</VersionSuffix>
-    <TargetFrameworks>netstandard1.1;netstandard1.3</TargetFrameworks>
     <AssemblyName>Discord.Net.Core</AssemblyName>
-    <Authors>RogueException</Authors>
-    <Description>A .Net API wrapper and bot framework for Discord.</Description>
-    <PackageTags>discord;discordapp</PackageTags>
-    <PackageProjectUrl>https://github.com/RogueException/Discord.Net</PackageProjectUrl>
-    <PackageLicenseUrl>http://opensource.org/licenses/MIT</PackageLicenseUrl>
-    <RepositoryType>git</RepositoryType>
-    <RepositoryUrl>git://github.com/RogueException/Discord.Net</RepositoryUrl>
     <RootNamespace>Discord</RootNamespace>
-    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
+    <Description>A .Net API wrapper and bot framework for Discord.</Description>
+    <TargetFrameworks>netstandard1.1;netstandard1.3</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
@@ -28,9 +19,4 @@
     <PackageReference Include="System.Runtime" Version="4.3.0" />
     <PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
   </ItemGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <NoWarn>$(NoWarn);CS1573;CS1591</NoWarn>
-    <WarningsAsErrors>true</WarningsAsErrors>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Discord.Net.DebugTools/Discord.Net.DebugTools.csproj b/src/Discord.Net.DebugTools/Discord.Net.DebugTools.csproj
index 829951d19..4d529c070 100644
--- a/src/Discord.Net.DebugTools/Discord.Net.DebugTools.csproj
+++ b/src/Discord.Net.DebugTools/Discord.Net.DebugTools.csproj
@@ -1,19 +1,10 @@
 <Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="../../Discord.Net.targets" />
   <PropertyGroup>
-    <VersionPrefix>1.0.0</VersionPrefix>
-    <VersionSuffix Condition="'$(BuildNumber)' == ''">rc-dev</VersionSuffix>
-    <VersionSuffix Condition="'$(BuildNumber)' != ''">rc-$(BuildNumber)</VersionSuffix>
-    <TargetFrameworks>netstandard1.6</TargetFrameworks>
     <AssemblyName>Discord.Net.DebugTools</AssemblyName>
-    <Authors>RogueException</Authors>
-    <Description>A Discord.Net extension adding some helper classes for diagnosing issues.</Description>
-    <PackageTags>discord;discordapp</PackageTags>
-    <PackageProjectUrl>https://github.com/RogueException/Discord.Net</PackageProjectUrl>
-    <PackageLicenseUrl>http://opensource.org/licenses/MIT</PackageLicenseUrl>
-    <RepositoryType>git</RepositoryType>
-    <RepositoryUrl>git://github.com/RogueException/Discord.Net</RepositoryUrl>
     <RootNamespace>Discord</RootNamespace>
-    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
+    <Description>A Discord.Net extension adding some helper classes for diagnosing issues.</Description>
+    <TargetFrameworks>netstandard1.6</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Discord.Net.Core\Discord.Net.Core.csproj" />
@@ -23,9 +14,4 @@
     <PackageReference Include="System.Net.Sockets" Version="4.3.0" />
     <PackageReference Include="System.Net.WebSockets.Client" Version="4.3.0" />
   </ItemGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <NoWarn>$(NoWarn);CS1573;CS1591</NoWarn>
-    <WarningsAsErrors>true</WarningsAsErrors>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Discord.Net.Providers.UdpClient/Discord.Net.Providers.UdpClient.csproj b/src/Discord.Net.Providers.UdpClient/Discord.Net.Providers.UdpClient.csproj
index 984cd8f9c..3a0a6612a 100644
--- a/src/Discord.Net.Providers.UdpClient/Discord.Net.Providers.UdpClient.csproj
+++ b/src/Discord.Net.Providers.UdpClient/Discord.Net.Providers.UdpClient.csproj
@@ -1,26 +1,12 @@
-<Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="../../Discord.Net.targets" />
   <PropertyGroup>
-    <VersionPrefix>1.0.0</VersionPrefix>
-    <VersionSuffix Condition="'$(BuildNumber)' == ''">rc-dev</VersionSuffix>
-    <VersionSuffix Condition="'$(BuildNumber)' != ''">rc-$(BuildNumber)</VersionSuffix>
-    <TargetFrameworks>net45</TargetFrameworks>
     <AssemblyName>Discord.Net.Providers.UDPClient</AssemblyName>
-    <Authors>RogueException</Authors>
-    <Description>An optional UDP client provider for Discord.Net using System.Net.UdpClient</Description>
-    <PackageTags>discord;discordapp</PackageTags>
-    <PackageProjectUrl>https://github.com/RogueException/Discord.Net</PackageProjectUrl>
-    <PackageLicenseUrl>http://opensource.org/licenses/MIT</PackageLicenseUrl>
-    <RepositoryType>git</RepositoryType>
-    <RepositoryUrl>git://github.com/RogueException/Discord.Net</RepositoryUrl>
     <RootNamespace>Discord.Providers.UDPClient</RootNamespace>
-    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
+    <Description>An optional UDP client provider for Discord.Net using System.Net.UdpClient</Description>
+    <TargetFramework>net45</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Discord.Net.Core\Discord.Net.Core.csproj" />
   </ItemGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <NoWarn>$(NoWarn);CS1573;CS1591</NoWarn>
-    <WarningsAsErrors>true</WarningsAsErrors>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Discord.Net.Providers.WS4Net/Discord.Net.Providers.WS4Net.csproj b/src/Discord.Net.Providers.WS4Net/Discord.Net.Providers.WS4Net.csproj
index 62adfc0b1..5e52a1e5e 100644
--- a/src/Discord.Net.Providers.WS4Net/Discord.Net.Providers.WS4Net.csproj
+++ b/src/Discord.Net.Providers.WS4Net/Discord.Net.Providers.WS4Net.csproj
@@ -1,20 +1,10 @@
-<Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="../../Discord.Net.targets" />
   <PropertyGroup>
-    <VersionPrefix>1.0.0</VersionPrefix>
-    <VersionSuffix Condition="'$(BuildNumber)' == ''">rc-dev</VersionSuffix>
-    <VersionSuffix Condition="'$(BuildNumber)' != ''">rc-$(BuildNumber)</VersionSuffix>
-    <TargetFrameworks>net45</TargetFrameworks>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AssemblyName>Discord.Net.Providers.WS4Net</AssemblyName>
-    <Authors>RogueException</Authors>
-    <Description>An optional WebSocket client provider for Discord.Net using WebSocket4Net</Description>
-    <PackageTags>discord;discordapp</PackageTags>
-    <PackageProjectUrl>https://github.com/RogueException/Discord.Net</PackageProjectUrl>
-    <PackageLicenseUrl>http://opensource.org/licenses/MIT</PackageLicenseUrl>
-    <RepositoryType>git</RepositoryType>
-    <RepositoryUrl>git://github.com/RogueException/Discord.Net</RepositoryUrl>
     <RootNamespace>Discord.Providers.WS4Net</RootNamespace>
-    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
+    <Description>An optional WebSocket client provider for Discord.Net using WebSocket4Net</Description>
+    <TargetFramework>net45</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Discord.Net.Core\Discord.Net.Core.csproj" />
@@ -22,9 +12,4 @@
   <ItemGroup>
     <PackageReference Include="WebSocket4Net" Version="0.14.1" />
   </ItemGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <NoWarn>$(NoWarn);CS1573;CS1591</NoWarn>
-    <WarningsAsErrors>true</WarningsAsErrors>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Discord.Net.Relay/Discord.Net.Relay.csproj b/src/Discord.Net.Relay/Discord.Net.Relay.csproj
index 8fee12d14..8942a9b28 100644
--- a/src/Discord.Net.Relay/Discord.Net.Relay.csproj
+++ b/src/Discord.Net.Relay/Discord.Net.Relay.csproj
@@ -1,19 +1,10 @@
 <Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="../../Discord.Net.targets" />
   <PropertyGroup>
-    <VersionPrefix>1.0.0</VersionPrefix>
-    <VersionSuffix Condition="'$(BuildNumber)' == ''">rc-dev</VersionSuffix>
-    <VersionSuffix Condition="'$(BuildNumber)' != ''">rc-$(BuildNumber)</VersionSuffix>
-    <TargetFramework>netstandard1.3</TargetFramework>
     <AssemblyName>Discord.Net.Relay</AssemblyName>
-    <Authors>RogueException</Authors>
-    <Description>A core Discord.Net library containing the Relay server.</Description>
-    <PackageTags>discord;discordapp</PackageTags>
-    <PackageProjectUrl>https://github.com/RogueException/Discord.Net</PackageProjectUrl>
-    <PackageLicenseUrl>http://opensource.org/licenses/MIT</PackageLicenseUrl>
-    <RepositoryType>git</RepositoryType>
-    <RepositoryUrl>git://github.com/RogueException/Discord.Net</RepositoryUrl>
     <RootNamespace>Discord.Relay</RootNamespace>
-    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
+    <Description>A core Discord.Net library containing the Relay server.</Description>
+    <TargetFrameworks>netstandard1.3</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Discord.Net.Core\Discord.Net.Core.csproj" />
@@ -24,9 +15,4 @@
     <PackageReference Include="Microsoft.AspNetCore" Version="1.1.0" />
     <PackageReference Include="Microsoft.AspNetCore.WebSockets" Version="1.0.0" />
   </ItemGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <NoWarn>$(NoWarn);CS1573;CS1591</NoWarn>
-    <WarningsAsErrors>true</WarningsAsErrors>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Discord.Net.Rest/Discord.Net.Rest.csproj b/src/Discord.Net.Rest/Discord.Net.Rest.csproj
index b7495f273..42583abf1 100644
--- a/src/Discord.Net.Rest/Discord.Net.Rest.csproj
+++ b/src/Discord.Net.Rest/Discord.Net.Rest.csproj
@@ -1,19 +1,10 @@
 <Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="../../Discord.Net.targets" />
   <PropertyGroup>
-    <VersionPrefix>1.0.0</VersionPrefix>
-    <VersionSuffix Condition="'$(BuildNumber)' == ''">rc-dev</VersionSuffix>
-    <VersionSuffix Condition="'$(BuildNumber)' != ''">rc-$(BuildNumber)</VersionSuffix>
-    <TargetFrameworks>netstandard1.1;netstandard1.3</TargetFrameworks>
     <AssemblyName>Discord.Net.Rest</AssemblyName>
-    <Authors>RogueException</Authors>
-    <Description>A core Discord.Net library containing the REST client and models.</Description>
-    <PackageTags>discord;discordapp</PackageTags>
-    <PackageProjectUrl>https://github.com/RogueException/Discord.Net</PackageProjectUrl>
-    <PackageLicenseUrl>http://opensource.org/licenses/MIT</PackageLicenseUrl>
-    <RepositoryType>git</RepositoryType>
-    <RepositoryUrl>git://github.com/RogueException/Discord.Net</RepositoryUrl>
     <RootNamespace>Discord.Rest</RootNamespace>
-    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
+    <Description>A core Discord.Net library containing the REST client and models.</Description>
+    <TargetFrameworks>netstandard1.1;netstandard1.3</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Discord.Net.Core\Discord.Net.Core.csproj" />
@@ -21,9 +12,4 @@
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
     <PackageReference Include="System.IO.FileSystem" Version="4.3.0" />
   </ItemGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <NoWarn>$(NoWarn);CS1573;CS1591</NoWarn>
-    <WarningsAsErrors>true</WarningsAsErrors>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Discord.Net.Rpc/Discord.Net.Rpc.csproj b/src/Discord.Net.Rpc/Discord.Net.Rpc.csproj
index 85c2bf4e0..22f932638 100644
--- a/src/Discord.Net.Rpc/Discord.Net.Rpc.csproj
+++ b/src/Discord.Net.Rpc/Discord.Net.Rpc.csproj
@@ -1,19 +1,10 @@
 <Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="../../Discord.Net.targets" />
   <PropertyGroup>
-    <VersionPrefix>1.0.0</VersionPrefix>
-    <VersionSuffix Condition="'$(BuildNumber)' == ''">rc-dev</VersionSuffix>
-    <VersionSuffix Condition="'$(BuildNumber)' != ''">rc-$(BuildNumber)</VersionSuffix>
-    <TargetFrameworks>netstandard1.1;netstandard1.3</TargetFrameworks>
     <AssemblyName>Discord.Net.Rpc</AssemblyName>
-    <Authors>RogueException</Authors>
-    <Description>A core Discord.Net library containing the RPC client and models.</Description>
-    <PackageTags>discord;discordapp</PackageTags>
-    <PackageProjectUrl>https://github.com/RogueException/Discord.Net</PackageProjectUrl>
-    <PackageLicenseUrl>http://opensource.org/licenses/MIT</PackageLicenseUrl>
-    <RepositoryType>git</RepositoryType>
-    <RepositoryUrl>git://github.com/RogueException/Discord.Net</RepositoryUrl>
     <RootNamespace>Discord.Rpc</RootNamespace>
-    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
+    <Description>A core Discord.Net library containing the RPC client and models.</Description>
+    <TargetFrameworks>netstandard1.1;netstandard1.3</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="..\Discord.Net.WebSocket\Net\DefaultWebSocketClient.cs">
@@ -33,9 +24,4 @@
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
     <PackageReference Include="System.Net.WebSockets.Client" Version="4.3.0" />
   </ItemGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <NoWarn>$(NoWarn);CS1573;CS1591</NoWarn>
-    <WarningsAsErrors>true</WarningsAsErrors>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj b/src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj
index b5dab98e5..b41cc84b4 100644
--- a/src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj
+++ b/src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj
@@ -1,20 +1,11 @@
-<Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="../../Discord.Net.targets" />
   <PropertyGroup>
-    <VersionPrefix>1.0.0</VersionPrefix>
-    <VersionSuffix Condition="'$(BuildNumber)' == ''">rc-dev</VersionSuffix>
-    <VersionSuffix Condition="'$(BuildNumber)' != ''">rc-$(BuildNumber)</VersionSuffix>
-    <TargetFrameworks>netstandard1.1;netstandard1.3</TargetFrameworks>
     <AssemblyName>Discord.Net.WebSocket</AssemblyName>
-    <Authors>RogueException</Authors>
-    <Description>A core Discord.Net library containing the WebSocket client and models.</Description>
-    <PackageTags>discord;discordapp</PackageTags>
-    <PackageProjectUrl>https://github.com/RogueException/Discord.Net</PackageProjectUrl>
-    <PackageLicenseUrl>http://opensource.org/licenses/MIT</PackageLicenseUrl>
-    <RepositoryType>git</RepositoryType>
-    <RepositoryUrl>git://github.com/RogueException/Discord.Net</RepositoryUrl>
     <RootNamespace>Discord.WebSocket</RootNamespace>
+    <Description>A core Discord.Net library containing the WebSocket client and models.</Description>
+    <TargetFrameworks>netstandard1.1;netstandard1.3</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Discord.Net.Core\Discord.Net.Core.csproj" />
@@ -29,9 +20,4 @@
     <PackageReference Include="System.Net.Sockets" Version="4.3.0" />
     <PackageReference Include="System.Net.WebSockets.Client" Version="4.3.0" />
   </ItemGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <NoWarn>$(NoWarn);CS1573;CS1591</NoWarn>
-    <WarningsAsErrors>true</WarningsAsErrors>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Discord.Net.Webhook/Discord.Net.Webhook.csproj b/src/Discord.Net.Webhook/Discord.Net.Webhook.csproj
index 747586aea..d5072c18a 100644
--- a/src/Discord.Net.Webhook/Discord.Net.Webhook.csproj
+++ b/src/Discord.Net.Webhook/Discord.Net.Webhook.csproj
@@ -1,27 +1,13 @@
 <Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="../../Discord.Net.targets" />
   <PropertyGroup>
-    <VersionPrefix>1.0.0</VersionPrefix>
-    <VersionSuffix Condition="'$(BuildNumber)' == ''">rc-dev</VersionSuffix>
-    <VersionSuffix Condition="'$(BuildNumber)' != ''">rc-$(BuildNumber)</VersionSuffix>
-    <TargetFrameworks>netstandard1.1;netstandard1.3</TargetFrameworks>
     <AssemblyName>Discord.Net.Webhook</AssemblyName>
-    <Authors>RogueException</Authors>
-    <Description>A core Discord.Net library containing the Webhook client and models.</Description>
-    <PackageTags>discord;discordapp</PackageTags>
-    <PackageProjectUrl>https://github.com/RogueException/Discord.Net</PackageProjectUrl>
-    <PackageLicenseUrl>http://opensource.org/licenses/MIT</PackageLicenseUrl>
-    <RepositoryType>git</RepositoryType>
-    <RepositoryUrl>git://github.com/RogueException/Discord.Net</RepositoryUrl>
     <RootNamespace>Discord.Webhook</RootNamespace>
-    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
+    <Description>A core Discord.Net library containing the Webhook client and models.</Description>
+    <TargetFrameworks>netstandard1.1;netstandard1.3</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Discord.Net.Core\Discord.Net.Core.csproj" />
     <ProjectReference Include="..\Discord.Net.Rest\Discord.Net.Rest.csproj" />
   </ItemGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <NoWarn>$(NoWarn);CS1573;CS1591</NoWarn>
-    <WarningsAsErrors>true</WarningsAsErrors>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Discord.Net/Discord.Net.nuspec b/src/Discord.Net/Discord.Net.nuspec
index 9966d9d23..d5537ec7c 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>1.0.0-rc-$build$</version>
+    <version>1.0.0-rc$suffix$</version>
     <title>Discord.Net</title>
     <authors>RogueException</authors>
     <owners>RogueException</owners>
@@ -13,18 +13,18 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <dependencies>
         <group targetFramework="netstandard1.1">
-            <dependency id="Discord.Net.Core" version="1.0.0-rc-$build$" />
-            <dependency id="Discord.Net.Rest" version="1.0.0-rc-$build$" />
-            <dependency id="Discord.Net.WebSocket" version="1.0.0-rc-$build$" />
-            <dependency id="Discord.Net.Rpc" version="1.0.0-rc-$build$" />
-            <dependency id="Discord.Net.Commands" version="1.0.0-rc-$build$" />
+            <dependency id="Discord.Net.Core" version="1.0.0-rc$suffix$" />
+            <dependency id="Discord.Net.Rest" version="1.0.0-rc$suffix$" />
+            <dependency id="Discord.Net.WebSocket" version="1.0.0-rc$suffix$" />
+            <dependency id="Discord.Net.Rpc" version="1.0.0-rc$suffix$" />
+            <dependency id="Discord.Net.Commands" version="1.0.0-rc$suffix$" />
         </group>
         <group targetFramework="netstandard1.3">
-            <dependency id="Discord.Net.Core" version="1.0.0-rc-$build$" />
-            <dependency id="Discord.Net.Rest" version="1.0.0-rc-$build$" />
-            <dependency id="Discord.Net.WebSocket" version="1.0.0-rc-$build$" />
-            <dependency id="Discord.Net.Rpc" version="1.0.0-rc-$build$" />
-            <dependency id="Discord.Net.Commands" version="1.0.0-rc-$build$" />
+            <dependency id="Discord.Net.Core" version="1.0.0-rc$suffix$" />
+            <dependency id="Discord.Net.Rest" version="1.0.0-rc$suffix$" />
+            <dependency id="Discord.Net.WebSocket" version="1.0.0-rc$suffix$" />
+            <dependency id="Discord.Net.Rpc" version="1.0.0-rc$suffix$" />
+            <dependency id="Discord.Net.Commands" version="1.0.0-rc$suffix$" />
         </group>
     </dependencies>
   </metadata>
diff --git a/test/Discord.Net.Tests/Discord.Net.Tests.csproj b/test/Discord.Net.Tests/Discord.Net.Tests.csproj
index 986605eeb..998795a31 100644
--- a/test/Discord.Net.Tests/Discord.Net.Tests.csproj
+++ b/test/Discord.Net.Tests/Discord.Net.Tests.csproj
@@ -1,9 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="../../Discord.Net.targets" />
   <PropertyGroup>
     <OutputType>Exe</OutputType>
+    <RootNamespace>Discord</RootNamespace>
     <TargetFramework>netcoreapp1.1</TargetFramework>
     <PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8+wp8+wpa81</PackageTargetFallback>
-    <RootNamespace>Discord</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
     <Content Include="xunit.runner.json">
@@ -19,6 +20,7 @@
     <PackageReference Include="Akavache" Version="5.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170123-02" />
     <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+    <PackageReference Include="System.Net.Requests" Version="4.3.0" />
     <PackageReference Include="xunit" Version="2.2.0-beta5-build3474" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta5-build1225" />
     <PackageReference Include="xunit.runner.reporters" Version="2.2.0-beta5-build3474" />