diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 42a31524..ab688eae 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -261,12 +261,14 @@ jobs:
       $env:VERSION=type sha256sum.txt | where { $_ -match "php-($(phpVersion)\.\d+)-src" } | foreach { $matches[1] }
       Write-Host "Latest PHP $(phpVersion) is ${env:VERSION}" 
       cd $(Build.SourcesDirectory)/buildscripts/
-      python builddrivers.py --PHPVER=${env:VERSION} --ARCH=x64 --THREAD=nts --SOURCE=$(Build.SourcesDirectory)/source --TESTING --NO_RENAME
+      python builddrivers.py --PHPVER=${env:VERSION} --DRIVER=sqlsrv --ARCH=x64 --THREAD=nts --SOURCE=$(Build.SourcesDirectory)/source --TESTING --NO_RENAME
+      dir *sqlsrv*.dll
+      python builddrivers.py --PHPVER=${env:VERSION} --DRIVER=pdo_sqlsrv --ARCH=x64 --THREAD=nts --SOURCE=$(Build.SourcesDirectory)/source --TESTING --NO_RENAME
       cp php-sdk\phpdev\vc15\x64\php-${env:VERSION}-src\run-tests.php $(Build.SourcesDirectory)\test\functional\sqlsrv
       cp php-sdk\phpdev\vc15\x64\php-${env:VERSION}-src\run-tests.php $(Build.SourcesDirectory)\test\functional\pdo_sqlsrv
       dir *sqlsrv*.dll
       cp *sqlsrv*.dll C:\tools\php\ext\
-    displayName: 'Build drivers for the latest version of PHP $(phpVersion)'
+    displayName: 'Build drivers (separately) for the latest version of PHP $(phpVersion)'
   
   - script: |
       echo extension=php_sqlsrv.dll >> C:\tools\php\php.ini
diff --git a/source/sqlsrv/config.w32 b/source/sqlsrv/config.w32
index 5a2477e9..887d1e77 100644
--- a/source/sqlsrv/config.w32
+++ b/source/sqlsrv/config.w32
@@ -27,7 +27,7 @@ if( PHP_SQLSRV != "no" ) {
     if (CHECK_LIB("odbc32.lib", "sqlsrv") && CHECK_LIB("odbccp32.lib", "sqlsrv") && 
         CHECK_LIB("version.lib", "sqlsrv") && CHECK_LIB("psapi.lib", "sqlsrv")&&
         CHECK_HEADER_ADD_INCLUDE( "core_sqlsrv.h", "CFLAGS_SQLSRV", configure_module_dirname + "\\shared")) {
-            if (PHP_PDO_SQLSRV == "no" || PHP_SQLSRV_SHARED) {
+            if (PHP_SQLSRV_SHARED || PHP_PDO_SQLSRV == "no") {
                 ADD_SOURCES( configure_module_dirname + "\\shared", shared_src_class, "sqlsrv" );
             }
             CHECK_HEADER_ADD_INCLUDE("sql.h", "CFLAGS_SQLSRV_ODBC");