From 53874fe0fc3b5d8cab7e4f8f31ca992fae7cef03 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Tue, 9 Feb 2021 15:24:25 -0800 Subject: [PATCH 1/5] make third party file copy include relative path --- .../releaseBuild/azureDevOps/templates/windows-packaging.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml index 81eac8e5a11..bac4487b858 100644 --- a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml +++ b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml @@ -180,7 +180,9 @@ jobs: $null = New-Item -ItemType Directory -Path $signedFilesDirectory -Force $missingSignatures | ForEach-Object { - Copy-Item -Path $_ -Destination $filesToSignDirectory + $relativePath = $missingSignatures.replace($BuildPath) + $targetDirectory = Join-Path -Path $filesToSignDirectory -ChildPath $relativePath + Copy-Item -Path $_ -Destination $targetDirectory } displayName: Create ThirdParty Signing Folder From bf296cfc326eb80246ea7d8cabc9cd930ee8a2dc Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Tue, 9 Feb 2021 15:55:41 -0800 Subject: [PATCH 2/5] fix replace --- tools/releaseBuild/azureDevOps/templates/windows-packaging.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml index bac4487b858..158e849cb89 100644 --- a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml +++ b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml @@ -180,7 +180,7 @@ jobs: $null = New-Item -ItemType Directory -Path $signedFilesDirectory -Force $missingSignatures | ForEach-Object { - $relativePath = $missingSignatures.replace($BuildPath) + $relativePath = $missingSignatures.replace($BuildPath,'') $targetDirectory = Join-Path -Path $filesToSignDirectory -ChildPath $relativePath Copy-Item -Path $_ -Destination $targetDirectory } From 9805438a88cfe4089d81705d82788d63f1d37d3b Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Tue, 9 Feb 2021 16:17:29 -0800 Subject: [PATCH 3/5] fix instance --- tools/releaseBuild/azureDevOps/templates/windows-packaging.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml index 158e849cb89..0baa45762eb 100644 --- a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml +++ b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml @@ -180,7 +180,7 @@ jobs: $null = New-Item -ItemType Directory -Path $signedFilesDirectory -Force $missingSignatures | ForEach-Object { - $relativePath = $missingSignatures.replace($BuildPath,'') + $relativePath = $_.replace($BuildPath,'') $targetDirectory = Join-Path -Path $filesToSignDirectory -ChildPath $relativePath Copy-Item -Path $_ -Destination $targetDirectory } From ad9868d03053475e655fbe82dec2f85c14a244f0 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Tue, 9 Feb 2021 16:55:55 -0800 Subject: [PATCH 4/5] leave off filename --- tools/releaseBuild/azureDevOps/templates/windows-packaging.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml index 0baa45762eb..4c1e1f89a0f 100644 --- a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml +++ b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml @@ -180,7 +180,8 @@ jobs: $null = New-Item -ItemType Directory -Path $signedFilesDirectory -Force $missingSignatures | ForEach-Object { - $relativePath = $_.replace($BuildPath,'') + $pathWithoutLeaf = Split-Path $_ + $relativePath = $pathWithoutLeaf.replace($BuildPath,'') $targetDirectory = Join-Path -Path $filesToSignDirectory -ChildPath $relativePath Copy-Item -Path $_ -Destination $targetDirectory } From cb2cf24a0f00a1e1a746f0990d423304cf462b28 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Tue, 9 Feb 2021 17:14:04 -0800 Subject: [PATCH 5/5] create target dir --- .../releaseBuild/azureDevOps/templates/windows-packaging.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml index 4c1e1f89a0f..1554afccaba 100644 --- a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml +++ b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml @@ -183,6 +183,10 @@ jobs: $pathWithoutLeaf = Split-Path $_ $relativePath = $pathWithoutLeaf.replace($BuildPath,'') $targetDirectory = Join-Path -Path $filesToSignDirectory -ChildPath $relativePath + if(!(Test-Path $targetDirectory)) + { + $null = New-Item -ItemType Directory -Path $targetDirectory -Force + } Copy-Item -Path $_ -Destination $targetDirectory }