From edaad36ceb87739b44cc8e6bb3df98785cc6a7b8 Mon Sep 17 00:00:00 2001
From: Luis Diaz Mas <piponazo@gmail.com>
Date: Thu, 2 Apr 2020 13:11:38 +0200
Subject: [PATCH] Update conan version in appveyor & use python-x64 version

- Use latest libcurl version (trying to solve problem with OpenSSL on windows builds)
- Delete appveyor build with Visual Studio Generator: problematic with OpenSSL conan recipe
---
 appveyor.yml | 17 ++++++-----------
 conanfile.py |  2 +-
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index edddd581..da25fbb5 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,5 +1,8 @@
+init:
+  - echo %PYTHON%
+
 environment:
-  PYTHON: "C:\\Python37"
+  PYTHON: "C:/Python37-x64"
     
   matrix:
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
@@ -18,14 +21,6 @@ environment:
       ARCHITECTURE: x86_64
       UNIT_TESTS: 1
       WARNINGS_AS_ERRORS: ON
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-      CMAKE_GENERATOR: Visual Studio 10 2010
-      INTEGRATION_TESTS: 0
-      VS_COMPILER_VERSION: 10
-      VCVARS: C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat
-      ARCHITECTURE: x86
-      UNIT_TESTS: 0
-      WARNINGS_AS_ERRORS: OFF
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
       CMAKE_GENERATOR: Ninja
       INTEGRATION_TESTS: 0
@@ -54,7 +49,7 @@ install:
     - 7z x ninja.zip -oC:\projects\deps\ninja > nul
     - set PATH=C:\projects\deps\ninja;%PATH%
     - ninja --version
-    - pip.exe install conan==1.17.2
+    - pip.exe install conan==1.24.0
     - cd %APPVEYOR_BUILD_FOLDER%
 
 before_build:
@@ -80,4 +75,4 @@ build_script:
     - cmd: if %UNIT_TESTS% == 1 unit_tests.exe
     - cmd: cd ../../tests/
     - cmd: set EXIV2_EXT=.exe
-    - cmd: if %INTEGRATION_TESTS% == 1 c:\Python36\python.exe runner.py -v
+    - cmd: if %INTEGRATION_TESTS% == 1 %PYTHON%/python.exe runner.py -v
diff --git a/conanfile.py b/conanfile.py
index 1bd8f95b..d161e655 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -39,7 +39,7 @@ class Exiv2Conan(ConanFile):
             # could use any of the versions.Also note that the issue was not with libcurl but with
             # libopenssl (a transitive dependency)
             if os_info.is_windows:
-                self.requires('libcurl/7.61.1@bincrafters/stable')
+                self.requires('libcurl/7.69.1')
             else:
                 self.requires('libcurl/7.64.1@bincrafters/stable')