Browse Source

Attempt 2 at fixing CI

pull/738/head
FiniteReality 8 years ago
parent
commit
2d547aa2af
3 changed files with 24 additions and 24 deletions
  1. +3
    -3
      Discord.Net.targets
  2. +2
    -2
      appveyor.yml
  3. +19
    -19
      src/Discord.Net/Discord.Net.nuspec

+ 3
- 3
Discord.Net.targets View File

@@ -1,7 +1,7 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VersionPrefix>1.0.1</VersionPrefix>
<VersionSuffix>build</VersionSuffix>
<VersionPrefix>1.0.2</VersionPrefix>
<VersionSuffix></VersionSuffix>
<Authors>RogueException</Authors>
<PackageTags>discord;discordapp</PackageTags>
<PackageProjectUrl>https://github.com/RogueException/Discord.Net</PackageProjectUrl>
@@ -13,7 +13,7 @@
<VersionSuffix Condition=" '$(VersionSuffix)' != ''">$(VersionSuffix)-dev</VersionSuffix>
<VersionSuffix Condition=" '$(VersionSuffix)' == ''">dev</VersionSuffix>
</PropertyGroup>
<PropertyGroup Condition=" '$(BuildNumber)' != '' And $(IsTagBuild) != 'true' ">
<PropertyGroup Condition=" '$(BuildNumber)' != '' And '$(IsTagBuild)' != 'true' ">
<VersionSuffix Condition=" '$(VersionSuffix)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
<VersionSuffix Condition=" '$(VersionSuffix)' == '' ">build-$(BuildNumber)</VersionSuffix>
</PropertyGroup>


+ 2
- 2
appveyor.yml View File

@@ -32,9 +32,9 @@ after_build:
- 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=""
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 }



+ 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">
<metadata>
<id>Discord.Net</id>
<version>1.0.2$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.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 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 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>
</dependencies>
</metadata>

Loading…
Cancel
Save