Fix OSX native dependency installation #28183

hoyosjs · 2021-07-08T05:01:12Z

Avoid upgrading packages that are installed on the machine unless explicitly listed.
Use a brewfile.

hoyosjs · 2021-07-08T05:03:12Z

@wtgodbe this fixes the internal build breaks

@jeffschwMSFT this fixes the official build (unrelated to the one you pinged earlier)

@akoeplinger do you mind reading over this? You are more familiar on this than most of us :)

akoeplinger

Looks good with one suggestion.

eng/install-native-dependencies.sh

jeffschwMSFT

Approved. Please merge to unblock the build

ghost · 2021-07-08T20:45:42Z

Hello @hoyosjs!

Because this pull request has the auto-merge label, I will be glad to assist with helping to merge this pull request once all check-in policies pass.

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (`@msftbot`) and give me an instruction to get started! Learn more here.

* Update branding to 3.1.17 (#28173) * Port from 5.0: Fix Position Independent Code in CMake files (#28143) * CoreCLR PR26323 Port: Fix PIE options * Added missing PIE and RELRO compilation flags. * Merged PR 15832: Port from 5.0: Fix Position Independent Code in CMake files (#28143) Port from 5.0: Fix Position Independent Code in CMake files (#28143) * CoreCLR PR26323 Port: Fix PIE options * Added missing PIE and RELRO compilation flags. * Fix System.Globalization.Native build on Big Sur (#28181) * Fix System.Globalization.Native build on Big Sur * Fix build * Add flags for Linux * [release/3.1] Handle Counter Polling Interval of 0 (#28180) * Backport dotnet/runtime#53836 * Fix test build * update test * update branding to 3.1.18 (#28182) * Update dependencies from https://github.com/dotnet/core-setup build 20210609.1 (#28178) Microsoft.NETCore.App From Version 3.1.9-servicing.20459.3 -> To Version 3.1.17-servicing.21309.1 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> * Merged PR 15716: [release/3.1] Use user read+write access for coredump file descriptor open * [release/3.1] #28183 Fix OSX native dependency installation * Avoid upgrading packages that are explicitly installed. * Use a brewfile * Change shebang to use bash and directly execute. * [release/3.1] Update dependencies from dotnet/corefx (#28179) [release/3.1] Update dependencies from dotnet/corefx - Add 3.1 AzDO feeds to the test build to ensure that the test build can correctly restore the CoreFX build. It seems that the new CoreFX build isn't on the old blob feeds, so without this fix, we end up restoring the first 5.0.0-alpha.1 build instead of the build we want. - Exclude tests that depend on OOB assemblies. - Turn off CoreFX test legs in CI. Now that the branch is on servicing, and the churn is low, exclude these as they break far more often than they detect issues. These already run in CoreFX CI on release bits. In case we want to bring them back for checked testing, we need to fix CoreFX.depproj. It has a package - Microsoft.Private.CoreFx.OOB - that's supposed to bring in all deps that are out of box. These are currently not getting restored and this ends up causing File not found issues in the binder when compiling tests, making test exclusions impossible. Please enter the commit message for your changes. Lines starting with '#' will be ignored, and an empty message aborts the commit. Co-authored-by: Jan Jahoda <[email protected]> Co-authored-by: Ivan Diaz Sanchez <[email protected]> Co-authored-by: Will Godbe <[email protected]> Co-authored-by: Santiago Fernandez Madero <[email protected]> Co-authored-by: John Salem <[email protected]> Co-authored-by: Anirudh Agnihotry <[email protected]> Co-authored-by: dotnet-bot <[email protected]> Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

hoyosjs added 2 commits July 7, 2021 20:32

Avoid upgrading packages that are explicitly installed.

35ef233

Use a brewfile

ba807a9

hoyosjs requested a review from akoeplinger July 8, 2021 05:01

akoeplinger approved these changes Jul 8, 2021

View reviewed changes

eng/install-native-dependencies.sh Show resolved Hide resolved

jeffschwMSFT approved these changes Jul 8, 2021

View reviewed changes

Change shebang to use bash and directly execute.

fcdcfd6

hoyosjs added the auto-merge Automatically merge PR once CI passes. label Jul 8, 2021

hoyosjs merged commit 09f5b75 into release/3.1 Jul 8, 2021

hoyosjs deleted the juhoyosa/fix-osx-brew branch July 8, 2021 21:21

hoyosjs mentioned this pull request Sep 15, 2021

Merge 3.1.19 to crossdac branch #28204

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix OSX native dependency installation #28183

Fix OSX native dependency installation #28183

hoyosjs commented Jul 8, 2021

hoyosjs commented Jul 8, 2021

akoeplinger left a comment

jeffschwMSFT left a comment

ghost commented Jul 8, 2021

Fix OSX native dependency installation #28183

Fix OSX native dependency installation #28183

Conversation

hoyosjs commented Jul 8, 2021

hoyosjs commented Jul 8, 2021

akoeplinger left a comment

Choose a reason for hiding this comment

jeffschwMSFT left a comment

Choose a reason for hiding this comment

ghost commented Jul 8, 2021

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (@msftbot) and give me an instruction to get started! Learn more here.

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (`@msftbot`) and give me an instruction to get started! Learn more here.