Fix errors in ESRP signing scripts (#38)

* Update windows ESRP signing script
* Update mac ESRP signing scripts

Author: melindajohnson

bin/mac_esrp_signing/dll_signing.py

@@ -14,14 +14,14 @@
 TENANT_ID = os.environ['TENANT_ID']
 KEY_CODE = os.environ['KEY_CODE']
 
-esrp_tool = os.path.join("esrp", "tools", "EsrpClient.exe")
+esrp_tool = os.environ['ESRP_CLIENT']
 SOURCE = WORKSPACE / "osx-x64"
 DESTINATION = WORKSPACE
 
 files = []
 extensions = [".dll"]
 for path in Path(SOURCE).iterdir():
-    if path.suffix in extensions and path.is_file():
+     if (path.name == "azureauth" or path.suffix in extensions) and path.is_file():
         files.append(path)
 
 #empty list check
@@ -55,9 +55,9 @@
 	"SignBatches": [
 		{
 			"SourceLocationType": "UNC",
-			"SourceRootDirectory": SOURCE,
+			"SourceRootDirectory": str(SOURCE),
 			"DestinationLocationType": "UNC",
-			"DestinationRootDirectory": DESTINATION,
+			"DestinationRootDirectory": str(DESTINATION),
 			"SignRequestFiles": [
 				{
 					"CustomerCorrelationId": "01A7F55F-6CDD-4123-B255-77E6F212CDAD", 

bin/mac_esrp_signing/dylibs_signing.py

@@ -15,17 +15,17 @@
 TENANT_ID = os.environ['TENANT_ID']
 KEY_CODE = os.environ['KEY_CODE']
 
-esrp_tool = os.path.join("esrp", "tools", "EsrpClient.exe")
+esrp_tool = os.environ['ESRP_CLIENT']
 SOURCE =  WORKSPACE / "osx-x64"
 DESTINATION = WORKSPACE / "Mac_signed"
 
 zip_file = SOURCE / "mac_dylibs.zip"
-extensions = [".dylib",".a",".Cli"]
+extensions = [".dylib"]
 
  # zipping the files
 with zipfile.ZipFile(zip_file, 'w', zipfile.ZIP_DEFLATED) as zip_obj:
     for path in Path(SOURCE).iterdir():
-        if path.suffix in extensions and path.is_file():
+        if (path.name == "azureauth" or path.suffix in extensions) and path.is_file():
             zip_obj.write(path, path.relative_to(SOURCE))
 
 if not zip_file.exists(): 
@@ -56,9 +56,9 @@
 	"SignBatches": [
 		{
 			"SourceLocationType": "UNC",
-			"SourceRootDirectory": SOURCE,
+			"SourceRootDirectory": str(SOURCE),
 			"DestinationLocationType": "UNC",
-			"DestinationRootDirectory": DESTINATION,
+			"DestinationRootDirectory": str(DESTINATION),
 			"SignRequestFiles": [
 				{
 					"CustomerCorrelationId": "01A7F55F-6CDD-4123-B255-77E6F212CDAD", 

bin/run_esrp_signing.py

@@ -14,7 +14,7 @@
 TENANT_ID = os.environ['TENANT_ID']
 KEY_CODE = os.environ['KEY_CODE']
 
-esrp_tool = os.path.join("esrp", "tools", "EsrpClient.exe")
+esrp_tool = os.environ['ESRP_CLIENT']
 SOURCE = WORKSPACE / "win10-x64"
 DESTINATION = WORKSPACE
 
@@ -54,9 +54,9 @@
 	"SignBatches": [
 		{
 			"SourceLocationType": "UNC",
-			"SourceRootDirectory": SOURCE,
+			"SourceRootDirectory": str(SOURCE),
 			"DestinationLocationType": "UNC",
-			"DestinationRootDirectory": DESTINATION,
+			"DestinationRootDirectory": str(DESTINATION),
 			"SignRequestFiles": [
 				{
 					"CustomerCorrelationId": "01A7F55F-6CDD-4123-B255-77E6F212CDAD",