Skip to content

macOS: Fix corrupted binary #346

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 13 commits into from
Mar 19, 2025
Merged

macOS: Fix corrupted binary #346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7346e24
Fix mac binary
edvilme Mar 17, 2025
fb9f2aa
Temp disable signing to test mac binary
edvilme Mar 17, 2025
e19c4f7
Remove itemstosign temporarily
edvilme Mar 17, 2025
734192c
Do not sign
edvilme Mar 17, 2025
dbd1836
Add entitlements.plist
edvilme Mar 18, 2025
ea5afb9
Add CodeSignEntitlements
edvilme Mar 18, 2025
4a84355
Re add files to sign
edvilme Mar 18, 2025
74f3cb0
Add manual codesign with entitlements
edvilme Mar 19, 2025
6567350
Add run command
edvilme Mar 19, 2025
fa5b967
Move entitlements.plist
edvilme Mar 19, 2025
271497e
Remove run
edvilme Mar 19, 2025
81e8f32
Add comments
edvilme Mar 19, 2025
3642837
Fix target name
edvilme Mar 19, 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
11 changes: 3 additions & 8 deletions .vsts-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,20 +130,16 @@ extends:
matrix:
ARM64:
_RID: osx-arm64
_BuildConfig: Release
_SignType: real
_DotNetPublishToBlobFeed: false
X64:
_RID: osx-x64
_BuildConfig: Release
_SignType: real
Copy link
Contributor

@Forgind Forgind Mar 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't have to specify this anymore?

Copy link
Contributor Author

@edvilme edvilme Mar 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need on adding it as a variable if it doesn't change in the matrix strategy. Better just adding it directly when calling the script

_DotNetPublishToBlobFeed: false
steps:
- checkout: self
clean: true
- script: eng/common/cibuild.sh
-sign
--configuration $(_BuildConfig)
--sign
--configuration Release
--prepareMachine
-p:RID=$(_RID) -p:DotNetSignType=real -p:TeamName=$(TeamName) -p:OfficialBuildId=$(Build.BuildNumber)
displayName: Build
Expand All @@ -162,5 +158,4 @@ extends:
PathtoPublish: '$(Build.ArtifactStagingDirectory)'
ArtifactName: 'drop-$(_RID)'
publishLocation: 'Container'
parallel: true

parallel: true
6 changes: 5 additions & 1 deletion src/redist/redist.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<ItemGroup>
<ProjectReference Include="..\dotnet-core-uninstall\dotnet-core-uninstall.csproj" />
<PackageReference Include="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25124.4"/>
<PackageReference Include="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25124.4" Condition="'$(RID)' == 'win-x86'"/>
</ItemGroup>

<Import Condition="'$(RID)' == 'win-x86'" Project="targets\Versions.targets" />
Expand All @@ -19,4 +19,8 @@
<Import Condition="'$(RID)' == 'win-x86'" Project="targets\FileExtensions.targets" />
<Import Condition="'$(RID)' == 'win-x86'" Project="targets\GenerateMSIs.targets" />
<Target Condition="'$(RID)' == 'win-x86'" Name="GenerateMSIs" AfterTargets="Build" DependsOnTargets="GenerateLayout;GenerateDotnetCoreUninstallMsi" />

<!-- Entitlements are needed but not automatically added for macOS. See https://github.com/dotnet/runtime/issues/113707 -->
<Import Condition="'$(RID)' == 'osx-x64' OR '$(RID)' == 'osx-arm64'" Project="targets\MacEntitlements\AddMacEntitlements.targets" />

</Project>
7 changes: 7 additions & 0 deletions src/redist/targets/MacEntitlements/AddMacEntitlements.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<Project>
<!-- Entitlements are needed but not automatically added for macOS. See https://github.com/dotnet/runtime/issues/113707 -->
<!-- This generates an ad-hoc signature that will later be resigned, but keeps the entitlements. -->
<Target Name="AddMacEntitlements" AfterTargets="GenerateLayout">
<Exec Command="codesign -s - -f --entitlements $(MSBuildThisFileDirectory)entitlements.plist $(ArtifactsDir)layout/dotnet-core-uninstall/dotnet-core-uninstall" />
Copy link
Contributor

@Forgind Forgind Mar 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

akoeplinger's version also had the - by itself, so I'm assuming it's correct, but it looked weird to me. What does this mean exactly?

Copy link
Contributor Author

@edvilme edvilme Mar 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It refers to an empty certificate name. This is an ad-hoc signing, and it will be signed again, so I think it wouldn't make much difference

</Target>
</Project>
16 changes: 16 additions & 0 deletions src/redist/targets/MacEntitlements/entitlements.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.security.cs.allow-jit</key>
<true/>
<key>com.apple.security.cs.allow-dyld-environment-variables</key>
<true/>
<key>com.apple.security.cs.disable-library-validation</key>
<true/>
<key>com.apple.security.cs.debugger</key>
<true/>
<key>com.apple.security.get-task-allow</key>
<true/>
</dict>
</plist>