From 29c856de9169725843f497a3379396fecd17ef6d Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 19 Mar 2025 11:04:21 -0700 Subject: [PATCH 01/11] Make signing less custom --- eng/Publishing.props | 25 -------------- eng/Signing.props | 77 ++++++++++++++++---------------------------- 2 files changed, 28 insertions(+), 74 deletions(-) diff --git a/eng/Publishing.props b/eng/Publishing.props index 123a29d63ffd..6eb6251e223c 100644 --- a/eng/Publishing.props +++ b/eng/Publishing.props @@ -30,31 +30,6 @@ - - - <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.jar" UploadPathSegment="jar/" Condition="'$(PublishAllBuildsAssetsInThisJob)' == 'true'" /> - <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.pom" UploadPathSegment="jar/" Condition="'$(PublishAllBuildsAssetsInThisJob)' == 'true'" /> - - <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.tgz" UploadPathSegment="npm/" Condition="'$(PublishAllBuildsAssetsInThisJob)' == 'true'" /> - <_InstallersToPublish Include="$(ArtifactsDir)installers\$(Configuration)\**\*.version" UploadPathSegment="Runtime/" Condition="'$(PublishInstallerBaseVersion)' == 'true'" /> - - - <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.deb" UploadPathSegment="Runtime/" ChecksumPath="%(FullPath).sha512" /> - <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.rpm" UploadPathSegment="Runtime/" ChecksumPath="%(FullPath).sha512" /> - <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.tar.gz" UploadPathSegment="Runtime/" ChecksumPath="%(FullPath).sha512" /> - <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.exe" UploadPathSegment="Runtime/" ChecksumPath="%(FullPath).sha512" /> - <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.msi" UploadPathSegment="Runtime/" ChecksumPath="%(FullPath).sha512" /> - <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.zip" Exclude="$(ArtifactsPackagesDir)**\*.wixpack.zip" UploadPathSegment="Runtime/" ChecksumPath="%(FullPath).sha512" /> - - <_InstallersToPublish Include="$(ArtifactsDir)installers\$(Configuration)\**\*.exe" UploadPathSegment="Runtime/" ChecksumPath="%(FullPath).sha512" /> - <_InstallersToPublish Include="$(ArtifactsDir)installers\$(Configuration)\**\*.msi" UploadPathSegment="Runtime/" ChecksumPath="%(FullPath).sha512" /> - <_InstallersToPublish Include="$(ArtifactsDir)installers\$(Configuration)\**\*.zip" Exclude="$(ArtifactsDir)installers\$(Configuration)\**\*.wixpack.zip" UploadPathSegment="Runtime/" ChecksumPath="%(FullPath).sha512" /> - - - - false - true - diff --git a/eng/Signing.props b/eng/Signing.props index 398ba5709db0..2469b0a80644 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -2,61 +2,12 @@ - - - - - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -121,4 +72,32 @@ + + + + <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.jar" UploadPathSegment="jar/" Condition="'$(PublishAllBuildsAssetsInThisJob)' == 'true'" /> + <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.pom" UploadPathSegment="jar/" Condition="'$(PublishAllBuildsAssetsInThisJob)' == 'true'" /> + + <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.tgz" UploadPathSegment="npm/" Condition="'$(PublishAllBuildsAssetsInThisJob)' == 'true'" /> + <_InstallersToPublish Include="$(ArtifactsDir)installers\$(Configuration)\**\*.version" UploadPathSegment="Runtime/" Condition="'$(PublishInstallerBaseVersion)' == 'true'" /> + + + <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.deb" UploadPathSegment="Runtime/" ChecksumPath="%(FullPath).sha512" /> + <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.rpm" UploadPathSegment="Runtime/" ChecksumPath="%(FullPath).sha512" /> + <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.tar.gz" UploadPathSegment="Runtime/" ChecksumPath="%(FullPath).sha512" /> + <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.exe" UploadPathSegment="Runtime/" ChecksumPath="%(FullPath).sha512" /> + <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.msi" UploadPathSegment="Runtime/" ChecksumPath="%(FullPath).sha512" /> + <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.zip" UploadPathSegment="Runtime/" ChecksumPath="%(FullPath).sha512" /> + + <_InstallersToPublish Include="$(ArtifactsDir)installers\$(Configuration)\**\*.exe" UploadPathSegment="Runtime/" ChecksumPath="%(FullPath).sha512" /> + <_InstallersToPublish Include="$(ArtifactsDir)installers\$(Configuration)\**\*.msi" UploadPathSegment="Runtime/" ChecksumPath="%(FullPath).sha512" /> + <_InstallersToPublish Include="$(ArtifactsDir)installers\$(Configuration)\**\*.zip" UploadPathSegment="Runtime/" ChecksumPath="%(FullPath).sha512" /> + + + + false + true + + + From 77e4875f539326df777f96e22d4ebb81b34092c7 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 19 Mar 2025 11:21:54 -0700 Subject: [PATCH 02/11] Don't upload checksums for wixpacks --- eng/Signing.props | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/eng/Signing.props b/eng/Signing.props index 2469b0a80644..e1dda231e753 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -87,11 +87,13 @@ <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.tar.gz" UploadPathSegment="Runtime/" ChecksumPath="%(FullPath).sha512" /> <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.exe" UploadPathSegment="Runtime/" ChecksumPath="%(FullPath).sha512" /> <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.msi" UploadPathSegment="Runtime/" ChecksumPath="%(FullPath).sha512" /> - <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.zip" UploadPathSegment="Runtime/" ChecksumPath="%(FullPath).sha512" /> + <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.zip" Exclude="$(ArtifactsPackagesDir)**\*.wixpack.zip" UploadPathSegment="Runtime/" ChecksumPath="%(FullPath).sha512" /> + <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.wixpack.zip" UploadPathSegment="Runtime/" /> <_InstallersToPublish Include="$(ArtifactsDir)installers\$(Configuration)\**\*.exe" UploadPathSegment="Runtime/" ChecksumPath="%(FullPath).sha512" /> <_InstallersToPublish Include="$(ArtifactsDir)installers\$(Configuration)\**\*.msi" UploadPathSegment="Runtime/" ChecksumPath="%(FullPath).sha512" /> - <_InstallersToPublish Include="$(ArtifactsDir)installers\$(Configuration)\**\*.zip" UploadPathSegment="Runtime/" ChecksumPath="%(FullPath).sha512" /> + <_InstallersToPublish Include="$(ArtifactsDir)installers\$(Configuration)\**\*.zip" Exclude="$(ArtifactsDir)installers\$(Configuration)\**\*.wixpack.zip" UploadPathSegment="Runtime/" ChecksumPath="%(FullPath).sha512" /> + <_InstallersToPublish Include="$(ArtifactsDir)installers\$(Configuration)\**\*.wixpack.zip" UploadPathSegment="Runtime/" /> From dad093929f3ff24bc89a6d7c5c9de5038498ba4f Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 19 Mar 2025 12:00:44 -0700 Subject: [PATCH 03/11] Fix checksum for wixpacks --- eng/Signing.props | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/eng/Signing.props b/eng/Signing.props index e1dda231e753..8de0d1c0d325 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -87,13 +87,15 @@ <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.tar.gz" UploadPathSegment="Runtime/" ChecksumPath="%(FullPath).sha512" /> <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.exe" UploadPathSegment="Runtime/" ChecksumPath="%(FullPath).sha512" /> <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.msi" UploadPathSegment="Runtime/" ChecksumPath="%(FullPath).sha512" /> - <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.zip" Exclude="$(ArtifactsPackagesDir)**\*.wixpack.zip" UploadPathSegment="Runtime/" ChecksumPath="%(FullPath).sha512" /> - <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.wixpack.zip" UploadPathSegment="Runtime/" /> + <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.zip" Exclude="$(ArtifactsPackagesDir)**\*.wixpack.zip" UploadPathSegment="Runtime/" > + %(FullPath).sha512" + <_InstallersToPublish Include="$(ArtifactsDir)installers\$(Configuration)\**\*.exe" UploadPathSegment="Runtime/" ChecksumPath="%(FullPath).sha512" /> <_InstallersToPublish Include="$(ArtifactsDir)installers\$(Configuration)\**\*.msi" UploadPathSegment="Runtime/" ChecksumPath="%(FullPath).sha512" /> - <_InstallersToPublish Include="$(ArtifactsDir)installers\$(Configuration)\**\*.zip" Exclude="$(ArtifactsDir)installers\$(Configuration)\**\*.wixpack.zip" UploadPathSegment="Runtime/" ChecksumPath="%(FullPath).sha512" /> - <_InstallersToPublish Include="$(ArtifactsDir)installers\$(Configuration)\**\*.wixpack.zip" UploadPathSegment="Runtime/" /> + <_InstallersToPublish Include="$(ArtifactsDir)installers\$(Configuration)\**\*.zip" Exclude="$(ArtifactsDir)installers\$(Configuration)\**\*.wixpack.zip" UploadPathSegment="Runtime/" > + %(FullPath).sha512" + From a708951817773cbbf9f93fac6205292a2ea9cbcb Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 19 Mar 2025 12:01:47 -0700 Subject: [PATCH 04/11] Add more checksums --- eng/Signing.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Signing.props b/eng/Signing.props index 8de0d1c0d325..00d72f17b139 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -75,10 +75,10 @@ - <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.jar" UploadPathSegment="jar/" Condition="'$(PublishAllBuildsAssetsInThisJob)' == 'true'" /> - <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.pom" UploadPathSegment="jar/" Condition="'$(PublishAllBuildsAssetsInThisJob)' == 'true'" /> + <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.jar" UploadPathSegment="jar/" ChecksumPath="%(FullPath).sha512" Condition="'$(PublishAllBuildsAssetsInThisJob)' == 'true'" /> + <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.pom" UploadPathSegment="jar/" ChecksumPath="%(FullPath).sha512" Condition="'$(PublishAllBuildsAssetsInThisJob)' == 'true'" /> - <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.tgz" UploadPathSegment="npm/" Condition="'$(PublishAllBuildsAssetsInThisJob)' == 'true'" /> + <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.tgz" UploadPathSegment="npm/" ChecksumPath="%(FullPath).sha512" Condition="'$(PublishAllBuildsAssetsInThisJob)' == 'true'" /> <_InstallersToPublish Include="$(ArtifactsDir)installers\$(Configuration)\**\*.version" UploadPathSegment="Runtime/" Condition="'$(PublishInstallerBaseVersion)' == 'true'" /> From 0920c4b57c854fea69891384611ef145131f6503 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 19 Mar 2025 12:43:21 -0700 Subject: [PATCH 05/11] Add more checksums --- eng/Signing.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Signing.props b/eng/Signing.props index 00d72f17b139..ad933527a0a5 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -24,10 +24,10 @@ - + - - + + From d197f170e87907006d1b8d868a811347ff93ee09 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 19 Mar 2025 13:14:14 -0700 Subject: [PATCH 06/11] Update eng/Signing.props Co-authored-by: Viktor Hofer --- eng/Signing.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Signing.props b/eng/Signing.props index ad933527a0a5..56f7d675db44 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -87,7 +87,7 @@ <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.tar.gz" UploadPathSegment="Runtime/" ChecksumPath="%(FullPath).sha512" /> <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.exe" UploadPathSegment="Runtime/" ChecksumPath="%(FullPath).sha512" /> <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.msi" UploadPathSegment="Runtime/" ChecksumPath="%(FullPath).sha512" /> - <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.zip" Exclude="$(ArtifactsPackagesDir)**\*.wixpack.zip" UploadPathSegment="Runtime/" > + <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.zip" UploadPathSegment="Runtime/" > %(FullPath).sha512" From 5a92d4c5781c1e77ce66e9bed624421a4beb0f07 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 19 Mar 2025 13:14:43 -0700 Subject: [PATCH 07/11] Update eng/Signing.props --- eng/Signing.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Signing.props b/eng/Signing.props index 56f7d675db44..85c67a748a90 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -93,7 +93,7 @@ <_InstallersToPublish Include="$(ArtifactsDir)installers\$(Configuration)\**\*.exe" UploadPathSegment="Runtime/" ChecksumPath="%(FullPath).sha512" /> <_InstallersToPublish Include="$(ArtifactsDir)installers\$(Configuration)\**\*.msi" UploadPathSegment="Runtime/" ChecksumPath="%(FullPath).sha512" /> - <_InstallersToPublish Include="$(ArtifactsDir)installers\$(Configuration)\**\*.zip" Exclude="$(ArtifactsDir)installers\$(Configuration)\**\*.wixpack.zip" UploadPathSegment="Runtime/" > + <_InstallersToPublish Include="$(ArtifactsDir)installers\$(Configuration)\**\*.zip" UploadPathSegment="Runtime/" > %(FullPath).sha512" From bb42b4740ed713df59c62eeb01e778688793ed09 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 19 Mar 2025 14:12:58 -0700 Subject: [PATCH 08/11] Update eng/Signing.props --- eng/Signing.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Signing.props b/eng/Signing.props index 85c67a748a90..779d2659992c 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -94,7 +94,7 @@ <_InstallersToPublish Include="$(ArtifactsDir)installers\$(Configuration)\**\*.exe" UploadPathSegment="Runtime/" ChecksumPath="%(FullPath).sha512" /> <_InstallersToPublish Include="$(ArtifactsDir)installers\$(Configuration)\**\*.msi" UploadPathSegment="Runtime/" ChecksumPath="%(FullPath).sha512" /> <_InstallersToPublish Include="$(ArtifactsDir)installers\$(Configuration)\**\*.zip" UploadPathSegment="Runtime/" > - %(FullPath).sha512" + %(FullPath).sha512 From 0a299fe6bd321dccb5cd92e27b053836c3e76bde Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 19 Mar 2025 14:13:19 -0700 Subject: [PATCH 09/11] Update eng/Signing.props --- eng/Signing.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Signing.props b/eng/Signing.props index 779d2659992c..529b8312b8d0 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -88,7 +88,7 @@ <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.exe" UploadPathSegment="Runtime/" ChecksumPath="%(FullPath).sha512" /> <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.msi" UploadPathSegment="Runtime/" ChecksumPath="%(FullPath).sha512" /> <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.zip" UploadPathSegment="Runtime/" > - %(FullPath).sha512" + %(FullPath).sha512 <_InstallersToPublish Include="$(ArtifactsDir)installers\$(Configuration)\**\*.exe" UploadPathSegment="Runtime/" ChecksumPath="%(FullPath).sha512" /> From 12844f9ec71ec017332b0db0cfa2e97bc27a226a Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 19 Mar 2025 14:56:23 -0700 Subject: [PATCH 10/11] Sign .js files --- eng/Signing.props | 2 -- 1 file changed, 2 deletions(-) diff --git a/eng/Signing.props b/eng/Signing.props index 529b8312b8d0..9b981c9c8abc 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -23,8 +23,6 @@ - - From a364d274c9061d8a9c1f4432726c6e28f83f374a Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 19 Mar 2025 15:08:14 -0700 Subject: [PATCH 11/11] Set sign info for .msi's --- eng/Signing.props | 3 +++ 1 file changed, 3 insertions(+) diff --git a/eng/Signing.props b/eng/Signing.props index 9b981c9c8abc..5d4786646198 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -8,6 +8,9 @@ + + +