[cpp-msbuild] 01/01: SSPCPP-976 Drop Win32/x86 out of process builds

[Rod Widdowson]

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

rdw pushed a commit to branch dev/SSPCPP-976
in repository cpp-msbuild.

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

commit 52f50ea1cbdb2031a37bc8f2604e0c66dd2dd1a6
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Jun 14 16:46:48 2023 +0100

    SSPCPP-976 Drop Win32/x86 out of process builds
    
    https://shibboleth.atlassian.net/browse/SSPCPP-976
    
    Stage 4, (Work in progress) Remove the Component GUIDS
    we no longer need.
---
 Versions.props               | 20 ++++----------------
 dependencies/dependency.make |  2 ++
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/Versions.props b/Versions.props
index ef21a8c..21b12c9 100644
--- a/Versions.props
+++ b/Versions.props
@@ -47,10 +47,8 @@
 
     <XmlToolingVersion>3.2.4</XmlToolingVersion>
     <XmlToolingFileVersion>3_2</XmlToolingFileVersion>
-    <!-- Change the 8 components below iff the XmlToolingFileVersion name changes -->
-    <XMLToolingComponent32>{A7D6E8D5-34DA-477A-A5C6-B887FE960C86}</XMLToolingComponent32>
+    <!-- Change the 6 components below iff the XmlToolingFileVersion name changes -->
     <XMLToolingLiteComponent32>{BFD0C0CC-AC83-4780-B32E-54D6E02AAADA}</XMLToolingLiteComponent32>
-    <XMLToolingComponent32d>{4AB60FC3-3637-47D7-8ED5-BEE47636A917}</XMLToolingComponent32d>
     <XMLToolingLiteComponent32d>{FECAF47E-D39B-4395-B61E-37E37AA30D24}</XMLToolingLiteComponent32d>
     <XMLToolingComponent64>{7284C104-8319-43F5-9F25-3D65D6E577B4}</XMLToolingComponent64>
     <XMLToolingLiteComponent64>{0850D30D-3892-4C86-9BCC-5BA66E89F53C}</XMLToolingLiteComponent64>
@@ -60,10 +58,8 @@
 
     <ShibbolethDllVersion>3.4.1</ShibbolethDllVersion>
     <ShibbolethDllFileVersion>3_4</ShibbolethDllFileVersion>
-    <!-- Change the 8 components below iff ShibbolethDllFileVersion changes -->
-    <ShibDll32Component>{5DA8E2FF-F46B-4490-8285-D64A7AB4F9FE}</ShibDll32Component>
+    <!-- Change the 6 components below iff ShibbolethDllFileVersion changes -->
     <ShibDllLite32Component>{C05F6E4B-27E0-46D4-9C12-03F4E4196575}</ShibDllLite32Component>
-    <ShibDll32Componentd>{B8045330-FD7E-49BB-BCDE-4AAFDDFD7CF9}</ShibDll32Componentd>
     <ShibDllLite32Componentd>{8FCE3E6C-96DB-44E3-9EA1-E76565756A07}</ShibDllLite32Componentd>
     <ShibDll64Component>{90D22F2C-D4F0-48A3-99DC-C2EE939CD82B}</ShibDll64Component>
     <ShibDllLite64Component>{B6D57AA0-CA3C-4E27-B3F9-62088C009179}</ShibDllLite64Component>
@@ -94,9 +90,7 @@
     <curl Condition="'$(LIBCURL_DIR)'==''">curl-$(CurlVersion)</curl>
 
     <CurlFileVersion>$(LIBCURL_FILE_VERSION)</CurlFileVersion>
-    <LibCurlGuid32>{C3D5436B-E6CB-4172-BEBC-020B805F521F}</LibCurlGuid32>
     <LibCurlGuid64>{2525AEC6-A28F-4057-86F8-2B8115E1817C}</LibCurlGuid64>
-    <LibCurlGuid32d>{FDE9f143-1440-4D00-80E8-8676038B1A77}</LibCurlGuid32d>
     <LibCurlGuid64d>{18AB50FE-2522-42CF-B4EA-A9E11C7BC670}</LibCurlGuid64d>
   </PropertyGroup>
 
@@ -125,11 +119,7 @@
   </PropertyGroup>
   <PropertyGroup Label="OpenSSLGuids" Condition="'$(OPENSSL_FILE_VERSION)' == '3_0_9'">
     <OpenSSLFileVersion>$(OPENSSL_FILE_VERSION)</OpenSSLFileVersion>
-    <!-- Change the 8 components below iff OpenSSLFileVersion changes -->
-    <LibEay32Component>{169757BD-7382-4153-879E-04113526FFEB}</LibEay32Component>
-    <SSlEay32Component>{F85783DE-F930-4637-A1BD-ACCB6EA5B67D}</SSlEay32Component>
-    <LibEay32Componentd>{D755CE41-7232-4050-A15A-384BA9DBC936}</LibEay32Componentd>
-    <SSlEay32Componentd>{21A51CF7-09CF-4DCA-9DC8-F383B1C3EBD3}</SSlEay32Componentd>
+    <!-- Change the 4 components below iff OpenSSLFileVersion changes -->
     <LibEay64Component>{123E19FA-D393-4A09-8AF6-2699017F6F00}</LibEay64Component>
     <SSlEay64Component>{D456407C-C9E6-4B90-B1A3-D5F4C9F2E2CE}</SSlEay64Component>
     <LibEay64Componentd>{9040D982-1CB9-4587-86AD-8286C3639548}</LibEay64Componentd>
@@ -153,9 +143,7 @@
   <PropertyGroup Label="XSecGuids" Condition="'$(XSEC_FILE_VERSION)' == '2_0'">
     <XmlSecFileVersion>$(XSEC_FILE_VERSION)</XmlSecFileVersion>
 
-    <!-- Change the 4 components below iff XmlSecFileVersion changes -->
-    <XmlSec32Component>{2B72E5CE-8E02-4AE6-AD0B-6AFDC4CFB49E}</XmlSec32Component>
-    <XmlSec32Componentd>{05507D35-7B52-414B-8162-869C608A5AA9}</XmlSec32Componentd>
+    <!-- Change the 2 components below iff XmlSecFileVersion changes -->
     <XmlSec64Component>{47FED010-3C5F-4940-A355-BDF8B621EBAD}</XmlSec64Component>
     <XmlSec64Componentd>{4C52E1DA-F04E-4479-9D8E-B4F97AF63805}</XmlSec64Componentd>
   </PropertyGroup>
diff --git a/dependencies/dependency.make b/dependencies/dependency.make
index ce7033b..0ab0999 100644
--- a/dependencies/dependency.make
+++ b/dependencies/dependency.make
@@ -7,6 +7,7 @@
 ##
 !if "$(VSCMD_ARG_TGT_ARCH)" == "x86"
 !message Building x86
+ALL_TARGETS=openssl zlib log4shib xerces curl xsec
 OpenSSLName=WIN32
 ZlibTargetDir=.
 MsBuildArch=Win32
@@ -17,6 +18,7 @@ OpenSSLNameGarnish=
 XercesInstallDir=Install32\VC15
 !elseif "$(VSCMD_ARG_TGT_ARCH)" == "x64"
 !message Building x64
+ALL_TARGETS=openssl zlib log4shib xerces curl xsec
 OpenSSLName=WIN64A
 ZlibTargetDir=x64
 CMakeArch=Visual Studio 15 2017 Win64

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