[cpp-msbuild] branch master updated: Rename curl library.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository cpp-msbuild.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-msbuild.git;a=commit;h=b5be481c92c320ca434d6db999a4c2c9d7fc2ebe

The following commit(s) were added to refs/heads/master by this push:
       new  b5be481   Rename curl library.
b5be481 is described below

commit b5be481c92c320ca434d6db999a4c2c9d7fc2ebe
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu May 31 13:20:13 2018 -0400

    Rename curl library.
---
 Versions.props          | 12 ++++++------
 dependencies/config.bat |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Versions.props b/Versions.props
index abf04b1..46fee13 100644
--- a/Versions.props
+++ b/Versions.props
@@ -77,21 +77,21 @@
 
   </PropertyGroup>
 
-  <PropertyGroup Label="CurlGuidsBad" Condition="'$(LIBCURL_FILE_VERSION)' != '7_60'">
+  <PropertyGroup Label="CurlGuidsBad" Condition="'$(LIBCURL_FILE_VERSION)' != '7'">
     <CurlFileVersion>BAD_LIBCURL_FILE_VERSION</CurlFileVersion>
     <!-- Changing LIBCURL_FILE_VERSION version requires changing the GUIDs since it is garnish on the name -->
   </PropertyGroup>
-  <PropertyGroup Label="CurlGuids" Condition="'$(LIBCURL_FILE_VERSION)' == '7_60'">
+  <PropertyGroup Label="CurlGuids" Condition="'$(LIBCURL_FILE_VERSION)' == '7'">
     <CurlVersion Condition="'$(LIBCURL_DIR)'!=''">$(LIBCURL_VERSION)</CurlVersion>
     <CurlVersion Condition="'$(LIBCURL_DIR)'==''">7.60.0</CurlVersion>
     <curl Condition="'$(LIBCURL_DIR)'!=''">$(LIBCURL_DIR)</curl>
     <curl Condition="'$(LIBCURL_DIR)'==''">curl-$(CurlVersion)</curl>
 
     <CurlFileVersion>$(LIBCURL_FILE_VERSION)</CurlFileVersion>
-    <LibCurlGuid32>{CB071587-2CD1-4143-A330-030A09C98C23}</LibCurlGuid32>
-    <LibCurlGuid64>{0C42C9A5-6CFC-41EF-8BA1-2C4222DBA564}</LibCurlGuid64>
-    <LibCurlGuid32d>{F4625619-BC37-4D29-A4EA-B1D6F6B0D0E0}</LibCurlGuid32d>
-    <LibCurlGuid64d>{00417DC2-952F-43C1-9D06-3A70F11E6CB5}</LibCurlGuid64d>
+    <LibCurlGuid32>{85A6D974-DDCC-4FAC-A149-28CF48D4F984}</LibCurlGuid32>
+    <LibCurlGuid64>{2F393A88-3FC7-48C9-81AC-BCA36952EDE7}</LibCurlGuid64>
+    <LibCurlGuid32d>{317A94EF-42BC-4A58-8679-B97CBB271610}</LibCurlGuid32d>
+    <LibCurlGuid64d>{AC569E3D-38F6-4C18-BA90-3E7D8B9AA14A}</LibCurlGuid64d>
   </PropertyGroup>
 
   <PropertyGroup Label="Apache">
diff --git a/dependencies/config.bat b/dependencies/config.bat
index 72baa86..da5eed7 100644
--- a/dependencies/config.bat
+++ b/dependencies/config.bat
@@ -98,7 +98,7 @@ REM CURL_VERSION         is the version
 REM
 Set LIBCURL_VERSION=7.60.0
 set LIBCURL_DIR=curl-%LIBCURL_VERSION%
-set LIBCURL_FILE_VERSION=7_60
+set LIBCURL_FILE_VERSION=7
 
 REM
 REM XML SECURITY CONFIG

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.