From 5ad2d7361d31458012b320ef85b27149d86daf42 Mon Sep 17 00:00:00 2001 From: RogueException Date: Tue, 2 May 2017 01:03:04 -0300 Subject: [PATCH] Added appveyor.yml, README edits (#639) --- Discord.Net.targets | 4 ++-- README.md | 5 ++--- appveyor.yml | 55 +++++++++++++++++++++++++++++++++++++++++++++ build.ps1 | 4 ---- pack.ps1 | 22 ------------------ test.ps1 | 2 -- 6 files changed, 59 insertions(+), 33 deletions(-) create mode 100644 appveyor.yml delete mode 100644 build.ps1 delete mode 100644 pack.ps1 delete mode 100644 test.ps1 diff --git a/Discord.Net.targets b/Discord.Net.targets index 669db428d..3bfa199c1 100644 --- a/Discord.Net.targets +++ b/Discord.Net.targets @@ -10,12 +10,12 @@ git://github.com/RogueException/Discord.Net - dev $(VersionSuffix)-dev + dev - $(BuildNumber) $(VersionSuffix)-$(BuildNumber) + build-$(BuildNumber) $(DefineConstants);FILESYSTEM;DEFAULTUDPCLIENT;DEFAULTWEBSOCKET diff --git a/README.md b/README.md index c932f6b25..c5ed907ee 100644 --- a/README.md +++ b/README.md @@ -14,14 +14,13 @@ Our stable builds available from NuGet through the Discord.Net metapackage: - [Discord.Net](https://www.nuget.org/packages/Discord.Net/) The individual components may also be installed from NuGet: +- [Discord.Net.Commands](https://www.nuget.org/packages/Discord.Net.Commands/) - [Discord.Net.Rest](https://www.nuget.org/packages/Discord.Net.Rest/) - [Discord.Net.Rpc](https://www.nuget.org/packages/Discord.Net.Rpc/) - [Discord.Net.WebSocket](https://www.nuget.org/packages/Discord.Net.WebSocket/) - [Discord.Net.Webhook](https://www.nuget.org/packages/Discord.Net.Webhook/) -- [Discord.Net.Commands](https://www.nuget.org/packages/Discord.Net.Commands/) -The following providers are available for platforms not supporting .NET Standard 1.3: -- [Discord.Net.Providers.UdpClient](https://www.nuget.org/packages/Discord.Net.Providers.UdpClient/) +The following provider is available for platforms not supporting .NET Standard 1.3: - [Discord.Net.Providers.WS4Net](https://www.nuget.org/packages/Discord.Net.Providers.WS4Net/) ### Unstable (MyGet) diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 000000000..f1b4bf992 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,55 @@ +version: build-{build} +branches: + only: + - dev +image: Visual Studio 2017 + +nuget: + disable_publish_on_pr: true +pull_requests: + do_not_increment_build_number: true +clone_folder: C:\Projects\Discord.Net +cache: test/Discord.Net.Tests/cache.db + +environment: + DOTNET_CLI_TELEMETRY_OPTOUT: 1 + DNET_TEST_TOKEN: + secure: l7h5e7UE7yRd70hAB97kjPiQpPOShwqoBbOzEAYQ+XBd/Pre5OA33IXa3uisdUeQJP/nPFhcOsI+yn7WpuFaoQ== + DNET_TEST_GUILDID: 273160668180381696 +init: +- ps: $Env: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: 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: >- + if ($Env:APPVEYOR_REPO_TAG -eq "true") { + nuget pack src\Discord.Net\Discord.Net.nuspec -OutputDirectory "artifacts" -properties suffix="" + } else { + nuget pack src\Discord.Net\Discord.Net.nuspec -OutputDirectory "artifacts" -properties suffix="-$Env:BUILD" + } +test_script: +- ps: >- + if ($APPVEYOR_PULL_REQUEST_NUMBER -ne "") { + dotnet test test/Discord.Net.Tests/Discord.Net.Tests.csproj -c "Release" --no-build /p:BuildNumber="$Env:BUILD" /p:IsTagBuild="$Env:APPVEYOR_REPO_TAG" + } + +artifacts: +- path: artifacts/*.nupkg + name: MyGet +deploy: +- provider: NuGet + server: https://www.myget.org/F/discord-net/api/v2/package + api_key: + secure: Jl7BXeUjRnkVHDMBuUWSXcEOkrli1PBleW2IiLyUs5j63UNUNp1hcjaUJRujx9lz + symbol_server: https://www.myget.org/F/discord-net/symbols/api/v2/package + artifact: MyGet + on: + branch: dev \ No newline at end of file diff --git a/build.ps1 b/build.ps1 deleted file mode 100644 index 1b960011a..000000000 --- a/build.ps1 +++ /dev/null @@ -1,4 +0,0 @@ -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" /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 deleted file mode 100644 index 39b9c21ce..000000000 --- a/pack.ps1 +++ /dev/null @@ -1,22 +0,0 @@ -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" /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" /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" /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" /p:IsTagBuild="$Env:APPVEYOR_REPO_TAG" -if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) } -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" -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" /p:IsTagBuild="$Env:APPVEYOR_REPO_TAG" -if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) } - -if ($Env:APPVEYOR_REPO_TAG -eq "true") { - nuget pack src\Discord.Net\Discord.Net.nuspec -OutputDirectory "artifacts" -properties suffix="" -} -else { - nuget pack src\Discord.Net\Discord.Net.nuspec -OutputDirectory "artifacts" -properties suffix="-$Env:BUILD" -} -if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) } diff --git a/test.ps1 b/test.ps1 deleted file mode 100644 index d73a01f23..000000000 --- a/test.ps1 +++ /dev/null @@ -1,2 +0,0 @@ -dotnet test test/Discord.Net.Tests/Discord.Net.Tests.csproj -c "Release" --no-build /p:BuildNumber="$Env:BUILD" /p:IsTagBuild="$Env:APPVEYOR_REPO_TAG" -if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) } \ No newline at end of file