Change appveyor yaml

appveyor.yml

@@ -1,17 +1,20 @@
 version: 0.7.2.{build}-{branch}
+pull_requests:
+  do_not_increment_build_number: true
+nuget:
+  disable_publish_on_pr: true
 configuration: Release
 platform: Any CPU
 clone_depth: 1
 clone_folder: C:\consul
-init:
-- if "%APPVEYOR_REPO_TAG%" == "true" set APPVEYOR_BUILD_VERSION=%APPVEYOR_REPO_TAG_NAME%
 assembly_info:
   patch: true
   file: '**\AssemblyInfo.*'
   assembly_version: $(APPVEYOR_BUILD_VERSION)
   assembly_file_version: $(APPVEYOR_BUILD_VERSION)
   assembly_informational_version: $(APPVEYOR_BUILD_VERSION)
 environment:
+  CONSUL_BIN: c:\consul\consul.test\consul.exe
   CONSUL_VERSION: 0.7.2
   CLI_VERSION: Latest
 install:
@@ -30,23 +33,23 @@ cache:
 - C:\ProgramData\chocolatey\bin -> appveyor.yml
 - C:\ProgramData\chocolatey\lib -> appveyor.yml
 - C:\consul_install -> appveyor.yml
-- packages -> **\packages.config
 - '%USERPROFILE%\.nuget\packages -> **\project.json'
-nuget:
-  disable_publish_on_pr: true
+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")
 before_build:
 - dotnet --info
-- dotnet restore
+- appveyor-retry dotnet restore
 build_script:
-- dotnet --verbose build Consul --configuration Release
+- dotnet --verbose build Consul --configuration %CONFIGURATION% --no-dependencies
 - cmd: |-
     move %APPVEYOR_BUILD_FOLDER%\Consul\bin\release\net45 %APPVEYOR_BUILD_FOLDER%\Consul\bin\release\net45unmerged
     cd %APPVEYOR_BUILD_FOLDER%\Consul\bin\release\net45unmerged
     %USERPROFILE%\.nuget\packages\ILRepack\2.0.10\tools\ILRepack.exe /keyfile:%APPVEYOR_BUILD_FOLDER%\assets\consuldotnet.snk /parallel /internalize /out:%APPVEYOR_BUILD_FOLDER%\Consul\bin\release\net45\Consul.dll Consul.dll Newtonsoft.Json.dll
     cd %APPVEYOR_BUILD_FOLDER%
     del /s /q %APPVEYOR_BUILD_FOLDER%\Consul\bin\release\net45unmerged
 after_build:
-- dotnet --verbose pack Consul --configuration Release
+- dotnet --verbose pack Consul --configuration %CONFIGURATION% --no-build --version-suffix %LABEL% -o artifacts
 before_test:
 - ps: >-
     $consulJob = Start-Job {C:\consul\Consul.Test\consul.exe agent -dev -config-file C:\consul\Consul.Test\test_config.json}
@@ -70,7 +73,8 @@ after_test:
 - ps: Get-Job | Stop-Job
 - ps: Get-Job | Receive-Job
 artifacts:
-- path: '**\*.nupkg'
+- path: .\artifacts\**\*.*
+  name: NuGet
 deploy:
 - provider: NuGet
   api_key: