diff --git a/build.ps1 b/build.ps1
index 437d1ab18..08508bbcf 100644
--- a/build.ps1
+++ b/build.ps1
@@ -1,4 +1,4 @@
-appveyor-retry dotnet restore Discord.Net.sln -v Minimal -p:VersionSuffix="$env:BUILD"
+appveyor-retry dotnet restore Discord.Net.sln -v Minimal /p:BuildNumber="$Env:BUILD"
 if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
-dotnet build Discord.Net.sln -c "Release" -p:VersionSuffix="$env:BUILD"
+dotnet build Discord.Net.sln -c "Release" /p:BuildNumber="$Env:BUILD"
 if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
\ No newline at end of file
diff --git a/init.ps1 b/init.ps1
deleted file mode 100644
index b57464228..000000000
--- a/init.ps1
+++ /dev/null
@@ -1,5 +0,0 @@
-if (Test-Path Env:\APPVEYOR_BUILD_NUMBER) {
-    $env:BUILD = "rc-$($env:APPVEYOR_BUILD_NUMBER.PadLeft(5, "0"))"
-} else {
-    $env:BUILD = "dev"
-}
\ No newline at end of file
diff --git a/pack.ps1 b/pack.ps1
index e6c593104..89335a2ac 100644
--- a/pack.ps1
+++ b/pack.ps1
@@ -1,16 +1,17 @@
-dotnet pack "src\Discord.Net\Discord.Net.csproj" -c "Release" -o "../../artifacts" --no-build -p:VersionSuffix="$env:BUILD"
-if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
-dotnet pack "src\Discord.Net.Core\Discord.Net.Core.csproj" -c "Release" -o "../../artifacts" --no-build -p:VersionSuffix="$env:BUILD"
-if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
-dotnet pack "src\Discord.Net.Commands\Discord.Net.Commands.csproj" -c "Release" -o "../../artifacts" --no-build -p:VersionSuffix="$env:BUILD"
-if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
-dotnet pack "src\Discord.Net.Rest\Discord.Net.Rest.csproj" -c "Release" -o "../../artifacts" --no-build -p:VersionSuffix="$env:BUILD"
-if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
-dotnet pack "src\Discord.Net.WebSocket\Discord.Net.WebSocket.csproj" -c "Release" -o "../../artifacts" --no-build -p:VersionSuffix="$env:BUILD"
-if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
-dotnet pack "src\Discord.Net.Rpc\Discord.Net.Rpc.csproj" -c "Release" -o "../../artifacts" --no-build -p:VersionSuffix="$env:BUILD"
-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:VersionSuffix="$env:BUILD"
-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:VersionSuffix="$env:BUILD"
-if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
\ No newline at end of file
+#dotnet restore "src\Discord.Net\Discord.Net.csproj" /p:BuildNumber="$Env:BUILD"
+#dotnet restore "src\Discord.Net.Core\Discord.Net.Core.csproj" /p:BuildNumber="$Env:BUILD"
+#dotnet restore "src\Discord.Net.Commands\Discord.Net.Commands.csproj" /p:BuildNumber="$Env:BUILD"
+#dotnet restore "src\Discord.Net.Rest\Discord.Net.Rest.csproj" /p:BuildNumber="$Env:BUILD"
+#dotnet restore "src\Discord.Net.WebSocket\Discord.Net.WebSocket.csproj" /p:BuildNumber="$Env:BUILD"
+#dotnet restore "src\Discord.Net.Rpc\Discord.Net.Rpc.csproj" /p:BuildNumber="$Env:BUILD"
+#dotnet restore "src\Discord.Net.Providers.WS4Net\Discord.Net.Providers.WS4Net.csproj" /p:BuildNumber="$Env:BUILD"
+#dotnet restore "src\Discord.Net.Providers.UdpClient\Discord.Net.Providers.UdpClient.csproj" /p:BuildNumber="$Env:BUILD"
+
+dotnet pack "src\Discord.Net\Discord.Net.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"
+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.Rest\Discord.Net.Rest.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"
+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.Providers.WS4Net\Discord.Net.Providers.WS4Net.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"
\ 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 1736bfcdb..5e7ecda0c 100644
--- a/src/Discord.Net.Commands/Discord.Net.Commands.csproj
+++ b/src/Discord.Net.Commands/Discord.Net.Commands.csproj
@@ -2,7 +2,8 @@
   <PropertyGroup>
     <Description>A Discord.Net extension adding support for bot commands.</Description>
     <VersionPrefix>1.0.0</VersionPrefix>
-    <VersionSuffix>dev</VersionSuffix>
+    <VersionSuffix Condition="'$(BuildNumber)' == ''">rc-dev</VersionSuffix>
+    <VersionSuffix Condition="'$(BuildNumber)' != ''">rc-$(BuildNumber)</VersionSuffix>
     <TargetFrameworks>netstandard1.1;netstandard1.3</TargetFrameworks>
     <AssemblyName>Discord.Net.Commands</AssemblyName>
     <PackageTags>discord;discordapp</PackageTags>
diff --git a/src/Discord.Net.Core/Discord.Net.Core.csproj b/src/Discord.Net.Core/Discord.Net.Core.csproj
index fe8f3a2a4..27603b2d7 100644
--- a/src/Discord.Net.Core/Discord.Net.Core.csproj
+++ b/src/Discord.Net.Core/Discord.Net.Core.csproj
@@ -2,7 +2,8 @@
   <PropertyGroup>
     <Description>A .Net API wrapper and bot framework for Discord.</Description>
     <VersionPrefix>1.0.0</VersionPrefix>
-    <VersionSuffix>dev</VersionSuffix>
+    <VersionSuffix Condition="'$(BuildNumber)' == ''">rc-dev</VersionSuffix>
+    <VersionSuffix Condition="'$(BuildNumber)' != ''">rc-$(BuildNumber)</VersionSuffix>
     <TargetFrameworks>netstandard1.1;netstandard1.3</TargetFrameworks>
     <AssemblyName>Discord.Net.Core</AssemblyName>
     <PackageTags>discord;discordapp</PackageTags>
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 3e3b9a5fe..b8a278565 100644
--- a/src/Discord.Net.Providers.UdpClient/Discord.Net.Providers.UdpClient.csproj
+++ b/src/Discord.Net.Providers.UdpClient/Discord.Net.Providers.UdpClient.csproj
@@ -2,7 +2,8 @@
   <PropertyGroup>
     <Description>An optional UDP client provider for Discord.Net using System.Net.UdpClient</Description>
     <VersionPrefix>1.0.0</VersionPrefix>
-    <VersionSuffix>dev</VersionSuffix>
+    <VersionSuffix Condition="'$(BuildNumber)' == ''">rc-dev</VersionSuffix>
+    <VersionSuffix Condition="'$(BuildNumber)' != ''">rc-$(BuildNumber)</VersionSuffix>
     <TargetFrameworks>net45</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AssemblyName>Discord.Net.Providers.UDPClient</AssemblyName>
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 83a3669d9..4d73aeaa7 100644
--- a/src/Discord.Net.Providers.WS4Net/Discord.Net.Providers.WS4Net.csproj
+++ b/src/Discord.Net.Providers.WS4Net/Discord.Net.Providers.WS4Net.csproj
@@ -2,7 +2,8 @@
   <PropertyGroup>
     <Description>An optional WebSocket client provider for Discord.Net using WebSocket4Net</Description>
     <VersionPrefix>1.0.0</VersionPrefix>
-    <VersionSuffix>dev</VersionSuffix>
+    <VersionSuffix Condition="'$(BuildNumber)' == ''">rc-dev</VersionSuffix>
+    <VersionSuffix Condition="'$(BuildNumber)' != ''">rc-$(BuildNumber)</VersionSuffix>
     <TargetFrameworks>net45</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AssemblyName>Discord.Net.Providers.WS4Net</AssemblyName>
diff --git a/src/Discord.Net.Rest/Discord.Net.Rest.csproj b/src/Discord.Net.Rest/Discord.Net.Rest.csproj
index 618e3b54a..ff1c196dc 100644
--- a/src/Discord.Net.Rest/Discord.Net.Rest.csproj
+++ b/src/Discord.Net.Rest/Discord.Net.Rest.csproj
@@ -2,7 +2,8 @@
   <PropertyGroup>
     <Description>A core Discord.Net library containing the REST client and models.</Description>
     <VersionPrefix>1.0.0</VersionPrefix>
-    <VersionSuffix>dev</VersionSuffix>
+    <VersionSuffix Condition="'$(BuildNumber)' == ''">rc-dev</VersionSuffix>
+    <VersionSuffix Condition="'$(BuildNumber)' != ''">rc-$(BuildNumber)</VersionSuffix>
     <TargetFrameworks>netstandard1.1;netstandard1.3</TargetFrameworks>
     <AssemblyName>Discord.Net.Rest</AssemblyName>
     <PackageTags>discord;discordapp</PackageTags>
diff --git a/src/Discord.Net.Rpc/Discord.Net.Rpc.csproj b/src/Discord.Net.Rpc/Discord.Net.Rpc.csproj
index 0613cd846..1f0840d7e 100644
--- a/src/Discord.Net.Rpc/Discord.Net.Rpc.csproj
+++ b/src/Discord.Net.Rpc/Discord.Net.Rpc.csproj
@@ -2,7 +2,8 @@
   <PropertyGroup>
     <Description>A core Discord.Net library containing the RPC client and models.</Description>
     <VersionPrefix>1.0.0</VersionPrefix>
-    <VersionSuffix>dev</VersionSuffix>
+    <VersionSuffix Condition="'$(BuildNumber)' == ''">rc-dev</VersionSuffix>
+    <VersionSuffix Condition="'$(BuildNumber)' != ''">rc-$(BuildNumber)</VersionSuffix>
     <TargetFrameworks>netstandard1.1;netstandard1.3</TargetFrameworks>
     <AssemblyName>Discord.Net.Rpc</AssemblyName>
     <PackageTags>discord;discordapp</PackageTags>
diff --git a/src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj b/src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj
index f14a5b874..266baa010 100644
--- a/src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj
+++ b/src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj
@@ -2,7 +2,8 @@
   <PropertyGroup>
     <Description>A core Discord.Net library containing the WebSocket client and models.</Description>
     <VersionPrefix>1.0.0</VersionPrefix>
-    <VersionSuffix>dev</VersionSuffix>
+    <VersionSuffix Condition="'$(BuildNumber)' == ''">rc-dev</VersionSuffix>
+    <VersionSuffix Condition="'$(BuildNumber)' != ''">rc-$(BuildNumber)</VersionSuffix>
     <TargetFrameworks>netstandard1.1;netstandard1.3</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AssemblyName>Discord.Net.WebSocket</AssemblyName>
diff --git a/src/Discord.Net/Discord.Net.csproj b/src/Discord.Net/Discord.Net.csproj
index fd94dab20..6645dc956 100644
--- a/src/Discord.Net/Discord.Net.csproj
+++ b/src/Discord.Net/Discord.Net.csproj
@@ -2,7 +2,8 @@
   <PropertyGroup>
     <Description>An aynchronous API wrapper for Discord. This metapackage includes all of the optional Discord.Net components.</Description>
     <VersionPrefix>1.0.0</VersionPrefix>
-    <VersionSuffix>dev</VersionSuffix>
+    <VersionSuffix Condition="'$(BuildNumber)' == ''">rc-dev</VersionSuffix>
+    <VersionSuffix Condition="'$(BuildNumber)' != ''">rc-$(BuildNumber)</VersionSuffix>
     <TargetFrameworks>netstandard1.1;netstandard1.3</TargetFrameworks>
     <AssemblyName>Discord.Net</AssemblyName>
     <PackageTags>discord;discordapp</PackageTags>
diff --git a/test.ps1 b/test.ps1
index 34fe4aaa0..0cbfc9cda 100644
--- a/test.ps1
+++ b/test.ps1
@@ -1,2 +1,2 @@
-dotnet test test/Discord.Net.Tests/Discord.Net.Tests.csproj -c "Release" --noBuild -p:VersionSuffix="$env:BUILD"
+dotnet test test/Discord.Net.Tests/Discord.Net.Tests.csproj -c "Release" --noBuild /p:BuildNumber="$Env:BUILD"
 if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
\ No newline at end of file