Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Renaming cache folder is not a solution, too. Disable cache for now.
  Revert "Rename build cache folder and separate sdk"

diff --cc .appveyor.yml
index a8655de5bb7bdcbb9eb7e0fd6dd92c206cc0946f,be60c2f83a5a0ed24b53cae964013bea10d571f0..cfa751b68ab3b4ed388cf6b419f6d45ceac2852a
--- 1/.appveyor.yml
--- 2/.appveyor.yml
+++ b/.appveyor.yml
@@@ -16,16 -16,15 +16,16 @@@ skip_commits
  
  clone_depth: 64
  
- cache:
-         - c:\build-cache2
-         - c:\build-cache2-sdk -> .appveyor.yml
+ #cache:
+ #        - c:\build-cache
+ #        - c:\build-cache\sdk -> .appveyor.yml
  
  environment:
-         PHP_BUILD_CACHE_BASE_DIR: c:\build-cache2
+         PHP_BUILD_CACHE_BASE_DIR: c:\build-cache  
          PHP_BUILD_OBJ_DIR: c:\obj
-         PHP_BUILD_CACHE_SDK_DIR: c:\build-cache2-sdk
+         PHP_BUILD_CACHE_SDK_DIR: c:\build-cache\sdk
          PHP_BUILD_SDK_BRANCH: php-sdk-2.0.12beta3
 +        PHP_BUILD_CRT: vc15
          # ext and env setup for tests
          #MYSQL_TEST_PASSWD: Password12!
          #MYSQL_TEST_USER: root