Skip to content
This repository has been archived by the owner on Apr 27, 2019. It is now read-only.

Commit

Permalink
Fix version (#118)
Browse files Browse the repository at this point in the history
* Update appveyor.yml
* Update Consul.csproj
  • Loading branch information
anwright-ms authored Jun 27, 2018
1 parent 0422e97 commit fca67b4
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Consul/Consul.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<VersionPrefix>0.7.2.1</VersionPrefix>
<VersionPrefix>0.7.2.5</VersionPrefix>
<TargetFrameworks>netstandard1.3;net45</TargetFrameworks>
<AssemblyName>Consul</AssemblyName>
<PackageId>Consul</PackageId>
Expand Down
10 changes: 7 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ cache:
- C:\consul_install -> appveyor.yml
- '%USERPROFILE%\.nuget\packages -> **\project.json'
init:
- if "%APPVEYOR_REPO_TAG%" == "true" set APPVEYOR_BUILD_VERSION=%APPVEYOR_REPO_TAG_NAME%
- ps: $Env:LABEL = "CI" + $Env:APPVEYOR_BUILD_NUMBER.PadLeft(4, "0")
- ps: if ($Env:APPVEYOR_REPO_TAG -eq $true) {$Env:APPVEYOR_BUILD_VERSION = $Env:APPVEYOR_REPO_TAG_NAME} else {$Env:LABEL = "CI" + $Env:APPVEYOR_BUILD_NUMBER.PadLeft(4, "0")}
before_build:
- dotnet --info
- appveyor-retry dotnet restore Consul
Expand All @@ -51,7 +50,12 @@ build_script:
copy "%APPVEYOR_BUILD_FOLDER%\Consul\bin\Any CPU\release\net45unmerged\Consul.pdb" "%APPVEYOR_BUILD_FOLDER%\Consul\bin\Any CPU\release\net45\"
del /s /q "%APPVEYOR_BUILD_FOLDER%\Consul\bin\Any CPU\release\net45unmerged"
after_build:
- dotnet pack Consul --configuration %CONFIGURATION% --no-build --version-suffix %LABEL% -o %APPVEYOR_BUILD_FOLDER%\artifacts
- ps: >-
if ($Env:APPVEYOR_REPO_TAG -eq $true) {
dotnet pack Consul --configuration $Env:CONFIGURATION --no-build -o $([System.IO.Path]::Combine($Env:APPVEYOR_BUILD_FOLDER, "artifacts"))
} else {
dotnet pack Consul --configuration $Env:CONFIGURATION --no-build --version-suffix $Env:LABEL -o $([System.IO.Path]::Combine($Env:APPVEYOR_BUILD_FOLDER, "artifacts"))
}
before_test:
- ps: >-
$consulJob = Start-Job {C:\consul\Consul.Test\consul.exe agent -dev -config-file C:\consul\Consul.Test\test_config.json}
Expand Down

0 comments on commit fca67b4

Please sign in to comment.