From b4be72aedb06727b898236cfab1e27e66b6b51e4 Mon Sep 17 00:00:00 2001 From: vlashch Date: Fri, 7 Dec 2018 11:55:15 -0800 Subject: [PATCH 01/11] ESRP codesign task --- CodeSignESRP.targets | 138 ++++++++++++++++++++++++++++++ build.proj | 4 + tools/RemoveCodeSignArtifacts.ps1 | 32 +++++++ 3 files changed, 174 insertions(+) create mode 100644 CodeSignESRP.targets create mode 100644 tools/RemoveCodeSignArtifacts.ps1 diff --git a/CodeSignESRP.targets b/CodeSignESRP.targets new file mode 100644 index 000000000000..e0e6c5016d5b --- /dev/null +++ b/CodeSignESRP.targets @@ -0,0 +1,138 @@ + + + + + + + + $(CISignRepo) + + + + + + + + + 31bf3856ad364e35 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 31bf3856ad364e35 + + + + + + + + + + + + + + + + + + + diff --git a/build.proj b/build.proj index e53bff01832a..577ca6716492 100644 --- a/build.proj +++ b/build.proj @@ -52,6 +52,7 @@ $(LibrarySourceFolder)\Publish Debug false + false false $(LibraryRoot)signed @@ -124,6 +125,7 @@ + + + diff --git a/tools/RemoveCodeSignArtifacts.ps1 b/tools/RemoveCodeSignArtifacts.ps1 new file mode 100644 index 000000000000..f3e097cc29a1 --- /dev/null +++ b/tools/RemoveCodeSignArtifacts.ps1 @@ -0,0 +1,32 @@ +param( + [Parameter(Position=0)] + [string]$Path +) + +if ($Path -eq $null) { + $Path=$PSScriptRoot +} else { + $Path = Resolve-Path $Path +} + +Write-Output "Under the'$Path' folder" + +"Signed","Unsigned" | ForEach-Object { + Write-Output "'$_' artifacts deletion..." + $foldersToDelete = Get-ChildItem -Path $Path -filter $_ -Directory -Recurse + $itemsQnty = $foldersToDelete.Count + Write-Output "Number of folders found: $itemsQnty" + if ($itemsQnty -gt 0) { + Write-Output "Folders list:" + $foldersToDelete | ForEach-Object { + $_.FullName + } + $foldersToDelete | ForEach-Object { + Remove-Item (Join-Path $_.FullName *.*) -Force + } + $foldersToDelete | ForEach-Object { + Remove-Item $_.FullName -Force + } + Write-Output "Deleted" + } +} \ No newline at end of file From c525b2ff2f180ec119f687e439ffeb527cbdd24d Mon Sep 17 00:00:00 2001 From: vlashch Date: Mon, 17 Dec 2018 13:58:16 -0800 Subject: [PATCH 02/11] Switch to ESRP codesign target --- CodeSignESRP.targets | 16 ++++-- build.proj | 126 ++++--------------------------------------- 2 files changed, 20 insertions(+), 122 deletions(-) diff --git a/CodeSignESRP.targets b/CodeSignESRP.targets index e0e6c5016d5b..c57aec9191ff 100644 --- a/CodeSignESRP.targets +++ b/CodeSignESRP.targets @@ -38,9 +38,9 @@ Condition="'@(DelaySignedAssembliesToSign)' == ''" /> @@ -76,13 +76,14 @@ - + - @@ -91,6 +92,11 @@ + + + $(LibraryToolsFolder)\LocalFeed $(LibrarySourceFolder)\Publish Debug - false false false @@ -122,7 +121,6 @@ false - @@ -270,13 +268,13 @@ - + + Condition="'$(CodeSignESRP)' == 'true'"/> @@ -286,22 +284,22 @@ + Condition="'$(CodeSignESRP)' == 'true'"/> - - - + + + - + @@ -312,119 +310,13 @@ - - - - 31bf3856ad364e35 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 31bf3856ad364e35 - - - - - - - - - - - - - - - - - - From 2879a329e277457b7b7d5f5a05b758bc18beaee8 Mon Sep 17 00:00:00 2001 From: vlashch Date: Tue, 18 Dec 2018 12:04:43 -0800 Subject: [PATCH 03/11] master branch aligned --- CodeSignESRP.targets | 208 +++++++++++++++++-------------------------- 1 file changed, 81 insertions(+), 127 deletions(-) diff --git a/CodeSignESRP.targets b/CodeSignESRP.targets index c57aec9191ff..2073a63e382a 100644 --- a/CodeSignESRP.targets +++ b/CodeSignESRP.targets @@ -10,135 +10,89 @@ - - - - - 31bf3856ad364e35 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - + + + 31bf3856ad364e35 + - + - - - - - - - - - - - - - - - - - - - - 31bf3856ad364e35 - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 31bf3856ad364e35 + + + + + + + + + + + + + + + + + From 60a1e6b7aec164439530a0fe67c240602e1c514e Mon Sep 17 00:00:00 2001 From: vlashch Date: Tue, 18 Dec 2018 13:33:26 -0800 Subject: [PATCH 04/11] Suffix ESRP removed --- CodeSignESRP.targets => CodeSign.targets | 6 +++--- build.proj | 22 +++++++++++----------- 2 files changed, 14 insertions(+), 14 deletions(-) rename CodeSignESRP.targets => CodeSign.targets (95%) diff --git a/CodeSignESRP.targets b/CodeSign.targets similarity index 95% rename from CodeSignESRP.targets rename to CodeSign.targets index 2073a63e382a..f0bd66e87fb5 100644 --- a/CodeSignESRP.targets +++ b/CodeSign.targets @@ -8,9 +8,9 @@ $(CISignRepo) - + - + @@ -69,7 +69,7 @@ - + 31bf3856ad364e35 diff --git a/build.proj b/build.proj index 4cc460a85adb..21abfe03cbc9 100644 --- a/build.proj +++ b/build.proj @@ -16,10 +16,10 @@ /t:Publish Creates local nuget packages and MSI - /p:CodeSignESRP=True + /p:CodeSign=True Code sign binaries, mainly for official release. Default is false. - /p:CodeSignESRP=True;DelaySign=True + /p:CodeSign=True;DelaySign=True Test the code sign workflow locally. /p:Scope @@ -51,7 +51,7 @@ $(LibraryToolsFolder)\LocalFeed $(LibrarySourceFolder)\Publish Debug - false + false false $(LibraryRoot)signed @@ -123,7 +123,7 @@ - + @@ -268,13 +268,13 @@ - + + Condition="'$(CodeSign)' == 'true'"/> @@ -284,22 +284,22 @@ + Condition="'$(CodeSign)' == 'true'"/> - + - + - + @@ -314,7 +314,7 @@ - + From f16444eef7190ed21622a7ee747e7cc8bcb39ae2 Mon Sep 17 00:00:00 2001 From: vlashch Date: Tue, 18 Dec 2018 15:46:23 -0800 Subject: [PATCH 05/11] debug message added --- CodeSign.targets | 1 + 1 file changed, 1 insertion(+) diff --git a/CodeSign.targets b/CodeSign.targets index f0bd66e87fb5..c9f7d0c187b6 100644 --- a/CodeSign.targets +++ b/CodeSign.targets @@ -70,6 +70,7 @@ + 31bf3856ad364e35 From 3a9393efdd20986193907daa4ba3fa376782e8d5 Mon Sep 17 00:00:00 2001 From: markcowl Date: Thu, 20 Dec 2018 10:52:19 -0800 Subject: [PATCH 06/11] Fix signing issues with build --- tools/GenerateHelp.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/GenerateHelp.ps1 b/tools/GenerateHelp.ps1 index 1108c25b3033..87ec05f66cf6 100644 --- a/tools/GenerateHelp.ps1 +++ b/tools/GenerateHelp.ps1 @@ -11,7 +11,7 @@ Param( [string]$FilteredModules ) -$ResourceManagerFolders = Get-ChildItem -Path ".\src\ResourceManager" +$ResourceManagerFolders = Get-ChildItem -Path "$PSScriptRoot\..\src\ResourceManager" Import-Module "$PSScriptRoot\HelpGeneration\HelpGeneration.psm1" $UnfilteredHelpFolders = Get-ChildItem "help" -Recurse -Directory | where { $_.FullName -like "*$BuildConfig*" -and $_.FullName -notlike "*Stack*" } $FilteredHelpFolders = $UnfilteredHelpFolders @@ -40,7 +40,7 @@ if ($ValidateMarkdownHelp) $Exceptions = @() foreach ($ServiceFolder in $ResourceManagerFolders) { - $HelpFolder = Get-ChildItem -Path $ServiceFolder -Filter "help" -Recurse -Directory + $HelpFolder = (Get-ChildItem -Path $ServiceFolder -Filter "help" -Recurse -Directory) if ($HelpFolder -eq $null) { $Exceptions += $ServiceFolder.Name From b55e2e9006c21d584d97ae30036135bc503fb7fa Mon Sep 17 00:00:00 2001 From: markcowl Date: Thu, 20 Dec 2018 11:30:34 -0800 Subject: [PATCH 07/11] Fix problem with directory search for help --- tools/GenerateHelp.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/GenerateHelp.ps1 b/tools/GenerateHelp.ps1 index 87ec05f66cf6..b35202ca1140 100644 --- a/tools/GenerateHelp.ps1 +++ b/tools/GenerateHelp.ps1 @@ -40,7 +40,7 @@ if ($ValidateMarkdownHelp) $Exceptions = @() foreach ($ServiceFolder in $ResourceManagerFolders) { - $HelpFolder = (Get-ChildItem -Path $ServiceFolder -Filter "help" -Recurse -Directory) + $HelpFolder = (Get-ChildItem -Path $ServiceFolder.FullName -Filter "help" -Recurse -Directory) if ($HelpFolder -eq $null) { $Exceptions += $ServiceFolder.Name From f6d64490f1b9024bfe03eef8a14f8a1374318934 Mon Sep 17 00:00:00 2001 From: markcowl Date: Thu, 20 Dec 2018 14:49:07 -0800 Subject: [PATCH 08/11] Add signed installer build --- build.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.proj b/build.proj index b7e83f3dfdc2..8fcdf11c801d 100644 --- a/build.proj +++ b/build.proj @@ -310,7 +310,7 @@ - + From f419116b8c218efdf8d6efc6effee55adff843a7 Mon Sep 17 00:00:00 2001 From: vlashch Date: Thu, 20 Dec 2018 16:18:21 -0800 Subject: [PATCH 09/11] PR comments fix --- CodeSign.targets | 184 +++++++++++++++++++++++------------------------ 1 file changed, 91 insertions(+), 93 deletions(-) diff --git a/CodeSign.targets b/CodeSign.targets index c9f7d0c187b6..9cf31d97a873 100644 --- a/CodeSign.targets +++ b/CodeSign.targets @@ -1,99 +1,97 @@ - + - - - $(CISignRepo) - + + + $(CISignRepo) + - - - - - - - 31bf3856ad364e35 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 31bf3856ad364e35 - - - - - - - - - - - - - - - - - + + + + + + + 31bf3856ad364e35 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 31bf3856ad364e35 + + + + + + + + + + + + + + + + + From 707c14d5d266690b9028080f9f06ed4d7259ea7e Mon Sep 17 00:00:00 2001 From: vlashch Date: Thu, 20 Dec 2018 16:49:13 -0800 Subject: [PATCH 10/11] Right remove command added --- CodeSign.targets | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CodeSign.targets b/CodeSign.targets index 9cf31d97a873..475f01a472b5 100644 --- a/CodeSign.targets +++ b/CodeSign.targets @@ -50,14 +50,16 @@ - + From 143a560e7a48787f7dc3b43a32d4ff2cee480552 Mon Sep 17 00:00:00 2001 From: Mark Cowlishaw Date: Thu, 20 Dec 2018 17:56:07 -0800 Subject: [PATCH 11/11] Delete unneeded script file --- tools/RemoveCodeSignArtifacts.ps1 | 32 ------------------------------- 1 file changed, 32 deletions(-) delete mode 100644 tools/RemoveCodeSignArtifacts.ps1 diff --git a/tools/RemoveCodeSignArtifacts.ps1 b/tools/RemoveCodeSignArtifacts.ps1 deleted file mode 100644 index f3e097cc29a1..000000000000 --- a/tools/RemoveCodeSignArtifacts.ps1 +++ /dev/null @@ -1,32 +0,0 @@ -param( - [Parameter(Position=0)] - [string]$Path -) - -if ($Path -eq $null) { - $Path=$PSScriptRoot -} else { - $Path = Resolve-Path $Path -} - -Write-Output "Under the'$Path' folder" - -"Signed","Unsigned" | ForEach-Object { - Write-Output "'$_' artifacts deletion..." - $foldersToDelete = Get-ChildItem -Path $Path -filter $_ -Directory -Recurse - $itemsQnty = $foldersToDelete.Count - Write-Output "Number of folders found: $itemsQnty" - if ($itemsQnty -gt 0) { - Write-Output "Folders list:" - $foldersToDelete | ForEach-Object { - $_.FullName - } - $foldersToDelete | ForEach-Object { - Remove-Item (Join-Path $_.FullName *.*) -Force - } - $foldersToDelete | ForEach-Object { - Remove-Item $_.FullName -Force - } - Write-Output "Deleted" - } -} \ No newline at end of file