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 @@
+
+
+ 1.0.0
+ rc
+ $(VersionSuffix)-dev
+ $(VersionSuffix)-$(BuildNumber)
+ RogueException
+ discord;discordapp
+ https://github.com/RogueException/Discord.Net
+ http://opensource.org/licenses/MIT
+ git
+ git://github.com/RogueException/Discord.Net
+ true
+
+
+ $(NoWarn);CS1573;CS1591
+ true
+ true
+
+
\ 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 @@
+
- 1.0.0
- rc-dev
- rc-$(BuildNumber)
- netstandard1.3
Discord.Net.Analyzers
- RogueException
- A Discord.Net extension adding compile-time analysis.
- discord;discordapp
- https://github.com/RogueException/Discord.Net
- http://opensource.org/licenses/MIT
- git
- git://github.com/RogueException/Discord.Net
Discord.Analyzers
- portable-net45+win81
- true
+ A Discord.Net extension adding compile-time analysis.
+ netstandard1.3
+ $(PackageTargetFallback);portable-net45+win81
@@ -24,9 +15,4 @@
all
-
- $(NoWarn);CS1573;CS1591
- true
- true
-
\ 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 @@
-
+
+
- 1.0.0
- rc-dev
- rc-$(BuildNumber)
- netstandard1.1;netstandard1.3
Discord.Net.Commands
- RogueException
- A Discord.Net extension adding support for bot commands.
- discord;discordapp
- https://github.com/RogueException/Discord.Net
- http://opensource.org/licenses/MIT
- git
- git://github.com/RogueException/Discord.Net
Discord.Commands
- true
+ A Discord.Net extension adding support for bot commands.
+ netstandard1.1;netstandard1.3
-
- $(NoWarn);CS1573;CS1591
- true
- true
-
\ 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 @@
-
+
+
- 1.0.0
- rc-dev
- rc-$(BuildNumber)
- netstandard1.1;netstandard1.3
Discord.Net.Core
- RogueException
- A .Net API wrapper and bot framework for Discord.
- discord;discordapp
- https://github.com/RogueException/Discord.Net
- http://opensource.org/licenses/MIT
- git
- git://github.com/RogueException/Discord.Net
Discord
- true
+ A .Net API wrapper and bot framework for Discord.
+ netstandard1.1;netstandard1.3
@@ -28,9 +19,4 @@
-
- $(NoWarn);CS1573;CS1591
- true
- true
-
\ 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 @@
+
- 1.0.0
- rc-dev
- rc-$(BuildNumber)
- netstandard1.6
Discord.Net.DebugTools
- RogueException
- A Discord.Net extension adding some helper classes for diagnosing issues.
- discord;discordapp
- https://github.com/RogueException/Discord.Net
- http://opensource.org/licenses/MIT
- git
- git://github.com/RogueException/Discord.Net
Discord
- true
+ A Discord.Net extension adding some helper classes for diagnosing issues.
+ netstandard1.6
@@ -23,9 +14,4 @@
-
- $(NoWarn);CS1573;CS1591
- true
- true
-
\ 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 @@
-
+
+
- 1.0.0
- rc-dev
- rc-$(BuildNumber)
- net45
Discord.Net.Providers.UDPClient
- RogueException
- An optional UDP client provider for Discord.Net using System.Net.UdpClient
- discord;discordapp
- https://github.com/RogueException/Discord.Net
- http://opensource.org/licenses/MIT
- git
- git://github.com/RogueException/Discord.Net
Discord.Providers.UDPClient
- true
+ An optional UDP client provider for Discord.Net using System.Net.UdpClient
+ net45
-
- $(NoWarn);CS1573;CS1591
- true
- true
-
\ 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 @@
-
+
+
- 1.0.0
- rc-dev
- rc-$(BuildNumber)
- net45
- true
Discord.Net.Providers.WS4Net
- RogueException
- An optional WebSocket client provider for Discord.Net using WebSocket4Net
- discord;discordapp
- https://github.com/RogueException/Discord.Net
- http://opensource.org/licenses/MIT
- git
- git://github.com/RogueException/Discord.Net
Discord.Providers.WS4Net
- true
+ An optional WebSocket client provider for Discord.Net using WebSocket4Net
+ net45
@@ -22,9 +12,4 @@
-
- $(NoWarn);CS1573;CS1591
- true
- true
-
\ 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 @@
+
- 1.0.0
- rc-dev
- rc-$(BuildNumber)
- netstandard1.3
Discord.Net.Relay
- RogueException
- A core Discord.Net library containing the Relay server.
- discord;discordapp
- https://github.com/RogueException/Discord.Net
- http://opensource.org/licenses/MIT
- git
- git://github.com/RogueException/Discord.Net
Discord.Relay
- true
+ A core Discord.Net library containing the Relay server.
+ netstandard1.3
@@ -24,9 +15,4 @@
-
- $(NoWarn);CS1573;CS1591
- true
- true
-
\ 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 @@
+
- 1.0.0
- rc-dev
- rc-$(BuildNumber)
- netstandard1.1;netstandard1.3
Discord.Net.Rest
- RogueException
- A core Discord.Net library containing the REST client and models.
- discord;discordapp
- https://github.com/RogueException/Discord.Net
- http://opensource.org/licenses/MIT
- git
- git://github.com/RogueException/Discord.Net
Discord.Rest
- true
+ A core Discord.Net library containing the REST client and models.
+ netstandard1.1;netstandard1.3
@@ -21,9 +12,4 @@
-
- $(NoWarn);CS1573;CS1591
- true
- true
-
\ 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 @@
+
- 1.0.0
- rc-dev
- rc-$(BuildNumber)
- netstandard1.1;netstandard1.3
Discord.Net.Rpc
- RogueException
- A core Discord.Net library containing the RPC client and models.
- discord;discordapp
- https://github.com/RogueException/Discord.Net
- http://opensource.org/licenses/MIT
- git
- git://github.com/RogueException/Discord.Net
Discord.Rpc
- true
+ A core Discord.Net library containing the RPC client and models.
+ netstandard1.1;netstandard1.3
@@ -33,9 +24,4 @@
-
- $(NoWarn);CS1573;CS1591
- true
- true
-
\ 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 @@
-
+
+
- 1.0.0
- rc-dev
- rc-$(BuildNumber)
- netstandard1.1;netstandard1.3
Discord.Net.WebSocket
- RogueException
- A core Discord.Net library containing the WebSocket client and models.
- discord;discordapp
- https://github.com/RogueException/Discord.Net
- http://opensource.org/licenses/MIT
- git
- git://github.com/RogueException/Discord.Net
Discord.WebSocket
+ A core Discord.Net library containing the WebSocket client and models.
+ netstandard1.1;netstandard1.3
true
- true
@@ -29,9 +20,4 @@
-
- $(NoWarn);CS1573;CS1591
- true
- true
-
\ 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 @@
+
- 1.0.0
- rc-dev
- rc-$(BuildNumber)
- netstandard1.1;netstandard1.3
Discord.Net.Webhook
- RogueException
- A core Discord.Net library containing the Webhook client and models.
- discord;discordapp
- https://github.com/RogueException/Discord.Net
- http://opensource.org/licenses/MIT
- git
- git://github.com/RogueException/Discord.Net
Discord.Webhook
- true
+ A core Discord.Net library containing the Webhook client and models.
+ netstandard1.1;netstandard1.3
-
- $(NoWarn);CS1573;CS1591
- true
- true
-
\ 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 @@
Discord.Net
- 1.0.0-rc-$build$
+ 1.0.0-rc$suffix$
Discord.Net
RogueException
RogueException
@@ -13,18 +13,18 @@
false
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
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 @@
-
+
+
Exe
+ Discord
netcoreapp1.1
$(PackageTargetFallback);portable-net45+win8+wp8+wpa81
- Discord
@@ -19,6 +20,7 @@
+