Merge b4b96d6ca6 into d89804d7c7

Discord.Net.targets

@@ -1,7 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
-        <VersionPrefix>1.0.1</VersionPrefix>
-        <VersionSuffix></VersionSuffix>
+        <VersionPrefix>1.0.2</VersionPrefix>
         <Authors>RogueException</Authors>
         <PackageTags>discord;discordapp</PackageTags>
         <PackageProjectUrl>https://github.com/RogueException/Discord.Net</PackageProjectUrl>
@@ -9,13 +8,11 @@
         <RepositoryType>git</RepositoryType>
         <RepositoryUrl>git://github.com/RogueException/Discord.Net</RepositoryUrl>
     </PropertyGroup>
-    <PropertyGroup Condition=" '$(BuildNumber)' == '' ">
-        <VersionSuffix Condition=" '$(VersionSuffix)' != ''">$(VersionSuffix)-dev</VersionSuffix>
-        <VersionSuffix Condition=" '$(VersionSuffix)' == ''">dev</VersionSuffix>
+    <PropertyGroup Condition=" '$(BuildNumber)' == '' And '$(IsTaggedBuild)' != 'true' ">
+        <VersionSuffix>dev</VersionSuffix>
     </PropertyGroup>
-    <PropertyGroup Condition=" '$(BuildNumber)' != '' And $(IsTagBuild) != 'true' ">
-        <VersionSuffix Condition=" '$(VersionSuffix)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
-        <VersionSuffix Condition=" '$(VersionSuffix)' == '' ">build-$(BuildNumber)</VersionSuffix>
+    <PropertyGroup Condition=" '$(BuildNumber)' != '' ">
+        <VersionSuffix>$(BuildNumber)</VersionSuffix>
     </PropertyGroup>
     <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' Or '$(TargetFramework)' == 'net45' ">
         <DefineConstants>$(DefineConstants);FILESYSTEM;DEFAULTUDPCLIENT;DEFAULTWEBSOCKET</DefineConstants>

appveyor.yml

@@ -17,31 +17,37 @@ environment:
     secure: l7h5e7UE7yRd70hAB97kjPiQpPOShwqoBbOzEAYQ+XBd/Pre5OA33IXa3uisdUeQJP/nPFhcOsI+yn7WpuFaoQ==
   DNET_TEST_GUILDID: 273160668180381696
 init:
-- ps: $Env:BUILD = "$($Env:APPVEYOR_BUILD_NUMBER.PadLeft(5, "0"))"
+- ps: >-
+    if ($Env:APPVEYOR_REPO_TAG -eq "true") {
+      $Env:BUILD = "$($Env:APPVEYOR_BUILD_NUMBER.PadLeft(5, "0"))"
+    } else {
+      $Env:BUILD = "build-$($Env:APPVEYOR_BUILD_NUMBER.PadLeft(5, "0"))"
+    }
+
 
 build_script:
-- ps: appveyor-retry dotnet restore Discord.Net.sln -v Minimal /p:BuildNumber="$Env:BUILD" /p:IsTagBuild="$Env:APPVEYOR_REPO_TAG"
-- ps: dotnet build Discord.Net.sln -c "Release" /p:BuildNumber="$Env:BUILD" /p:IsTagBuild="$Env:APPVEYOR_REPO_TAG"
+- ps: appveyor-retry dotnet restore Discord.Net.sln -v Minimal /p:BuildNumber="$Env:BUILD" /p:IsTaggedBuild="$Env:APPVEYOR_REPO_TAG"
+- ps: dotnet build Discord.Net.sln -c "Release" /p:BuildNumber="$Env:BUILD" /p:IsTaggedBuild="$Env:APPVEYOR_REPO_TAG"
 after_build:
-- ps: 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"
-- ps: 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"
-- ps: 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"
-- ps: 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"
-- ps: 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"
-- ps: dotnet pack "src\Discord.Net.Webhook\Discord.Net.Webhook.csproj" -c "Release" -o "../../artifacts" --no-build /p:BuildNumber="$Env:BUILD" /p:IsTagBuild="$Env:APPVEYOR_REPO_TAG"
-- ps: 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"
+- ps: dotnet pack "src\Discord.Net.Core\Discord.Net.Core.csproj" -c "Release" -o "../../artifacts" --no-build /p:BuildNumber="$Env:BUILD" /p:IsTaggedBuild="$Env:APPVEYOR_REPO_TAG"
+- ps: dotnet pack "src\Discord.Net.Rest\Discord.Net.Rest.csproj" -c "Release" -o "../../artifacts" --no-build /p:BuildNumber="$Env:BUILD" /p:IsTaggedBuild="$Env:APPVEYOR_REPO_TAG"
+- ps: dotnet pack "src\Discord.Net.WebSocket\Discord.Net.WebSocket.csproj" -c "Release" -o "../../artifacts" --no-build /p:BuildNumber="$Env:BUILD" /p:IsTaggedBuild="$Env:APPVEYOR_REPO_TAG"
+- ps: dotnet pack "src\Discord.Net.Rpc\Discord.Net.Rpc.csproj" -c "Release" -o "../../artifacts" --no-build /p:BuildNumber="$Env:BUILD" /p:IsTaggedBuild="$Env:APPVEYOR_REPO_TAG"
+- ps: dotnet pack "src\Discord.Net.Commands\Discord.Net.Commands.csproj" -c "Release" -o "../../artifacts" --no-build /p:BuildNumber="$Env:BUILD" /p:IsTaggedBuild="$Env:APPVEYOR_REPO_TAG"
+- ps: dotnet pack "src\Discord.Net.Webhook\Discord.Net.Webhook.csproj" -c "Release" -o "../../artifacts" --no-build /p:BuildNumber="$Env:BUILD" /p:IsTaggedBuild="$Env:APPVEYOR_REPO_TAG"
+- ps: dotnet pack "src\Discord.Net.Providers.WS4Net\Discord.Net.Providers.WS4Net.csproj" -c "Release" -o "../../artifacts" --no-build /p:BuildNumber="$Env:BUILD" /p:IsTaggedBuild="$Env:APPVEYOR_REPO_TAG"
 - ps: >-
-    if ($Env:APPVEYOR_REPO_TAG -eq "true") {
-      nuget pack src\Discord.Net\Discord.Net.nuspec -OutputDirectory "artifacts" -properties suffix=""
+    if($Env:APPVEYOR_REPO_TAG -eq "true") {
+      nuget pack src\Discord.Net\Discord.Net.nuspec -OutputDirectory "artifacts"
     } else {
-      nuget pack src\Discord.Net\Discord.Net.nuspec -OutputDirectory "artifacts" -properties suffix="-$Env:BUILD"
+      nuget pack src\Discord.Net\Discord.Net.nuspec -OutputDirectory "artifacts" -suffix "$Env:BUILD"
     }
 - ps: Get-ChildItem artifacts\*.nupkg | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
 
 test_script:
 - ps: >-
     if ($APPVEYOR_PULL_REQUEST_NUMBER -eq "") {
-      dotnet test test/Discord.Net.Tests/Discord.Net.Tests.csproj -c "Release" --no-build /p:BuildNumber="$Env:BUILD" /p:IsTagBuild="$Env:APPVEYOR_REPO_TAG"
+      dotnet test test/Discord.Net.Tests/Discord.Net.Tests.csproj -c "Release" --no-build /p:BuildNumber="$Env:BUILD"
     }
 
 deploy:

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.1-build$suffix$</version>
+    <version>1.0.2</version>
     <title>Discord.Net</title>
     <authors>RogueException</authors>
     <owners>RogueException</owners>
@@ -13,28 +13,28 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <dependencies>
         <group targetFramework="net45">
-            <dependency id="Discord.Net.Core" version="1.0.1-build$suffix$" />
-            <dependency id="Discord.Net.Rest" version="1.0.1-build$suffix$" />
-            <dependency id="Discord.Net.WebSocket" version="1.0.1-build$suffix$" />
-            <dependency id="Discord.Net.Rpc" version="1.0.1-build$suffix$" />
-            <dependency id="Discord.Net.Commands" version="1.0.1-build$suffix$" />
-            <dependency id="Discord.Net.Webhook" version="1.0.1-build$suffix$" />
+            <dependency id="Discord.Net.Core" version="1.0.2" />
+            <dependency id="Discord.Net.Rest" version="1.0.2" />
+            <dependency id="Discord.Net.WebSocket" version="1.0.2" />
+            <dependency id="Discord.Net.Rpc" version="1.0.2" />
+            <dependency id="Discord.Net.Commands" version="1.0.2" />
+            <dependency id="Discord.Net.Webhook" version="1.0.2" />
         </group>
         <group targetFramework="netstandard1.1">
-            <dependency id="Discord.Net.Core" version="1.0.1-build$suffix$" />
-            <dependency id="Discord.Net.Rest" version="1.0.1-build$suffix$" />
-            <dependency id="Discord.Net.WebSocket" version="1.0.1-build$suffix$" />
-            <dependency id="Discord.Net.Rpc" version="1.0.1-build$suffix$" />
-            <dependency id="Discord.Net.Commands" version="1.0.1-build$suffix$" />
-            <dependency id="Discord.Net.Webhook" version="1.0.1-build$suffix$" />
+            <dependency id="Discord.Net.Core" version="1.0.2" />
+            <dependency id="Discord.Net.Rest" version="1.0.2" />
+            <dependency id="Discord.Net.WebSocket" version="1.0.2" />
+            <dependency id="Discord.Net.Rpc" version="1.0.2" />
+            <dependency id="Discord.Net.Commands" version="1.0.2" />
+            <dependency id="Discord.Net.Webhook" version="1.0.2" />
         </group>
         <group targetFramework="netstandard1.3">
-            <dependency id="Discord.Net.Core" version="1.0.1-build$suffix$" />
-            <dependency id="Discord.Net.Rest" version="1.0.1-build$suffix$" />
-            <dependency id="Discord.Net.WebSocket" version="1.0.1-build$suffix$" />
-            <dependency id="Discord.Net.Rpc" version="1.0.1-build$suffix$" />
-            <dependency id="Discord.Net.Commands" version="1.0.1-build$suffix$" />
-            <dependency id="Discord.Net.Webhook" version="1.0.1-build$suffix$" />
+            <dependency id="Discord.Net.Core" version="1.0.2" />
+            <dependency id="Discord.Net.Rest" version="1.0.2" />
+            <dependency id="Discord.Net.WebSocket" version="1.0.2" />
+            <dependency id="Discord.Net.Rpc" version="1.0.2" />
+            <dependency id="Discord.Net.Commands" version="1.0.2" />
+            <dependency id="Discord.Net.Webhook" version="1.0.2" />
         </group>
     </dependencies>
   </metadata>