Skip to content

Sign macOS build #323

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
edvilme merged 16 commits into from
Feb 18, 2025
Merged

Sign macOS build #323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
767de14
Sign on Mac
edvilme Feb 11, 2025
ced870c
Fix typo on ArtifactName
edvilme Feb 11, 2025
defa237
Add TeamName variable
edvilme Feb 11, 2025
cf78f91
Add certificatename to binary
edvilme Feb 11, 2025
e80810b
Update binary path
edvilme Feb 11, 2025
359b843
Update build command to include signing
edvilme Feb 11, 2025
940ce15
Typos
edvilme Feb 11, 2025
cfc0f5e
Globb files to sign
edvilme Feb 11, 2025
2e21bb2
Add proper certificate
edvilme Feb 12, 2025
92ae013
Add proper certificate
edvilme Feb 12, 2025
48ef80d
MacDeveloperHarden
edvilme Feb 13, 2025
6944bef
Add files separately
edvilme Feb 13, 2025
62d241d
Change flags
edvilme Feb 13, 2025
cc6c946
Update certificate name
edvilme Feb 18, 2025
8c1d5f1
Update build parameters
edvilme Feb 18, 2025
7206567
Update cert name
edvilme Feb 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions .vsts-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
variables:
- name: _TeamName
- name: TeamName
value: DotNetCore
- template: /eng/common/templates-official/variables/pool-providers.yml@self

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -90,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
Expand All @@ -116,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
Expand All @@ -130,20 +131,21 @@ 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
clean: true
- script: eng/common/cibuild.sh
-sign
--configuration $(_BuildConfig)
--prepareMachine
/p:RID=$(_RID)
-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'))
Expand All @@ -158,7 +160,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

9 changes: 4 additions & 5 deletions eng/Signing.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,17 @@
<UseDotNetCertificate>true</UseDotNetCertificate>
</PropertyGroup>

<ItemGroup>
<FileExtensionSignInfo Include=".msi" CertificateName="MicrosoftDotNet500" />
</ItemGroup>

<ItemGroup Condition="'$(RID)' == 'win-x86'">
<FileExtensionSignInfo Include=".msi" CertificateName="MicrosoftDotNet500" />
<ItemsToSign Include="$(ArtifactsDir)layout\**\dotnet-core-uninstall.dll;
$(ArtifactsDir)layout\**\dotnet-core-uninstall.resources.dll;
$(ArtifactsDir)layout\**\dotnet-core-uninstall.exe;
$(ArtifactsDir)packages\**\dotnet-core-uninstall*.msi" />
</ItemGroup>

<ItemGroup Condition="'$(RID)' == 'osx-x64' OR '$(RID)' == 'osx-arm64'">
<ItemsToSign Include="$(ArtifactsDir)layout/dotnet-core-uninstall/dotnet-core-uninstall" />
<FileSignInfo Include="dotnet-core-uninstall" CertificateName="MacDeveloperHarden" />
<FileSignInfo Include="dotnet-core-uninstall.pdb" CertificateName="MacDeveloperHarden" />
<ItemsToSign Include="$(ArtifactsDir)layout/dotnet-core-uninstall/*" />
</ItemGroup>
</Project>