youys
/
Discord.Net
Not watched
1
0
Fork 0
Code
Releases 34 Wiki Activity
Issues 0 Pull Requests 0 Datasets Model Cloudbrain
Browse Source

Attempt 4 at fixing CI

pull/738/head
FiniteReality 8 years ago
parent
8d3557b20b
commit
2fef2baf6b
3 changed files with 39 additions and 42 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +3
    -6
      Discord.Net.targets
  2. +17
    -17
      appveyor.yml
  3. +19
    -19
      src/Discord.Net/Discord.Net.nuspec

+ 3
- 6
Discord.Net.targets View File

@@ -1,7 +1,6 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<VersionPrefix>1.0.2</VersionPrefix> <VersionPrefix>1.0.2</VersionPrefix>
<VersionSuffix></VersionSuffix>
<Authors>RogueException</Authors> <Authors>RogueException</Authors>
<PackageTags>discord;discordapp</PackageTags> <PackageTags>discord;discordapp</PackageTags>
<PackageProjectUrl>https://github.com/RogueException/Discord.Net</PackageProjectUrl> <PackageProjectUrl>https://github.com/RogueException/Discord.Net</PackageProjectUrl>
@@ -10,12 +9,10 @@
<RepositoryUrl>git://github.com/RogueException/Discord.Net</RepositoryUrl> <RepositoryUrl>git://github.com/RogueException/Discord.Net</RepositoryUrl>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(BuildNumber)' == '' "> <PropertyGroup Condition=" '$(BuildNumber)' == '' ">
<VersionSuffix Condition=" '$(VersionSuffix)' != ''">$(VersionSuffix)-dev</VersionSuffix>
<VersionSuffix Condition=" '$(VersionSuffix)' == ''">dev</VersionSuffix>
<VersionSuffix>dev</VersionSuffix>
</PropertyGroup> </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>
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' Or '$(TargetFramework)' == 'net45' "> <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' Or '$(TargetFramework)' == 'net45' ">
<DefineConstants>$(DefineConstants);FILESYSTEM;DEFAULTUDPCLIENT;DEFAULTWEBSOCKET</DefineConstants> <DefineConstants>$(DefineConstants);FILESYSTEM;DEFAULTUDPCLIENT;DEFAULTWEBSOCKET</DefineConstants>


+ 17
- 17
appveyor.yml View File

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


test_script: test_script:
- ps: >- - ps: >-
if ($APPVEYOR_PULL_REQUEST_NUMBER -eq "") { 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: deploy:


+ 19
- 19
src/Discord.Net/Discord.Net.nuspec View File

@@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"> <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata> <metadata>
<id>Discord.Net</id> <id>Discord.Net</id>
<version>1.0.2-$suffix$</version>
<version>1.0.2</version>
<title>Discord.Net</title> <title>Discord.Net</title>
<authors>RogueException</authors> <authors>RogueException</authors>
<owners>RogueException</owners> <owners>RogueException</owners>
@@ -13,28 +13,28 @@
<requireLicenseAcceptance>false</requireLicenseAcceptance> <requireLicenseAcceptance>false</requireLicenseAcceptance>
<dependencies> <dependencies>
<group targetFramework="net45"> <group targetFramework="net45">
<dependency id="Discord.Net.Core" version="1.0.2-$suffix$" />
<dependency id="Discord.Net.Rest" version="1.0.2-$suffix$" />
<dependency id="Discord.Net.WebSocket" version="1.0.2-$suffix$" />
<dependency id="Discord.Net.Rpc" version="1.0.2-$suffix$" />
<dependency id="Discord.Net.Commands" version="1.0.2-$suffix$" />
<dependency id="Discord.Net.Webhook" version="1.0.2-$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>
<group targetFramework="netstandard1.1"> <group targetFramework="netstandard1.1">
<dependency id="Discord.Net.Core" version="1.0.2-$suffix$" />
<dependency id="Discord.Net.Rest" version="1.0.2-$suffix$" />
<dependency id="Discord.Net.WebSocket" version="1.0.2-$suffix$" />
<dependency id="Discord.Net.Rpc" version="1.0.2-$suffix$" />
<dependency id="Discord.Net.Commands" version="1.0.2-$suffix$" />
<dependency id="Discord.Net.Webhook" version="1.0.2-$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>
<group targetFramework="netstandard1.3"> <group targetFramework="netstandard1.3">
<dependency id="Discord.Net.Core" version="1.0.2-$suffix$" />
<dependency id="Discord.Net.Rest" version="1.0.2-$suffix$" />
<dependency id="Discord.Net.WebSocket" version="1.0.2-$suffix$" />
<dependency id="Discord.Net.Rpc" version="1.0.2-$suffix$" />
<dependency id="Discord.Net.Commands" version="1.0.2-$suffix$" />
<dependency id="Discord.Net.Webhook" version="1.0.2-$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>
</dependencies> </dependencies>
</metadata> </metadata>

Write Preview
Loading…
Cancel
Save