Browse Source

Fixed CI detecting all packages as dev

tags/1.0-rc
RogueException 8 years ago
parent
commit
24663605f6
12 changed files with 36 additions and 32 deletions
  1. +2
    -2
      build.ps1
  2. +0
    -5
      init.ps1
  3. +17
    -16
      pack.ps1
  4. +2
    -1
      src/Discord.Net.Commands/Discord.Net.Commands.csproj
  5. +2
    -1
      src/Discord.Net.Core/Discord.Net.Core.csproj
  6. +2
    -1
      src/Discord.Net.Providers.UdpClient/Discord.Net.Providers.UdpClient.csproj
  7. +2
    -1
      src/Discord.Net.Providers.WS4Net/Discord.Net.Providers.WS4Net.csproj
  8. +2
    -1
      src/Discord.Net.Rest/Discord.Net.Rest.csproj
  9. +2
    -1
      src/Discord.Net.Rpc/Discord.Net.Rpc.csproj
  10. +2
    -1
      src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj
  11. +2
    -1
      src/Discord.Net/Discord.Net.csproj
  12. +1
    -1
      test.ps1

+ 2
- 2
build.ps1 View File

@@ -1,4 +1,4 @@
appveyor-retry dotnet restore Discord.Net.sln -v Minimal -p:VersionSuffix="$env:BUILD"
appveyor-retry dotnet restore Discord.Net.sln -v Minimal /p:BuildNumber="$Env:BUILD"
if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
dotnet build Discord.Net.sln -c "Release" -p:VersionSuffix="$env:BUILD"
dotnet build Discord.Net.sln -c "Release" /p:BuildNumber="$Env:BUILD"
if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }

+ 0
- 5
init.ps1 View File

@@ -1,5 +0,0 @@
if (Test-Path Env:\APPVEYOR_BUILD_NUMBER) {
$env:BUILD = "rc-$($env:APPVEYOR_BUILD_NUMBER.PadLeft(5, "0"))"
} else {
$env:BUILD = "dev"
}

+ 17
- 16
pack.ps1 View File

@@ -1,16 +1,17 @@
dotnet pack "src\Discord.Net\Discord.Net.csproj" -c "Release" -o "../../artifacts" --no-build -p:VersionSuffix="$env:BUILD"
if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
dotnet pack "src\Discord.Net.Core\Discord.Net.Core.csproj" -c "Release" -o "../../artifacts" --no-build -p:VersionSuffix="$env:BUILD"
if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
dotnet pack "src\Discord.Net.Commands\Discord.Net.Commands.csproj" -c "Release" -o "../../artifacts" --no-build -p:VersionSuffix="$env:BUILD"
if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
dotnet pack "src\Discord.Net.Rest\Discord.Net.Rest.csproj" -c "Release" -o "../../artifacts" --no-build -p:VersionSuffix="$env:BUILD"
if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
dotnet pack "src\Discord.Net.WebSocket\Discord.Net.WebSocket.csproj" -c "Release" -o "../../artifacts" --no-build -p:VersionSuffix="$env:BUILD"
if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
dotnet pack "src\Discord.Net.Rpc\Discord.Net.Rpc.csproj" -c "Release" -o "../../artifacts" --no-build -p:VersionSuffix="$env:BUILD"
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:VersionSuffix="$env:BUILD"
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:VersionSuffix="$env:BUILD"
if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
#dotnet restore "src\Discord.Net\Discord.Net.csproj" /p:BuildNumber="$Env:BUILD"
#dotnet restore "src\Discord.Net.Core\Discord.Net.Core.csproj" /p:BuildNumber="$Env:BUILD"
#dotnet restore "src\Discord.Net.Commands\Discord.Net.Commands.csproj" /p:BuildNumber="$Env:BUILD"
#dotnet restore "src\Discord.Net.Rest\Discord.Net.Rest.csproj" /p:BuildNumber="$Env:BUILD"
#dotnet restore "src\Discord.Net.WebSocket\Discord.Net.WebSocket.csproj" /p:BuildNumber="$Env:BUILD"
#dotnet restore "src\Discord.Net.Rpc\Discord.Net.Rpc.csproj" /p:BuildNumber="$Env:BUILD"
#dotnet restore "src\Discord.Net.Providers.WS4Net\Discord.Net.Providers.WS4Net.csproj" /p:BuildNumber="$Env:BUILD"
#dotnet restore "src\Discord.Net.Providers.UdpClient\Discord.Net.Providers.UdpClient.csproj" /p:BuildNumber="$Env:BUILD"

dotnet pack "src\Discord.Net\Discord.Net.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"
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.Rest\Discord.Net.Rest.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"
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.Providers.WS4Net\Discord.Net.Providers.WS4Net.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"

+ 2
- 1
src/Discord.Net.Commands/Discord.Net.Commands.csproj View File

@@ -2,7 +2,8 @@
<PropertyGroup>
<Description>A Discord.Net extension adding support for bot commands.</Description>
<VersionPrefix>1.0.0</VersionPrefix>
<VersionSuffix>dev</VersionSuffix>
<VersionSuffix Condition="'$(BuildNumber)' == ''">rc-dev</VersionSuffix>
<VersionSuffix Condition="'$(BuildNumber)' != ''">rc-$(BuildNumber)</VersionSuffix>
<TargetFrameworks>netstandard1.1;netstandard1.3</TargetFrameworks>
<AssemblyName>Discord.Net.Commands</AssemblyName>
<PackageTags>discord;discordapp</PackageTags>


+ 2
- 1
src/Discord.Net.Core/Discord.Net.Core.csproj View File

@@ -2,7 +2,8 @@
<PropertyGroup>
<Description>A .Net API wrapper and bot framework for Discord.</Description>
<VersionPrefix>1.0.0</VersionPrefix>
<VersionSuffix>dev</VersionSuffix>
<VersionSuffix Condition="'$(BuildNumber)' == ''">rc-dev</VersionSuffix>
<VersionSuffix Condition="'$(BuildNumber)' != ''">rc-$(BuildNumber)</VersionSuffix>
<TargetFrameworks>netstandard1.1;netstandard1.3</TargetFrameworks>
<AssemblyName>Discord.Net.Core</AssemblyName>
<PackageTags>discord;discordapp</PackageTags>


+ 2
- 1
src/Discord.Net.Providers.UdpClient/Discord.Net.Providers.UdpClient.csproj View File

@@ -2,7 +2,8 @@
<PropertyGroup>
<Description>An optional UDP client provider for Discord.Net using System.Net.UdpClient</Description>
<VersionPrefix>1.0.0</VersionPrefix>
<VersionSuffix>dev</VersionSuffix>
<VersionSuffix Condition="'$(BuildNumber)' == ''">rc-dev</VersionSuffix>
<VersionSuffix Condition="'$(BuildNumber)' != ''">rc-$(BuildNumber)</VersionSuffix>
<TargetFrameworks>net45</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<AssemblyName>Discord.Net.Providers.UDPClient</AssemblyName>


+ 2
- 1
src/Discord.Net.Providers.WS4Net/Discord.Net.Providers.WS4Net.csproj View File

@@ -2,7 +2,8 @@
<PropertyGroup>
<Description>An optional WebSocket client provider for Discord.Net using WebSocket4Net</Description>
<VersionPrefix>1.0.0</VersionPrefix>
<VersionSuffix>dev</VersionSuffix>
<VersionSuffix Condition="'$(BuildNumber)' == ''">rc-dev</VersionSuffix>
<VersionSuffix Condition="'$(BuildNumber)' != ''">rc-$(BuildNumber)</VersionSuffix>
<TargetFrameworks>net45</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<AssemblyName>Discord.Net.Providers.WS4Net</AssemblyName>


+ 2
- 1
src/Discord.Net.Rest/Discord.Net.Rest.csproj View File

@@ -2,7 +2,8 @@
<PropertyGroup>
<Description>A core Discord.Net library containing the REST client and models.</Description>
<VersionPrefix>1.0.0</VersionPrefix>
<VersionSuffix>dev</VersionSuffix>
<VersionSuffix Condition="'$(BuildNumber)' == ''">rc-dev</VersionSuffix>
<VersionSuffix Condition="'$(BuildNumber)' != ''">rc-$(BuildNumber)</VersionSuffix>
<TargetFrameworks>netstandard1.1;netstandard1.3</TargetFrameworks>
<AssemblyName>Discord.Net.Rest</AssemblyName>
<PackageTags>discord;discordapp</PackageTags>


+ 2
- 1
src/Discord.Net.Rpc/Discord.Net.Rpc.csproj View File

@@ -2,7 +2,8 @@
<PropertyGroup>
<Description>A core Discord.Net library containing the RPC client and models.</Description>
<VersionPrefix>1.0.0</VersionPrefix>
<VersionSuffix>dev</VersionSuffix>
<VersionSuffix Condition="'$(BuildNumber)' == ''">rc-dev</VersionSuffix>
<VersionSuffix Condition="'$(BuildNumber)' != ''">rc-$(BuildNumber)</VersionSuffix>
<TargetFrameworks>netstandard1.1;netstandard1.3</TargetFrameworks>
<AssemblyName>Discord.Net.Rpc</AssemblyName>
<PackageTags>discord;discordapp</PackageTags>


+ 2
- 1
src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj View File

@@ -2,7 +2,8 @@
<PropertyGroup>
<Description>A core Discord.Net library containing the WebSocket client and models.</Description>
<VersionPrefix>1.0.0</VersionPrefix>
<VersionSuffix>dev</VersionSuffix>
<VersionSuffix Condition="'$(BuildNumber)' == ''">rc-dev</VersionSuffix>
<VersionSuffix Condition="'$(BuildNumber)' != ''">rc-$(BuildNumber)</VersionSuffix>
<TargetFrameworks>netstandard1.1;netstandard1.3</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<AssemblyName>Discord.Net.WebSocket</AssemblyName>


+ 2
- 1
src/Discord.Net/Discord.Net.csproj View File

@@ -2,7 +2,8 @@
<PropertyGroup>
<Description>An aynchronous API wrapper for Discord. This metapackage includes all of the optional Discord.Net components.</Description>
<VersionPrefix>1.0.0</VersionPrefix>
<VersionSuffix>dev</VersionSuffix>
<VersionSuffix Condition="'$(BuildNumber)' == ''">rc-dev</VersionSuffix>
<VersionSuffix Condition="'$(BuildNumber)' != ''">rc-$(BuildNumber)</VersionSuffix>
<TargetFrameworks>netstandard1.1;netstandard1.3</TargetFrameworks>
<AssemblyName>Discord.Net</AssemblyName>
<PackageTags>discord;discordapp</PackageTags>


+ 1
- 1
test.ps1 View File

@@ -1,2 +1,2 @@
dotnet test test/Discord.Net.Tests/Discord.Net.Tests.csproj -c "Release" --noBuild -p:VersionSuffix="$env:BUILD"
dotnet test test/Discord.Net.Tests/Discord.Net.Tests.csproj -c "Release" --noBuild /p:BuildNumber="$Env:BUILD"
if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }

Loading…
Cancel
Save