From 767de144512f179acbb0241cfeb330a2abceda95 Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Tue, 11 Feb 2025 09:26:24 -0800 Subject: [PATCH 01/16] Sign on Mac --- .vsts-ci.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 61432b7e..872fe8e4 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -45,6 +45,7 @@ extends: - template: /eng/common/templates-official/jobs/jobs.yml@self parameters: enableMicrobuild: true + enableMicrobuildForMacAndLinux: true enablePublishUsingPipelines: true enablePublishBuildArtifacts: true enablePublishTestResults: false @@ -130,12 +131,12 @@ extends: ARM64: _RID: osx-arm64 _BuildConfig: Release - _SignType: none + _SignType: real _DotNetPublishToBlobFeed: false X64: _RID: osx-x64 _BuildConfig: Release - _SignType: none + _SignType: real _DotNetPublishToBlobFeed: false steps: - checkout: self @@ -144,6 +145,11 @@ extends: --configuration $(_BuildConfig) --prepareMachine /p:RID=$(_RID) + /p:DotNetSignType=$(_SignType) + /p:SignCoreDotnetCoreUninstall=true + /p:TeamName=$(_TeamName) + /p:OfficialBuildId=$(BUILD.BUILDNUMBER) + /p:DotNetPublishUsingPipelines=true displayName: Build - task: ArchiveFiles@2 condition: and(eq(variables['system.pullrequest.isfork'], false), eq(variables['_BuildConfig'], 'Release')) From ced870cb59199d6bf79d78e9be66a8317b5cfb20 Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Tue, 11 Feb 2025 09:28:11 -0800 Subject: [PATCH 02/16] Fix typo on ArtifactName --- .vsts-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 872fe8e4..2cb02a2f 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -117,7 +117,7 @@ extends: condition: and(eq(variables['system.pullrequest.isfork'], false), eq(variables['_BuildConfig'], 'Release')) inputs: PathtoPublish: '$(Build.ArtifactStagingDirectory)' - artifactName: 'drop-windows' + ArtifactName: 'drop-windows' publishLocation: 'Container' parallel: true - job: OSX_latest @@ -164,7 +164,7 @@ extends: condition: and(eq(variables['system.pullrequest.isfork'], false), eq(variables['_BuildConfig'], 'Release')) inputs: PathtoPublish: '$(Build.ArtifactStagingDirectory)' - artifactName: 'drop-$(_RID)' + ArtifactName: 'drop-$(_RID)' publishLocation: 'Container' parallel: true From defa237ddae5f2199a86254620e83fd653f363af Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Tue, 11 Feb 2025 09:35:30 -0800 Subject: [PATCH 03/16] Add TeamName variable --- .vsts-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 2cb02a2f..ed378892 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -1,5 +1,5 @@ variables: -- name: _TeamName +- name: TeamName value: DotNetCore - template: /eng/common/templates-official/variables/pool-providers.yml@self @@ -91,7 +91,7 @@ extends: - name: _OfficialBuildArgs value: /p:DotNetSignType=$(_SignType) /p:SignCoreDotnetCoreUninstall=true - /p:TeamName=$(_TeamName) + /p:TeamName=$(TeamName) /p:OfficialBuildId=$(BUILD.BUILDNUMBER) /p:DotNetPublishUsingPipelines=true # else @@ -147,7 +147,7 @@ extends: /p:RID=$(_RID) /p:DotNetSignType=$(_SignType) /p:SignCoreDotnetCoreUninstall=true - /p:TeamName=$(_TeamName) + /p:TeamName=$(TeamName) /p:OfficialBuildId=$(BUILD.BUILDNUMBER) /p:DotNetPublishUsingPipelines=true displayName: Build From cf78f91b656ede7f39ce51c4e3f44e36ef8c9683 Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Tue, 11 Feb 2025 10:08:12 -0800 Subject: [PATCH 04/16] Add certificatename to binary --- eng/Signing.props | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/Signing.props b/eng/Signing.props index 5f91c439..3b6407a9 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -5,6 +5,7 @@ + From e80810ba39f64cc626f66f4f766dc08add047c6d Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Tue, 11 Feb 2025 10:24:05 -0800 Subject: [PATCH 05/16] Update binary path --- .vsts-ci.yml | 12 ++++++------ eng/Signing.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index ed378892..ba640aad 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -144,12 +144,12 @@ extends: - script: eng/common/cibuild.sh --configuration $(_BuildConfig) --prepareMachine - /p:RID=$(_RID) - /p:DotNetSignType=$(_SignType) - /p:SignCoreDotnetCoreUninstall=true - /p:TeamName=$(TeamName) - /p:OfficialBuildId=$(BUILD.BUILDNUMBER) - /p:DotNetPublishUsingPipelines=true + -p:RID=$(_RID) + -p:DotNetSignType=$(_SignType) + -p:SignCoreDotnetCoreUninstall=true + -p:TeamName=$(TeamName) + -p:OfficialBuildId=$(BUILD.BUILDNUMBER) + -p:DotNetPublishUsingPipelines=true displayName: Build - task: ArchiveFiles@2 condition: and(eq(variables['system.pullrequest.isfork'], false), eq(variables['_BuildConfig'], 'Release')) diff --git a/eng/Signing.props b/eng/Signing.props index 3b6407a9..9d9787c3 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -5,7 +5,7 @@ - + @@ -16,6 +16,6 @@ - + From 359b843781549fe53b788102e8fa8b20c2b054e0 Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Tue, 11 Feb 2025 10:37:24 -0800 Subject: [PATCH 06/16] Update build command to include signing --- .vsts-ci.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index ba640aad..72a261ff 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -145,11 +145,7 @@ extends: --configuration $(_BuildConfig) --prepareMachine -p:RID=$(_RID) - -p:DotNetSignType=$(_SignType) - -p:SignCoreDotnetCoreUninstall=true - -p:TeamName=$(TeamName) - -p:OfficialBuildId=$(BUILD.BUILDNUMBER) - -p:DotNetPublishUsingPipelines=true + --sign /p:DotNetSignType=real /p:TeamName=$(_TeamName) /p:OfficialBuildId=$(Build.BuildNumber) displayName: Build - task: ArchiveFiles@2 condition: and(eq(variables['system.pullrequest.isfork'], false), eq(variables['_BuildConfig'], 'Release')) From 940ce158e03c348e0527143c4bfd9c78dc8c8e2d Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Tue, 11 Feb 2025 10:48:10 -0800 Subject: [PATCH 07/16] Typos --- .vsts-ci.yml | 2 +- eng/Signing.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 72a261ff..a74ea88d 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -145,7 +145,7 @@ extends: --configuration $(_BuildConfig) --prepareMachine -p:RID=$(_RID) - --sign /p:DotNetSignType=real /p:TeamName=$(_TeamName) /p:OfficialBuildId=$(Build.BuildNumber) + --sign /p:DotNetSignType=real /p:TeamName=$(TeamName) /p:OfficialBuildId=$(Build.BuildNumber) displayName: Build - task: ArchiveFiles@2 condition: and(eq(variables['system.pullrequest.isfork'], false), eq(variables['_BuildConfig'], 'Release')) diff --git a/eng/Signing.props b/eng/Signing.props index 9d9787c3..8d974859 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -5,7 +5,7 @@ - + From cfc0f5e93d20e5114788f6e9b86c523290bcccc3 Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Tue, 11 Feb 2025 15:40:52 -0800 Subject: [PATCH 08/16] Globb files to sign --- eng/Signing.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Signing.props b/eng/Signing.props index 8d974859..03124324 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -16,6 +16,6 @@ - + From 2e21bb2a87a6a7558b21b688eb4808fed46da050 Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Tue, 11 Feb 2025 16:00:26 -0800 Subject: [PATCH 09/16] Add proper certificate --- eng/Signing.props | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/eng/Signing.props b/eng/Signing.props index 03124324..565bbc7c 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -5,7 +5,6 @@ - @@ -16,6 +15,10 @@ - + + MacDeveloperHarden + None + true + From 92ae0136b76886103020ce31c7e31d9f26267993 Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Tue, 11 Feb 2025 16:26:44 -0800 Subject: [PATCH 10/16] Add proper certificate --- eng/Signing.props | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/eng/Signing.props b/eng/Signing.props index 565bbc7c..a8b62dd9 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -16,8 +16,7 @@ - MacDeveloperHarden - None + MacDeveloper true From 48ef80d711078eb680688feb6fa351b147cca030 Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Thu, 13 Feb 2025 13:11:01 -0800 Subject: [PATCH 11/16] MacDeveloperHarden --- eng/Signing.props | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/eng/Signing.props b/eng/Signing.props index a8b62dd9..da1d5638 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -15,9 +15,6 @@ - - MacDeveloper - true - + From 6944bef5f356b664d691504810ef216b64e70557 Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Thu, 13 Feb 2025 13:47:16 -0800 Subject: [PATCH 12/16] Add files separately --- eng/Signing.props | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/Signing.props b/eng/Signing.props index da1d5638..6f2935a3 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -15,6 +15,7 @@ - + + From 62d241db2d8d8204ae5c25c73fa265c4a0c0bb92 Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Thu, 13 Feb 2025 14:01:25 -0800 Subject: [PATCH 13/16] Change flags --- .vsts-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index a74ea88d..13ef0454 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -145,7 +145,7 @@ extends: --configuration $(_BuildConfig) --prepareMachine -p:RID=$(_RID) - --sign /p:DotNetSignType=real /p:TeamName=$(TeamName) /p:OfficialBuildId=$(Build.BuildNumber) + --sign -p:DotNetSignType=real -p:TeamName=$(TeamName) -p:OfficialBuildId=$(Build.BuildNumber) displayName: Build - task: ArchiveFiles@2 condition: and(eq(variables['system.pullrequest.isfork'], false), eq(variables['_BuildConfig'], 'Release')) From cc6c9467628fe2882f6f71dae46d24d36a388838 Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Tue, 18 Feb 2025 09:03:59 -0800 Subject: [PATCH 14/16] Update certificate name --- eng/Signing.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Signing.props b/eng/Signing.props index 6f2935a3..7d4bf667 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -15,7 +15,7 @@ - - + + From 8c1d5f1fa30d556942d07da71c6fbabb06c2031d Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Tue, 18 Feb 2025 09:27:11 -0800 Subject: [PATCH 15/16] Update build parameters --- .vsts-ci.yml | 4 ++-- eng/Signing.props | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 13ef0454..08294b2a 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -142,10 +142,10 @@ extends: - checkout: self clean: true - script: eng/common/cibuild.sh + -sign --configuration $(_BuildConfig) --prepareMachine - -p:RID=$(_RID) - --sign -p:DotNetSignType=real -p:TeamName=$(TeamName) -p:OfficialBuildId=$(Build.BuildNumber) + -p:RID=$(_RID) -p:DotNetSignType=real -p:TeamName=$(TeamName) -p:OfficialBuildId=$(Build.BuildNumber) displayName: Build - task: ArchiveFiles@2 condition: and(eq(variables['system.pullrequest.isfork'], false), eq(variables['_BuildConfig'], 'Release')) diff --git a/eng/Signing.props b/eng/Signing.props index 7d4bf667..680f3cf9 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -3,11 +3,8 @@ true - - - - + - - + + + From 7206567bd2f582e9112190b5202b904c439a8ab1 Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Tue, 18 Feb 2025 09:39:12 -0800 Subject: [PATCH 16/16] Update cert name --- eng/Signing.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Signing.props b/eng/Signing.props index 680f3cf9..ae15a17e 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -12,8 +12,8 @@ - - - + + +